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

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

@@ -3,6 +3,7 @@ from sqlalchemy.orm import Session
 from module_admin.entity.do.role_do import SysRole, SysRoleMenu, SysRoleDept
 from module_admin.entity.do.dept_do import SysDept
 from module_admin.entity.vo.role_vo import *
+from utils.page_util import PageUtil
 from datetime import datetime, time
 
 
@@ -85,14 +86,15 @@ class RoleDao:
         return role_info
 
     @classmethod
-    def get_role_list(cls, db: Session, query_object: RoleQueryModel):
+    def get_role_list(cls, db: Session, query_object: RolePageQueryModel, is_page: bool = False):
         """
         根据查询参数获取角色列表信息
         :param db: orm对象
         :param query_object: 查询参数对象
+        :param is_page: 是否开启分页
         :return: 角色列表信息对象
         """
-        role_list = db.query(SysRole) \
+        query = db.query(SysRole) \
             .filter(SysRole.del_flag == 0,
                     SysRole.role_name.like(f'%{query_object.role_name}%') if query_object.role_name else True,
                     SysRole.role_key.like(f'%{query_object.role_key}%') if query_object.role_key else True,
@@ -103,7 +105,8 @@ class RoleDao:
                     if query_object.begin_time and query_object.end_time else True
                     ) \
             .order_by(SysRole.role_sort) \
-            .distinct().all()
+            .distinct()
+        role_list = PageUtil.paginate(query, query_object.page_num, query_object.page_size, is_page)
 
         return role_list
 

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

@@ -6,7 +6,7 @@ from module_admin.entity.do.dept_do import SysDept
 from module_admin.entity.do.post_do import SysPost
 from module_admin.entity.do.menu_do import SysMenu
 from module_admin.entity.vo.user_vo import *
-from utils.time_format_util import list_format_datetime
+from utils.page_util import PageUtil
 from datetime import datetime, time
 
 
@@ -137,15 +137,16 @@ class UserDao:
         return results
 
     @classmethod
-    def get_user_list(cls, db: Session, query_object: UserQueryModel, data_scope_sql: str):
+    def get_user_list(cls, db: Session, query_object: UserPageQueryModel, data_scope_sql: str, is_page: bool = False):
         """
         根据查询参数获取用户列表信息
         :param db: orm对象
         :param query_object: 查询参数对象
         :param data_scope_sql: 数据权限对应的查询sql语句
+        :param is_page: 是否开启分页
         :return: 用户列表信息对象
         """
-        user_list = db.query(SysUser, SysDept) \
+        query = db.query(SysUser, SysDept) \
             .filter(SysUser.del_flag == 0,
                     or_(SysUser.dept_id == query_object.dept_id, SysUser.dept_id.in_(
                         db.query(SysDept.dept_id).filter(func.find_in_set(query_object.dept_id, SysDept.ancestors))
@@ -163,7 +164,8 @@ class UserDao:
                     eval(data_scope_sql)
                     ) \
             .outerjoin(SysDept, and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == 0, SysDept.del_flag == 0)) \
-            .distinct().all()
+            .distinct()
+        user_list = PageUtil.paginate(query, query_object.page_num, query_object.page_size, is_page)
 
         return user_list
 
@@ -227,35 +229,15 @@ class UserDao:
         return allocated_role_list
 
     @classmethod
-    def get_user_role_unallocated_list_by_user_id(cls, db: Session, query_object: UserRoleQueryModel):
-        """
-        根据用户id获取用户未分配的角色列表信息数据库操作
-        :param db: orm对象
-        :param query_object: 用户角色查询对象
-        :return: 用户未分配的角色列表信息
-        """
-        unallocated_role_list = db.query(SysRole) \
-            .filter(
-            SysRole.del_flag == 0,
-            SysRole.role_id != 1,
-            SysRole.role_name == query_object.role_name if query_object.role_name else True,
-            SysRole.role_key == query_object.role_key if query_object.role_key else True,
-            ~SysRole.role_id.in_(
-                db.query(SysUserRole.role_id).filter(SysUserRole.user_id == query_object.user_id)
-            )
-        ).distinct().all()
-
-        return list_format_datetime(unallocated_role_list)
-
-    @classmethod
-    def get_user_role_allocated_list_by_role_id(cls, db: Session, query_object: UserRoleQueryModel):
+    def get_user_role_allocated_list_by_role_id(cls, db: Session, query_object: UserRolePageQueryModel, is_page: bool = False):
         """
         根据角色id获取已分配的用户列表信息
         :param db: orm对象
         :param query_object: 用户角色查询对象
+        :param is_page: 是否开启分页
         :return: 角色已分配的用户列表信息
         """
-        allocated_user_list = db.query(SysUser) \
+        query = db.query(SysUser) \
             .filter(
             SysUser.del_flag == 0,
             SysUser.user_id != 1,
@@ -264,19 +246,21 @@ class UserDao:
             SysUser.user_id.in_(
                 db.query(SysUserRole.user_id).filter(SysUserRole.role_id == query_object.role_id)
             )
-        ).distinct().all()
+        ).distinct()
+        allocated_user_list = PageUtil.paginate(query, query_object.page_num, query_object.page_size, is_page)
 
         return allocated_user_list
 
     @classmethod
-    def get_user_role_unallocated_list_by_role_id(cls, db: Session, query_object: UserRoleQueryModel):
+    def get_user_role_unallocated_list_by_role_id(cls, db: Session, query_object: UserRolePageQueryModel, is_page: bool = False):
         """
         根据角色id获取未分配的用户列表信息
         :param db: orm对象
         :param query_object: 用户角色查询对象
+        :param is_page: 是否开启分页
         :return: 角色未分配的用户列表信息
         """
-        unallocated_user_list = db.query(SysUser) \
+        query = db.query(SysUser) \
             .filter(
             SysUser.del_flag == 0,
             SysUser.user_id != 1,
@@ -285,7 +269,8 @@ class UserDao:
             ~SysUser.user_id.in_(
                 db.query(SysUserRole.user_id).filter(SysUserRole.role_id == query_object.role_id)
             )
-        ).distinct().all()
+        ).distinct()
+        unallocated_user_list = PageUtil.paginate(query, query_object.page_num, query_object.page_size, is_page)
 
         return unallocated_user_list