!5 Dash-FastAPI-Admin v1.0.1

Merge pull request !5 from insistence/develop

Author: insistence

dash-fastapi-backend/module_admin/controller/role_controller.py

@@ -3,6 +3,7 @@
 from config.get_db import get_db
 from module_admin.service.login_service import get_current_user, CurrentUserInfoServiceResponse
 from module_admin.service.role_service import *
+from module_admin.service.user_service import UserService, UserRoleQueryModel, UserRolePageObject, UserRolePageObjectResponse, CrudUserRoleModel
 from module_admin.entity.vo.role_vo import *
 from utils.response_util import *
 from utils.log_util import *
@@ -117,3 +118,63 @@ async def export_system_role_list(request: Request, role_query: RoleQueryModel,
     except Exception as e:
         logger.exception(e)
         return response_500(data="", message=str(e))
+
+
+@roleController.post("/role/authUser/allocatedList", response_model=UserRolePageObjectResponse, dependencies=[Depends(CheckUserInterfaceAuth('common'))])
+async def get_system_allocated_user_list(request: Request, user_role: UserRolePageObject, query_db: Session = Depends(get_db)):
+    try:
+        user_role_query = UserRoleQueryModel(**user_role.dict())
+        user_role_allocated_query_result = UserService.get_user_role_allocated_list_services(query_db, user_role_query)
+        # 分页操作
+        user_role_allocated_page_query_result = get_page_obj(user_role_allocated_query_result, user_role.page_num, user_role.page_size)
+        logger.info('获取成功')
+        return response_200(data=user_role_allocated_page_query_result, message="获取成功")
+    except Exception as e:
+        logger.exception(e)
+        return response_500(data="", message=str(e))
+
+
+@roleController.post("/role/authUser/unallocatedList", response_model=UserRolePageObjectResponse, dependencies=[Depends(CheckUserInterfaceAuth('common'))])
+async def get_system_unallocated_user_list(request: Request, user_role: UserRolePageObject, query_db: Session = Depends(get_db)):
+    try:
+        user_role_query = UserRoleQueryModel(**user_role.dict())
+        user_role_unallocated_query_result = UserService.get_user_role_unallocated_list_services(query_db, user_role_query)
+        # 分页操作
+        user_role_unallocated_page_query_result = get_page_obj(user_role_unallocated_query_result, user_role.page_num, user_role.page_size)
+        logger.info('获取成功')
+        return response_200(data=user_role_unallocated_page_query_result, message="获取成功")
+    except Exception as e:
+        logger.exception(e)
+        return response_500(data="", message=str(e))
+
+
+@roleController.post("/role/authUser/selectAll", response_model=CrudRoleResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:role:edit'))])
+@log_decorator(title='角色管理', business_type=4)
+async def add_system_role_user(request: Request, add_user_role: CrudUserRoleModel, query_db: Session = Depends(get_db)):
+    try:
+        add_user_role_result = UserService.add_user_role_services(query_db, add_user_role)
+        if add_user_role_result.is_success:
+            logger.info(add_user_role_result.message)
+            return response_200(data=add_user_role_result, message=add_user_role_result.message)
+        else:
+            logger.warning(add_user_role_result.message)
+            return response_400(data="", message=add_user_role_result.message)
+    except Exception as e:
+        logger.exception(e)
+        return response_500(data="", message=str(e))
+
+
+@roleController.post("/role/authUser/cancel", response_model=CrudRoleResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:role:edit'))])
+@log_decorator(title='角色管理', business_type=4)
+async def cancel_system_role_user(request: Request, cancel_user_role: CrudUserRoleModel, query_db: Session = Depends(get_db)):
+    try:
+        cancel_user_role_result = UserService.delete_user_role_services(query_db, cancel_user_role)
+        if cancel_user_role_result.is_success:
+            logger.info(cancel_user_role_result.message)
+            return response_200(data=cancel_user_role_result, message=cancel_user_role_result.message)
+        else:
+            logger.warning(cancel_user_role_result.message)
+            return response_400(data="", message=cancel_user_role_result.message)
+    except Exception as e:
+        logger.exception(e)
+        return response_500(data="", message=str(e))

dash-fastapi-backend/module_admin/controller/user_controller.py

@@ -153,7 +153,7 @@ async def change_system_user_profile_info(request: Request, edit_user: AddUserMo
 
 @userController.patch("/user/profile/resetPwd", response_model=CrudUserResponse, dependencies=[Depends(CheckUserInterfaceAuth('common'))])
 @log_decorator(title='个人信息', business_type=2)
-async def reset_system_user_password(request: Request, reset_user: ResetUserModel,  query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
+async def reset_system_user_password(request: Request, reset_user: ResetUserModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
     try:
         if not reset_user.user_id and reset_user.old_password:
             reset_user.user_id = current_user.user.user_id
@@ -172,6 +172,33 @@ async def reset_system_user_password(request: Request, reset_user: ResetUserMode
         return response_500(data="", message=str(e))
 
 
+@userController.post("/user/importData", dependencies=[Depends(CheckUserInterfaceAuth('system:user:import'))])
+@log_decorator(title='用户管理', business_type=6)
+async def batch_import_system_user(request: Request, user_import: ImportUserModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)):
+    try:
+        batch_import_result = UserService.batch_import_user_services(query_db, user_import, current_user)
+        if batch_import_result.is_success:
+            logger.info(batch_import_result.message)
+            return response_200(data=batch_import_result, message=batch_import_result.message)
+        else:
+            logger.warning(batch_import_result.message)
+            return response_400(data="", message=batch_import_result.message)
+    except Exception as e:
+        logger.exception(e)
+        return response_500(data="", message=str(e))
+
+
+@userController.post("/user/importTemplate", dependencies=[Depends(CheckUserInterfaceAuth('system:user:import'))])
+async def export_system_user_template(request: Request, query_db: Session = Depends(get_db)):
+    try:
+        user_import_template_result = UserService.get_user_import_template_services()
+        logger.info('获取成功')
+        return streaming_response_200(data=bytes2file_response(user_import_template_result))
+    except Exception as e:
+        logger.exception(e)
+        return response_500(data="", message=str(e))
+
+
 @userController.post("/user/export", dependencies=[Depends(CheckUserInterfaceAuth('system:user:export'))])
 @log_decorator(title='用户管理', business_type=5)
 async def export_system_user_list(request: Request, user_query: UserQueryModel, query_db: Session = Depends(get_db)):
@@ -184,3 +211,63 @@ async def export_system_user_list(request: Request, user_query: UserQueryModel,
     except Exception as e:
         logger.exception(e)
         return response_500(data="", message=str(e))
+
+
+@userController.post("/user/authRole/allocatedList", response_model=UserRolePageObjectResponse, dependencies=[Depends(CheckUserInterfaceAuth('common'))])
+async def get_system_allocated_role_list(request: Request, user_role: UserRolePageObject, query_db: Session = Depends(get_db)):
+    try:
+        user_role_query = UserRoleQueryModel(**user_role.dict())
+        user_role_allocated_query_result = UserService.get_user_role_allocated_list_services(query_db, user_role_query)
+        # 分页操作
+        user_role_allocated_page_query_result = get_page_obj(user_role_allocated_query_result, user_role.page_num, user_role.page_size)
+        logger.info('获取成功')
+        return response_200(data=user_role_allocated_page_query_result, message="获取成功")
+    except Exception as e:
+        logger.exception(e)
+        return response_500(data="", message=str(e))
+
+
+@userController.post("/user/authRole/unallocatedList", response_model=UserRolePageObjectResponse, dependencies=[Depends(CheckUserInterfaceAuth('common'))])
+async def get_system_unallocated_role_list(request: Request, user_role: UserRolePageObject, query_db: Session = Depends(get_db)):
+    try:
+        user_role_query = UserRoleQueryModel(**user_role.dict())
+        user_role_unallocated_query_result = UserService.get_user_role_unallocated_list_services(query_db, user_role_query)
+        # 分页操作
+        user_role_unallocated_page_query_result = get_page_obj(user_role_unallocated_query_result, user_role.page_num, user_role.page_size)
+        logger.info('获取成功')
+        return response_200(data=user_role_unallocated_page_query_result, message="获取成功")
+    except Exception as e:
+        logger.exception(e)
+        return response_500(data="", message=str(e))
+
+
+@userController.post("/user/authRole/selectAll", response_model=CrudUserResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:user:edit'))])
+@log_decorator(title='用户管理', business_type=4)
+async def add_system_role_user(request: Request, add_user_role: CrudUserRoleModel, query_db: Session = Depends(get_db)):
+    try:
+        add_user_role_result = UserService.add_user_role_services(query_db, add_user_role)
+        if add_user_role_result.is_success:
+            logger.info(add_user_role_result.message)
+            return response_200(data=add_user_role_result, message=add_user_role_result.message)
+        else:
+            logger.warning(add_user_role_result.message)
+            return response_400(data="", message=add_user_role_result.message)
+    except Exception as e:
+        logger.exception(e)
+        return response_500(data="", message=str(e))
+
+
+@userController.post("/user/authRole/cancel", response_model=CrudUserResponse, dependencies=[Depends(CheckUserInterfaceAuth('system:user:edit'))])
+@log_decorator(title='用户管理', business_type=4)
+async def cancel_system_role_user(request: Request, cancel_user_role: CrudUserRoleModel, query_db: Session = Depends(get_db)):
+    try:
+        cancel_user_role_result = UserService.delete_user_role_services(query_db, cancel_user_role)
+        if cancel_user_role_result.is_success:
+            logger.info(cancel_user_role_result.message)
+            return response_200(data=cancel_user_role_result, message=cancel_user_role_result.message)
+        else:
+            logger.warning(cancel_user_role_result.message)
+            return response_400(data="", message=cancel_user_role_result.message)
+    except Exception as e:
+        logger.exception(e)
+        return response_500(data="", message=str(e))

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

@@ -5,7 +5,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 UserModel, UserRoleModel, UserPostModel, CurrentUserInfo, UserQueryModel
+from module_admin.entity.vo.user_vo import UserModel, UserRoleModel, UserPostModel, CurrentUserInfo, UserQueryModel, UserRoleQueryModel
 from utils.time_format_util import list_format_datetime, format_datetime_dict_list
 from datetime import datetime, time
 from typing import Union, List
@@ -231,6 +231,90 @@ def delete_user_dao(cls, db: Session, user: UserModel):
             .filter(SysUser.user_id == user.user_id) \
             .update({SysUser.del_flag: '2', SysUser.update_by: user.update_by, SysUser.update_time: user.update_time})
 
+    @classmethod
+    def get_user_role_allocated_list_by_user_id(cls, db: Session, query_object: UserRoleQueryModel):
+        """
+        根据用户id获取用户已分配的角色列表信息数据库操作
+        :param db: orm对象
+        :param query_object: 用户角色查询对象
+        :return: 用户已分配的角色列表信息
+        """
+        allocated_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(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):
+        """
+        根据角色id获取已分配的用户列表信息
+        :param db: orm对象
+        :param query_object: 用户角色查询对象
+        :return: 角色已分配的用户列表信息
+        """
+        allocated_user_list = db.query(SysUser) \
+            .filter(
+            SysUser.del_flag == 0,
+            SysUser.user_id != 1,
+            SysUser.user_name == query_object.user_name if query_object.user_name else True,
+            SysUser.phonenumber == query_object.phonenumber if query_object.phonenumber else True,
+            SysUser.user_id.in_(
+                db.query(SysUserRole.user_id).filter(SysUserRole.role_id == query_object.role_id)
+            )
+        ).distinct().all()
+
+        return list_format_datetime(allocated_user_list)
+
+    @classmethod
+    def get_user_role_unallocated_list_by_role_id(cls, db: Session, query_object: UserRoleQueryModel):
+        """
+        根据角色id获取未分配的用户列表信息
+        :param db: orm对象
+        :param query_object: 用户角色查询对象
+        :return: 角色未分配的用户列表信息
+        """
+        unallocated_user_list = db.query(SysUser) \
+            .filter(
+            SysUser.del_flag == 0,
+            SysUser.user_id != 1,
+            SysUser.user_name == query_object.user_name if query_object.user_name else True,
+            SysUser.phonenumber == query_object.phonenumber if query_object.phonenumber else True,
+            ~SysUser.user_id.in_(
+                db.query(SysUserRole.user_id).filter(SysUserRole.role_id == query_object.role_id)
+            )
+        ).distinct().all()
+
+        return list_format_datetime(unallocated_user_list)
+
     @classmethod
     def add_user_role_dao(cls, db: Session, user_role: UserRoleModel):
         """
@@ -254,6 +338,32 @@ def delete_user_role_dao(cls, db: Session, user_role: UserRoleModel):
             .filter(SysUserRole.user_id == user_role.user_id) \
             .delete()
 
+    @classmethod
+    def delete_user_role_by_user_and_role_dao(cls, db: Session, user_role: UserRoleModel):
+        """
+        根据用户id及角色id删除用户角色关联信息数据库操作
+        :param db: orm对象
+        :param user_role: 用户角色关联对象
+        :return:
+        """
+        db.query(SysUserRole) \
+            .filter(SysUserRole.user_id == user_role.user_id, SysUserRole.role_id == user_role.role_id) \
+            .delete()
+
+    @classmethod
+    def get_user_role_detail(cls, db: Session, user_role: UserRoleModel):
+        """
+        根据用户角色关联获取用户角色关联详细信息
+        :param db: orm对象
+        :param user_role: 用户角色关联对象
+        :return: 用户角色关联信息
+        """
+        user_role_info = db.query(SysUserRole) \
+            .filter(SysUserRole.user_id == user_role.user_id, SysUserRole.role_id == user_role.role_id) \
+            .distinct().first()
+
+        return user_role_info
+
     @classmethod
     def add_user_post_dao(cls, db: Session, user_post: UserPostModel):
         """

dash-fastapi-backend/module_admin/entity/vo/user_vo.py

@@ -213,6 +213,51 @@ class DeleteUserModel(BaseModel):
     update_time: Optional[str]
 
 
+class UserRoleQueryModel(UserRoleModel):
+    """
+    用户角色关联管理不分页查询模型
+    """
+    user_name: Optional[str]
+    phonenumber: Optional[str]
+    role_name: Optional[str]
+    role_key: Optional[str]
+
+
+class UserRolePageObject(UserRoleQueryModel):
+    """
+    用户角色关联管理分页查询模型
+    """
+    page_num: int
+    page_size: int
+
+
+class UserRolePageObjectResponse(BaseModel):
+    """
+    用户角色关联管理列表分页查询返回模型
+    """
+    rows: List = []
+    page_num: int
+    page_size: int
+    total: int
+    has_next: bool
+
+
+class CrudUserRoleModel(BaseModel):
+    """
+    新增、删除用户关联角色及角色关联用户模型
+    """
+    user_ids: Optional[str]
+    role_ids: Optional[str]
+
+
+class ImportUserModel(BaseModel):
+    """
+    批量导入用户模型
+    """
+    url: str
+    is_update: bool
+
+
 class CrudUserResponse(BaseModel):
     """
     操作用户响应模型