perf: 优化用户管理和角色管理模块分页查询

ruoyi-fastapi-backend/utils/common_util.py

@@ -5,6 +5,7 @@ from openpyxl import Workbook
 from openpyxl.styles import Alignment, PatternFill
 from openpyxl.utils import get_column_letter
 from openpyxl.worksheet.datavalidation import DataValidation
+from sqlalchemy.engine.row import Row
 from typing import List
 from config.env import CachePathConfig
 
@@ -66,6 +67,9 @@ class CamelCaseUtil:
             return {cls.__to_camel_case(k): v for k, v in result.items()}
         # 如果是一组字典或其他类型的列表，遍历列表进行转换
         elif isinstance(result, list):
+            return [cls.transform_result(row) if isinstance(row, (dict, Row)) else cls.transform_result({c.name: getattr(row, c.name) for c in row.__table__.columns}) for row in result]
+        # 如果是sqlalchemy的Row实例，遍历Row进行转换
+        elif isinstance(result, Row):
             return [cls.transform_result(row) if isinstance(row, dict) else cls.transform_result({c.name: getattr(row, c.name) for c in row.__table__.columns}) for row in result]
         # 如果是其他类型，如模型实例，先转换为字典
         else:

ruoyi-fastapi-backend/utils/page_util.py

@@ -1,30 +1,9 @@
 import math
 from typing import Optional, List
-
+from sqlalchemy.orm.query import Query
 from pydantic import BaseModel, ConfigDict
 from pydantic.alias_generators import to_camel
-
-
-class PageModel(BaseModel):
-    """
-    分页模型
-    """
-    offset: int
-    page_num: int
-    page_size: int
-    total: int
-    has_next: bool
-
-
-class PageObjectResponse(BaseModel):
-    """
-    用户管理列表分页查询返回模型
-    """
-    rows: List = []
-    page_num: int
-    page_size: int
-    total: int
-    has_next: bool
+from utils.common_util import CamelCaseUtil
 
 
 class PageResponseModel(BaseModel):
@@ -40,33 +19,64 @@ class PageResponseModel(BaseModel):
     has_next: Optional[bool] = None
 
 
-def get_page_info(offset: int, page_num: int, page_size: int, count: int):
+class PageUtil:
     """
-    根据分页参数获取分页信息
-    :param offset: 起始数据位置
-    :param page_num: 当前页码
-    :param page_size: 当前页面数据量
-    :param count: 数据总数
-    :return: 分页信息对象
+    分页工具类
     """
-    has_next = False
-    if offset >= count:
-        res_offset_1 = (page_num - 2) * page_size
-        if res_offset_1 < 0:
-            res_offset = 0
-            res_page_num = 1
+
+    @classmethod
+    def get_page_obj(cls, data_list: List, page_num: int, page_size: int):
+        """
+        输入数据列表data_list和分页信息，返回分页数据列表结果
+        :param data_list: 原始数据列表
+        :param page_num: 当前页码
+        :param page_size: 当前页面数据量
+        :return: 分页数据对象
+        """
+        # 计算起始索引和结束索引
+        start = (page_num - 1) * page_size
+        end = page_num * page_size
+
+        # 根据计算得到的起始索引和结束索引对数据列表进行切片
+        paginated_data = data_list[start:end]
+        has_next = True if math.ceil(len(data_list) / page_size) > page_num else False
+
+        result = PageResponseModel(
+            rows=paginated_data,
+            pageNum=page_num,
+            pageSize=page_size,
+            total=len(data_list),
+            hasNext=has_next
+        )
+
+        return result
+
+    @classmethod
+    def paginate(cls, query: Query, page_num: int, page_size: int, is_page: bool = False):
+        """
+        输入查询语句和分页信息，返回分页数据列表结果
+        :param query: sqlalchemy查询语句
+        :param page_num: 当前页码
+        :param page_size: 当前页面数据量
+        :param is_page: 是否开启分页
+        :return: 分页数据对象
+        """
+        if is_page:
+            total = query.count()
+            paginated_data = query.offset((page_num - 1) * page_size).limit(page_size).all()
+            has_next = True if math.ceil(len(paginated_data) / page_size) > page_num else False
+            result = PageResponseModel(
+                rows=CamelCaseUtil.transform_result(paginated_data),
+                pageNum=page_num,
+                pageSize=page_size,
+                total=total,
+                hasNext=has_next
+            )
         else:
-            res_offset = res_offset_1
-            res_page_num = page_num - 1
-    else:
-        res_offset = offset
-        if (res_offset + page_size) < count:
-            has_next = True
-        res_page_num = page_num
+            no_paginated_data = query.all()
+            result = CamelCaseUtil.transform_result(no_paginated_data)
 
-    result = dict(offset=res_offset, page_num=res_page_num, page_size=page_size, total=count, has_next=has_next)
-
-    return PageModel(**result)
+        return result
 
 
 def get_page_obj(data_list: List, page_num: int, page_size: int):
@@ -94,5 +104,3 @@ def get_page_obj(data_list: List, page_num: int, page_size: int):
     )
 
     return result
-
-