perf: 优化字典管理模块分页查询

ruoyi-fastapi-backend/module_admin/controller/dict_controller.py

@@ -5,7 +5,7 @@ from module_admin.service.login_service import LoginService, CurrentUserModel
 from module_admin.service.dict_service import *
 from utils.response_util import *
 from utils.log_util import *
-from utils.page_util import *
+from utils.page_util import PageResponseModel
 from utils.common_util import bytes2file_response
 from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
 from module_admin.annotation.log_annotation import log_decorator
@@ -17,11 +17,8 @@ dictController = APIRouter(prefix='/system/dict', dependencies=[Depends(LoginSer
 @dictController.get("/type/list", response_model=PageResponseModel, dependencies=[Depends(CheckUserInterfaceAuth('system:dict:list'))])
 async def get_system_dict_type_list(request: Request, dict_type_page_query: DictTypePageQueryModel = Depends(DictTypePageQueryModel.as_query), query_db: Session = Depends(get_db)):
     try:
-        dict_type_query = DictTypeQueryModel(**dict_type_page_query.model_dump(by_alias=True))
-        # 获取全量数据
-        dict_type_query_result = DictTypeService.get_dict_type_list_services(query_db, dict_type_query)
-        # 分页操作
-        dict_type_page_query_result = get_page_obj(dict_type_query_result, dict_type_page_query.page_num, dict_type_page_query.page_size)
+        # 获取分页数据
+        dict_type_page_query_result = DictTypeService.get_dict_type_list_services(query_db, dict_type_page_query, is_page=True)
         logger.info('获取成功')
         return ResponseUtil.success(model_content=dict_type_page_query_result)
     except Exception as e:
@@ -101,7 +98,7 @@ async def delete_system_dict_type(request: Request, dict_ids: str, query_db: Ses
 @dictController.get("/type/optionselect", response_model=List[DictTypeModel], dependencies=[Depends(CheckUserInterfaceAuth('system:dict:query'))])
 async def query_system_dict_type_options(request: Request, query_db: Session = Depends(get_db)):
     try:
-        dict_type_query_result = DictTypeService.get_dict_type_list_services(query_db, DictTypeQueryModel(**dict()))
+        dict_type_query_result = DictTypeService.get_dict_type_list_services(query_db, DictTypePageQueryModel(**dict()), is_page=False)
         logger.info(f'获取成功')
         return ResponseUtil.success(data=dict_type_query_result)
     except Exception as e:
@@ -124,9 +121,8 @@ async def query_detail_system_dict_type(request: Request, dict_id: int, query_db
 @log_decorator(title='字典管理', business_type=5)
 async def export_system_dict_type_list(request: Request, dict_type_page_query: DictTypePageQueryModel = Depends(DictTypePageQueryModel.as_form), query_db: Session = Depends(get_db)):
     try:
-        dict_type_query = DictTypeQueryModel(**dict_type_page_query.model_dump(by_alias=True))
         # 获取全量数据
-        dict_type_query_result = DictTypeService.get_dict_type_list_services(query_db, dict_type_query)
+        dict_type_query_result = DictTypeService.get_dict_type_list_services(query_db, dict_type_page_query, is_page=False)
         dict_type_export_result = DictTypeService.export_dict_type_list_services(dict_type_query_result)
         logger.info('导出成功')
         return ResponseUtil.streaming(data=bytes2file_response(dict_type_export_result))
@@ -150,11 +146,8 @@ async def query_system_dict_type_data(request: Request, dict_type: str, query_db
 @dictController.get("/data/list", response_model=PageResponseModel, dependencies=[Depends(CheckUserInterfaceAuth('system:dict:list'))])
 async def get_system_dict_data_list(request: Request, dict_data_page_query: DictDataPageQueryModel = Depends(DictDataPageQueryModel.as_query), query_db: Session = Depends(get_db)):
     try:
-        dict_data_query = DictDataModel(**dict_data_page_query.model_dump(by_alias=True))
-        # 获取全量数据
-        dict_data_query_result = DictDataService.get_dict_data_list_services(query_db, dict_data_query)
-        # 分页操作
-        dict_data_page_query_result = get_page_obj(dict_data_query_result, dict_data_page_query.page_num, dict_data_page_query.page_size)
+        # 获取分页数据
+        dict_data_page_query_result = DictDataService.get_dict_data_list_services(query_db, dict_data_page_query, is_page=True)
         logger.info('获取成功')
         return ResponseUtil.success(model_content=dict_data_page_query_result)
     except Exception as e:
@@ -230,9 +223,8 @@ async def query_detail_system_dict_data(request: Request, dict_code: int, query_
 @log_decorator(title='字典管理', business_type=5)
 async def export_system_dict_data_list(request: Request, dict_data_page_query: DictDataPageQueryModel = Depends(DictDataPageQueryModel.as_form), query_db: Session = Depends(get_db)):
     try:
-        dict_data_query = DictDataModel(**dict_data_page_query.model_dump(by_alias=True))
         # 获取全量数据
-        dict_data_query_result = DictDataService.get_dict_data_list_services(query_db, dict_data_query)
+        dict_data_query_result = DictDataService.get_dict_data_list_services(query_db, dict_data_page_query, is_page=False)
         dict_data_export_result = DictDataService.export_dict_data_list_services(dict_data_query_result)
         logger.info('导出成功')
         return ResponseUtil.streaming(data=bytes2file_response(dict_data_export_result))

ruoyi-fastapi-backend/module_admin/dao/dict_dao.py

@@ -3,6 +3,7 @@ from sqlalchemy.orm import Session
 from module_admin.entity.do.dict_do import SysDictType, SysDictData
 from module_admin.entity.vo.dict_vo import *
 from utils.time_format_util import list_format_datetime
+from utils.page_util import PageUtil
 from datetime import datetime, time
 
 
@@ -52,14 +53,15 @@ class DictTypeDao:
         return list_format_datetime(dict_type_info)
 
     @classmethod
-    def get_dict_type_list(cls, db: Session, query_object: DictTypeQueryModel):
+    def get_dict_type_list(cls, db: Session, query_object: DictTypePageQueryModel, is_page: bool = False):
         """
         根据查询参数获取字典类型列表信息
         :param db: orm对象
         :param query_object: 查询参数对象
+        :param is_page: 是否开启分页
         :return: 字典类型列表信息对象
         """
-        dict_type_list = db.query(SysDictType) \
+        query = db.query(SysDictType) \
             .filter(SysDictType.dict_name.like(f'%{query_object.dict_name}%') if query_object.dict_name else True,
                     SysDictType.dict_type.like(f'%{query_object.dict_type}%') if query_object.dict_type else True,
                     SysDictType.status == query_object.status if query_object.status else True,
@@ -68,7 +70,8 @@ class DictTypeDao:
                         datetime.combine(datetime.strptime(query_object.end_time, '%Y-%m-%d'), time(23, 59, 59)))
                     if query_object.begin_time and query_object.end_time else True
                     ) \
-            .distinct().all()
+            .distinct()
+        dict_type_list = PageUtil.paginate(query, query_object.page_num, query_object.page_size, is_page)
 
         return dict_type_list
 
@@ -147,20 +150,22 @@ class DictDataDao:
         return dict_data_info
 
     @classmethod
-    def get_dict_data_list(cls, db: Session, query_object: DictDataModel):
+    def get_dict_data_list(cls, db: Session, query_object: DictDataPageQueryModel, is_page: bool = False):
         """
         根据查询参数获取字典数据列表信息
         :param db: orm对象
         :param query_object: 查询参数对象
+        :param is_page: 是否开启分页
         :return: 字典数据列表信息对象
         """
-        dict_data_list = db.query(SysDictData) \
+        query = db.query(SysDictData) \
             .filter(SysDictData.dict_type == query_object.dict_type if query_object.dict_type else True,
                     SysDictData.dict_label.like(f'%{query_object.dict_label}%') if query_object.dict_label else True,
                     SysDictData.status == query_object.status if query_object.status else True
                     ) \
             .order_by(SysDictData.dict_sort) \
-            .distinct().all()
+            .distinct()
+        dict_data_list = PageUtil.paginate(query, query_object.page_num, query_object.page_size, is_page)
 
         return dict_data_list
 

ruoyi-fastapi-backend/module_admin/entity/vo/dict_vo.py

@@ -58,8 +58,8 @@ class DictTypePageQueryModel(DictTypeQueryModel):
     """
     字典类型管理分页查询模型
     """
-    page_num: int
-    page_size: int
+    page_num: int = 1
+    page_size: int = 10
 
 
 class DeleteDictTypeModel(BaseModel):
@@ -71,7 +71,7 @@ class DeleteDictTypeModel(BaseModel):
     dict_ids: str
 
 
-class DictDataQueryModel(DictTypeModel):
+class DictDataQueryModel(DictDataModel):
     """
     字典数据管理不分页查询模型
     """
@@ -85,8 +85,8 @@ class DictDataPageQueryModel(DictDataQueryModel):
     """
     字典数据管理分页查询模型
     """
-    page_num: int
-    page_size: int
+    page_num: int = 1
+    page_size: int = 10
 
 
 class DeleteDictDataModel(BaseModel):

ruoyi-fastapi-backend/module_admin/service/dict_service.py

@@ -12,16 +12,17 @@ class DictTypeService:
     """
 
     @classmethod
-    def get_dict_type_list_services(cls, query_db: Session, query_object: DictTypeQueryModel):
+    def get_dict_type_list_services(cls, query_db: Session, query_object: DictTypePageQueryModel, is_page: bool = False):
         """
         获取字典类型列表信息service
         :param query_db: orm对象
         :param query_object: 查询参数对象
+        :param is_page: 是否开启分页
         :return: 字典类型列表信息对象
         """
-        dict_type_list_result = DictTypeDao.get_dict_type_list(query_db, query_object)
+        dict_type_list_result = DictTypeDao.get_dict_type_list(query_db, query_object, is_page)
 
-        return CamelCaseUtil.transform_result(dict_type_list_result)
+        return dict_type_list_result
 
     @classmethod
     async def add_dict_type_services(cls, request: Request, query_db: Session, page_object: DictTypeModel):
@@ -172,16 +173,17 @@ class DictDataService:
     """
 
     @classmethod
-    def get_dict_data_list_services(cls, query_db: Session, query_object: DictDataModel):
+    def get_dict_data_list_services(cls, query_db: Session, query_object: DictDataPageQueryModel, is_page: bool = False):
         """
         获取字典数据列表信息service
         :param query_db: orm对象
         :param query_object: 查询参数对象
+        :param is_page: 是否开启分页
         :return: 字典数据列表信息对象
         """
-        dict_data_list_result = DictDataDao.get_dict_data_list(query_db, query_object)
+        dict_data_list_result = DictDataDao.get_dict_data_list(query_db, query_object, is_page)
 
-        return CamelCaseUtil.transform_result(dict_data_list_result)
+        return dict_data_list_result
 
     @classmethod
     def query_dict_data_list_services(cls, query_db: Session, dict_type: str):