From ce0dfd60a6ebb0196587c1666c5c0b0fae53c4ea Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Mon, 8 Feb 2021 23:29:47 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90user=E3=80=91=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel/system/UserOrgServiceApi.java | 4 +- .../roses/kernel/system/UserServiceApi.java | 18 +- .../kernel/system/enums/UserStatusEnum.java | 2 +- .../menu/SysMenuButtonExceptionEnum.java | 2 +- .../enums/menu/SysMenuExceptionEnum.java | 4 +- .../enums/notice/NoticeExceptionEnum.java | 4 +- .../organization/DataScopeExceptionEnum.java | 6 +- .../OrganizationExceptionEnum.java | 8 +- .../organization/PositionExceptionEnum.java | 4 +- .../enums/role/SysRoleExceptionEnum.java | 12 +- .../{ => user}/SysUserExceptionEnum.java | 26 +- .../{ => user}/SysUserOrgExceptionEnum.java | 10 +- ...neUserResponse.java => OnlineUserDTO.java} | 2 +- .../kernel/system/pojo/user/SysUserDTO.java | 6 + ...serOrgResponse.java => SysUserOrgDTO.java} | 2 +- .../system/pojo/user/SysUserResponse.java | 87 ------ .../request}/UserDataScopeRequest.java | 2 +- .../{ => user/request}/UserOrgRequest.java | 2 +- .../{ => user/request}/UserRoleRequest.java | 4 +- .../service/impl/SysMenuServiceImpl.java | 2 +- .../service/DataScopeService.java | 4 +- .../user/controller/KaptchaController.java | 4 +- .../user/controller/SysUserController.java | 156 +++++----- .../user/factory/OnlineUserCreateFactory.java | 6 +- .../user/factory/UserLoginInfoFactory.java | 4 +- .../modular/user/mapper/SysUserMapper.java | 6 +- .../user/mapper/mapping/SysUserMapper.xml | 4 +- .../user/service/SysUserDataScopeService.java | 2 +- .../user/service/SysUserOrgService.java | 4 +- .../user/service/SysUserRoleService.java | 2 +- .../modular/user/service/SysUserService.java | 73 +++-- .../impl/SysUserDataScopeServiceImpl.java | 2 +- .../impl/SysUserOrgServiceServiceImpl.java | 14 +- .../service/impl/SysUserRoleServiceImpl.java | 4 +- .../user/service/impl/SysUserServiceImpl.java | 270 +++++++++--------- 35 files changed, 326 insertions(+), 436 deletions(-) rename kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/{ => user}/SysUserExceptionEnum.java (74%) rename kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/{ => user}/SysUserOrgExceptionEnum.java (81%) rename kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/{OnlineUserResponse.java => OnlineUserDTO.java} (95%) rename kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/{SysUserOrgResponse.java => SysUserOrgDTO.java} (92%) delete mode 100644 kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserResponse.java rename kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/{ => user/request}/UserDataScopeRequest.java (84%) rename kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/{ => user/request}/UserOrgRequest.java (86%) rename kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/{ => user/request}/UserRoleRequest.java (83%) diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/UserOrgServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/UserOrgServiceApi.java index 34b1e19c6..d372484b1 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/UserOrgServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/UserOrgServiceApi.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.system; -import cn.stylefeng.roses.kernel.system.pojo.user.SysUserOrgResponse; +import cn.stylefeng.roses.kernel.system.pojo.user.SysUserOrgDTO; /** * 用户组织机构服务api @@ -25,6 +25,6 @@ public interface UserOrgServiceApi { * @author fengshuonan * @date 2020/12/19 22:33 */ - SysUserOrgResponse getUserOrgInfo(Long userId); + SysUserOrgDTO getUserOrgInfo(Long userId); } diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/UserServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/UserServiceApi.java index 491a93c91..6348dc8ca 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/UserServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/UserServiceApi.java @@ -1,8 +1,7 @@ package cn.stylefeng.roses.kernel.system; -import cn.stylefeng.roses.kernel.system.pojo.user.OnlineUserResponse; +import cn.stylefeng.roses.kernel.system.pojo.user.OnlineUserDTO; import cn.stylefeng.roses.kernel.system.pojo.user.SysUserDTO; -import cn.stylefeng.roses.kernel.system.pojo.user.SysUserResponse; import cn.stylefeng.roses.kernel.system.pojo.user.UserLoginInfoDTO; import cn.stylefeng.roses.kernel.system.pojo.user.request.OnlineUserRequest; import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; @@ -84,7 +83,7 @@ public interface UserServiceApi { * @author fengshuonan * @date 2021/1/10 9:56 */ - List onlineUserList(OnlineUserRequest onlineUserRequest); + List onlineUserList(OnlineUserRequest onlineUserRequest); /** * 根据用户ID获取用户信息 @@ -93,7 +92,7 @@ public interface UserServiceApi { * @author majianguo * @date 2021/1/9 19:00 */ - SysUserResponse getUserInfoByUserId(Long userId); + SysUserDTO getUserInfoByUserId(Long userId); /** * 查询全部用户ID(剔除管理员，和不允许登录) @@ -105,17 +104,6 @@ public interface UserServiceApi { */ List queryAllUserIdList(SysUserRequest sysUserRequest); - /** - * 获取用户信息 - * - * @param userId 用户id - * @return 用户信息 - * @author liuhanqing - * @date 2021/1/4 22:09 - */ - SysUserDTO getUserInfo(Long userId); - - /** * 根据用户id 判断用户是否存在 * diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/enums/UserStatusEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/enums/UserStatusEnum.java index 3c7ff13b8..01c9d500e 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/enums/UserStatusEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/enums/UserStatusEnum.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.system.enums; import cn.stylefeng.roses.kernel.system.exception.SystemModularException; -import cn.stylefeng.roses.kernel.system.exception.enums.SysUserExceptionEnum; +import cn.stylefeng.roses.kernel.system.exception.enums.user.SysUserExceptionEnum; import lombok.Getter; /** diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/menu/SysMenuButtonExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/menu/SysMenuButtonExceptionEnum.java index a8f620f24..3ee4af68f 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/menu/SysMenuButtonExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/menu/SysMenuButtonExceptionEnum.java @@ -15,7 +15,7 @@ public enum SysMenuButtonExceptionEnum implements AbstractExceptionEnum { /** * 菜单按钮不存在 */ - MENU_BUTTON_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "61", "菜单按钮不存在"); + MENU_BUTTON_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "31", "菜单按钮不存在"); private final String errorCode; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/menu/SysMenuExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/menu/SysMenuExceptionEnum.java index 2db4c6c19..5ad376a6d 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/menu/SysMenuExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/menu/SysMenuExceptionEnum.java @@ -15,12 +15,12 @@ public enum SysMenuExceptionEnum implements AbstractExceptionEnum { /** * 本菜单无法修改应用，非一级菜单，不能改变所属应用 */ - CANT_MOVE_APP(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "62", "本菜单无法修改应用，非一级菜单，不能改变所属应用"), + CANT_MOVE_APP(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "32", "本菜单无法修改应用，非一级菜单，不能改变所属应用"), /** * 菜单不存在 */ - MENU_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "63", "菜单不存在，菜单id：{}"); + MENU_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "33", "菜单不存在，菜单id：{}"); private final String errorCode; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/notice/NoticeExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/notice/NoticeExceptionEnum.java index 903138cfb..3ef079d06 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/notice/NoticeExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/notice/NoticeExceptionEnum.java @@ -17,12 +17,12 @@ public enum NoticeExceptionEnum implements AbstractExceptionEnum { /** * 通知不存在 */ - NOTICE_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "31", "通知不存在，id为：{}"), + NOTICE_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "41", "通知不存在，id为：{}"), /** * 通知范围不允许修改 */ - NOTICE_SCOPE_NOT_EDIT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "32", "通知范围不允许修改"); + NOTICE_SCOPE_NOT_EDIT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "42", "通知范围不允许修改"); /** * 错误编码 diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/DataScopeExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/DataScopeExceptionEnum.java index 9ae50123b..0f02d872c 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/DataScopeExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/DataScopeExceptionEnum.java @@ -17,17 +17,17 @@ public enum DataScopeExceptionEnum implements AbstractExceptionEnum { /** * 操作失败，当前用户没有该数据的数据权限 */ - DATA_SCOPE_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "21", "操作失败，当前用户没有该数据的数据权限，当前数据范围是：{}"), + DATA_SCOPE_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "51", "操作失败，当前用户没有该数据的数据权限，当前数据范围是：{}"), /** * 用户id为空 */ - USER_ID_EMPTY_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "22", "获取数据范围失败，用户id为空"), + USER_ID_EMPTY_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "52", "获取数据范围失败，用户id为空"), /** * 用户角色为空 */ - ROLE_EMPTY_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "23", "获取数据范围失败，用户角色为空，userId：{}"); + ROLE_EMPTY_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "53", "获取数据范围失败，用户角色为空，userId：{}"); /** * 错误编码 diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/OrganizationExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/OrganizationExceptionEnum.java index 017e91edc..d033936e1 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/OrganizationExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/OrganizationExceptionEnum.java @@ -17,22 +17,22 @@ public enum OrganizationExceptionEnum implements AbstractExceptionEnum { /** * 添加组织架构失败，一级节点只有超级管理员可以添加 */ - ADD_ONE_LEVEL_ORGANIZATION_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "41", "添加组织架构失败，一级节点只有超级管理员可以添加"), + ADD_ONE_LEVEL_ORGANIZATION_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "54", "添加组织架构失败，一级节点只有超级管理员可以添加"), /** * 添加组织架构失败，数据权限不够 */ - ADD_ORG_ERROR_DATA_SCOPE_NOT_ENOUGH(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "42", "添加组织架构失败，数据权限不够"), + ADD_ORG_ERROR_DATA_SCOPE_NOT_ENOUGH(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "55", "添加组织架构失败，数据权限不够"), /** * 查询不到组织机构，错误的组织机构ID */ - CANT_FIND_ORG(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "43", "查询不到组织机构，错误的组织机构ID：{}"), + CANT_FIND_ORG(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "56", "查询不到组织机构，错误的组织机构ID：{}"), /** * 删除机构失败，该机构下有绑定员工 */ - DELETE_ORGANIZATION_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "44", "删除机构失败，该机构下有绑定员工"); + DELETE_ORGANIZATION_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "57", "删除机构失败，该机构下有绑定员工"); /** * 错误编码 diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/PositionExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/PositionExceptionEnum.java index b73b551a8..4f8831ac1 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/PositionExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/organization/PositionExceptionEnum.java @@ -17,12 +17,12 @@ public enum PositionExceptionEnum implements AbstractExceptionEnum { /** * 找不到职务 */ - CANT_FIND_POSITION(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "51", "查询不到组该职务，错误的职务ID：{}"), + CANT_FIND_POSITION(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "58", "查询不到组该职务，错误的职务ID：{}"), /** * 职务删除失败 */ - CANT_DELETE_POSITION(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "52", "职务删除失败，该职务下有关联人员"); + CANT_DELETE_POSITION(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "59", "职务删除失败，该职务下有关联人员"); /** * 错误编码 diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/role/SysRoleExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/role/SysRoleExceptionEnum.java index 1c4eef200..033f28fc9 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/role/SysRoleExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/role/SysRoleExceptionEnum.java @@ -17,32 +17,32 @@ public enum SysRoleExceptionEnum implements AbstractExceptionEnum { /** * 角色不存在 */ - ROLE_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "71", "角色不存在"), + ROLE_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "61", "角色不存在"), /** * 角色编码重复 */ - ROLE_CODE_REPEAT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "72", "角色编码重复，请检查code参数"), + ROLE_CODE_REPEAT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "62", "角色编码重复，请检查code参数"), /** * 角色名称重复 */ - ROLE_NAME_REPEAT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "73", "角色名称重复，请检查name参数"), + ROLE_NAME_REPEAT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "63", "角色名称重复，请检查name参数"), /** * 超级管理员不能被删除 */ - SUPER_ADMIN_CANT_DELETE(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "74", "超级管理员不能被删除"), + SUPER_ADMIN_CANT_DELETE(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "64", "超级管理员不能被删除"), /** * 超级管理员不能被删除 */ - SYSTEM_ROLE_CANT_DELETE(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "75", "系统角色不能被删除"), + SYSTEM_ROLE_CANT_DELETE(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "65", "系统角色不能被删除"), /** * 必须选择公司范围集合 */ - PLEASE_FILL_DATA_SCOPE(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "76", "指定部门类型的数据范围必须选择组织机构"); + PLEASE_FILL_DATA_SCOPE(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "66", "指定部门类型的数据范围必须选择组织机构"); /** * 错误编码 diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysUserExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/user/SysUserExceptionEnum.java similarity index 74% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysUserExceptionEnum.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/user/SysUserExceptionEnum.java index bc6e96450..99f9ba014 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysUserExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/user/SysUserExceptionEnum.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.exception.enums; +package cn.stylefeng.roses.kernel.system.exception.enums.user; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; @@ -17,62 +17,62 @@ public enum SysUserExceptionEnum implements AbstractExceptionEnum { /** * 用户不存在 */ - USER_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "81", "{} 用户不存在"), + USER_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "71", "{} 用户不存在"), /** * 账号已存在 */ - USER_ACCOUNT_REPEAT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "82", "账号已存在，请检查account参数"), + USER_ACCOUNT_REPEAT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "72", "账号已存在，请检查account参数"), /** * 原密码错误 */ - USER_PWD_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "83", "原密码错误，请重新输入"), + USER_PWD_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "73", "原密码错误，请重新输入"), /** * 新密码与原密码相同 */ - USER_PWD_REPEAT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "84", "新密码与原密码相同，请更换新密码"), + USER_PWD_REPEAT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "74", "新密码与原密码相同，请更换新密码"), /** * 不能删除超级管理员 */ - USER_CAN_NOT_DELETE_ADMIN(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "85", "不能删除超级管理员"), + USER_CAN_NOT_DELETE_ADMIN(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "75", "不能删除超级管理员"), /** * 不能修改超级管理员状态 */ - USER_CAN_NOT_UPDATE_ADMIN(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "86", "不能修改超级管理员状态"), + USER_CAN_NOT_UPDATE_ADMIN(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "76", "不能修改超级管理员状态"), /** * 请求状态值为空 */ - REQUEST_USER_STATUS__EMPTY(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "87", "请求状态值为空"), + REQUEST_USER_STATUS__EMPTY(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "77", "请求状态值为空"), /** * 请求状值为非正确状态值 */ - REQUEST_USER_STATUS_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "88", "请求状态值不合法，用户状态参数不合法，参数值：{}"), + REQUEST_USER_STATUS_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "78", "请求状态值不合法，用户状态参数不合法，参数值：{}"), /** * 更新用户状态错误 */ - UPDATE_USER_STATUS_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "89", "更新用户状态错误，更新生效数量0"), + UPDATE_USER_STATUS_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "79", "更新用户状态错误，更新生效数量0"), /** * 当前用户未分配菜单 */ - USER_NOT_HAVE_MENUS(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "810", "当前用户未分配菜单"), + USER_NOT_HAVE_MENUS(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "710", "当前用户未分配菜单"), /** * 用户未绑定角色 */ - USER_NOT_BIND_ROLE(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "811", "用户未绑定角色"), + USER_NOT_BIND_ROLE(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "711", "用户未绑定角色"), /** * 系统错误，账号存在多个 */ - ACCOUNT_HAVE_MANY(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "812", "系统错误，账号存在多个，账号为：{}"); + ACCOUNT_HAVE_MANY(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "712", "系统错误，账号存在多个，账号为：{}"); /** * 错误编码 diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysUserOrgExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/user/SysUserOrgExceptionEnum.java similarity index 81% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysUserOrgExceptionEnum.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/user/SysUserOrgExceptionEnum.java index c4a7e367f..b6e7cc7f6 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysUserOrgExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/user/SysUserOrgExceptionEnum.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.exception.enums; +package cn.stylefeng.roses.kernel.system.exception.enums.user; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; @@ -17,22 +17,22 @@ public enum SysUserOrgExceptionEnum implements AbstractExceptionEnum { /** * 企业员工信息不存在 */ - EMPLOYEE_NOT_FOUND(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "91", "企业员工信息不存在,用户id：{}"), + EMPLOYEE_NOT_FOUND(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "81", "企业员工信息不存在,用户id：{}"), /** * 用户绑定多个或未绑定机构信息 */ - EMPLOYEE_MANY_MAIN_NOT_FOUND(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "92", "用户绑定多个或未绑定机构信息"), + EMPLOYEE_MANY_MAIN_NOT_FOUND(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "82", "用户绑定多个或未绑定机构信息"), /** * 用户未设置主部门，或主部门信息为多个 */ - EMPLOYEE_NOT_OR_MANY(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "93", "用户未设置主部门，或主部门信息为多个"), + EMPLOYEE_NOT_OR_MANY(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "83", "用户未设置主部门，或主部门信息为多个"), /** * 用户组织或部门不存在 */ - USER_ORG_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "94", "用户组织或部门不存在：用户组织id：{}"); + USER_ORG_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "84", "用户组织或部门不存在：用户组织id：{}"); /** * 错误编码 diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/OnlineUserResponse.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/OnlineUserDTO.java similarity index 95% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/OnlineUserResponse.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/OnlineUserDTO.java index 2f4786bd1..46379eba4 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/OnlineUserResponse.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/OnlineUserDTO.java @@ -12,7 +12,7 @@ import java.util.Date; * @date 2021/1/11 22:30 */ @Data -public class OnlineUserResponse { +public class OnlineUserDTO { /** * 用户的token diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserDTO.java index 33e04cc77..5708d91b0 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserDTO.java @@ -3,6 +3,7 @@ package cn.stylefeng.roses.kernel.system.pojo.user; import lombok.Data; import java.util.Date; +import java.util.List; /** * 系统用户结果 @@ -78,4 +79,9 @@ public class SysUserDTO { */ private Integer statusFlag; + /** + * 用户角色id + */ + private List grantRoleIdList; + } diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserOrgResponse.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserOrgDTO.java similarity index 92% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserOrgResponse.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserOrgDTO.java index 6cfd9ccf5..eb7b41f33 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserOrgResponse.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserOrgDTO.java @@ -9,7 +9,7 @@ import lombok.Data; * @date 2020/11/04 11:05 */ @Data -public class SysUserOrgResponse { +public class SysUserOrgDTO { /** * 主键 diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserResponse.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserResponse.java deleted file mode 100644 index 6d2d6f96c..000000000 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserResponse.java +++ /dev/null @@ -1,87 +0,0 @@ -package cn.stylefeng.roses.kernel.system.pojo.user; - -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * 系统用户结果 - * - * @author fengshuonan - * @date 2020/4/2 9:19 - */ -@Data -public class SysUserResponse { - - /** - * 主键 - */ - private Long userId; - - /** - * 账号 - */ - private String account; - - /** - * 昵称 - */ - private String nickName; - - /** - * 姓名 - */ - private String realName; - - /** - * 头像 - */ - private Long avatar; - - /** - * 生日 - */ - private Date birthday; - - /** - * 性别（M-男，F-女） - */ - private String sex; - - /** - * 邮箱 - */ - private String email; - - /** - * 手机 - */ - private String phone; - - /** - * 电话 - */ - private String tel; - - /** - * 用户所属机构 - */ - private Long orgId; - - /** - * 用户所属机构的职务 - */ - private Long positionId; - - /** - * 状态 - */ - private Integer statusFlag; - - /** - * 用户角色id - */ - private List grantRoleIdList; - -} diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/UserDataScopeRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/UserDataScopeRequest.java similarity index 84% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/UserDataScopeRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/UserDataScopeRequest.java index 2b034f2f6..d5cd94462 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/UserDataScopeRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/UserDataScopeRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo; +package cn.stylefeng.roses.kernel.system.pojo.user.request; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/UserOrgRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/UserOrgRequest.java similarity index 86% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/UserOrgRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/UserOrgRequest.java index 406a6274b..4624ccce7 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/UserOrgRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/UserOrgRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo; +package cn.stylefeng.roses.kernel.system.pojo.user.request; import lombok.Data; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/UserRoleRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/UserRoleRequest.java similarity index 83% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/UserRoleRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/UserRoleRequest.java index 9bad9f910..07810548e 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/UserRoleRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/request/UserRoleRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo; +package cn.stylefeng.roses.kernel.system.pojo.user.request; import lombok.Data; @@ -10,7 +10,7 @@ import lombok.Data; */ @Data public class UserRoleRequest { - + /** * 主键 */ diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java index 592668f76..ba77ef5a0 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java @@ -26,8 +26,8 @@ import cn.stylefeng.roses.kernel.system.AppServiceApi; import cn.stylefeng.roses.kernel.system.MenuServiceApi; import cn.stylefeng.roses.kernel.system.RoleServiceApi; import cn.stylefeng.roses.kernel.system.exception.SystemModularException; -import cn.stylefeng.roses.kernel.system.exception.enums.SysUserExceptionEnum; import cn.stylefeng.roses.kernel.system.exception.enums.menu.SysMenuExceptionEnum; +import cn.stylefeng.roses.kernel.system.exception.enums.user.SysUserExceptionEnum; import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuRequest; import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdMenuSelectTreeNode; import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuDTO; diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/DataScopeService.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/DataScopeService.java index f9c937c65..da98375ff 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/DataScopeService.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/DataScopeService.java @@ -10,7 +10,7 @@ import cn.stylefeng.roses.kernel.system.exception.SystemModularException; import cn.stylefeng.roses.kernel.system.exception.enums.organization.DataScopeExceptionEnum; import cn.stylefeng.roses.kernel.system.pojo.organization.DataScopeDTO; import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleDTO; -import cn.stylefeng.roses.kernel.system.pojo.user.SysUserOrgResponse; +import cn.stylefeng.roses.kernel.system.pojo.user.SysUserOrgDTO; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -53,7 +53,7 @@ public class DataScopeService implements DataScopeApi { } // 获取用户的主要部门信息 - SysUserOrgResponse sysUserOrgResponse = userOrgServiceApi.getUserOrgInfo(userId); + SysUserOrgDTO sysUserOrgResponse = userOrgServiceApi.getUserOrgInfo(userId); // 获取角色中的数据范围类型 Set dataScopeTypeEnums = sysRoles.stream().map(SysRoleDTO::getDataScopeTypeEnum).collect(Collectors.toSet()); diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/KaptchaController.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/KaptchaController.java index 389756733..38284b98c 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/KaptchaController.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/KaptchaController.java @@ -23,11 +23,9 @@ public class KaptchaController { @Resource private CaptchaApi captchaApi; - @GetResource(name = "获取图形验证码", path = "/kaptcha", requiredPermission = false, requiredLogin = false) - public ResponseData kaptcha() { + public ResponseData captcha() { return new SuccessResponseData(captchaApi.captcha()); } - } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java index 3d392c6a9..9631dec25 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java @@ -35,7 +35,6 @@ public class SysUserController { @Resource private SysUserRoleService sysUserRoleService; - /** * 注册用户 * @@ -60,6 +59,18 @@ public class SysUserController { return new SuccessResponseData(); } + /** + * 删除系统用户 + * + * @author luojie + * @date 2020/11/6 13:50 + */ + @PostResource(name = "系统用户_删除", path = "/sysUser/delete") + public ResponseData delete(@RequestBody @Validated(SysUserRequest.delete.class) SysUserRequest sysUserRequest) { + sysUserService.del(sysUserRequest); + return new SuccessResponseData(); + } + /** * 编辑系统用户 * @@ -80,7 +91,7 @@ public class SysUserController { */ @PostResource(name = "系统用户_更新个人信息", path = "/sysUser/updateInfo") public ResponseData updateInfo(@RequestBody @Validated(SysUserRequest.updateInfo.class) SysUserRequest sysUserRequest) { - sysUserService.updateInfo(sysUserRequest); + sysUserService.editInfo(sysUserRequest); return new SuccessResponseData(); } @@ -92,7 +103,7 @@ public class SysUserController { */ @PostResource(name = "系统用户_修改状态", path = "/sysUser/changeStatus") public ResponseData changeStatus(@RequestBody @Validated(SysUserRequest.changeStatus.class) SysUserRequest sysUserRequest) { - sysUserService.changeStatus(sysUserRequest); + sysUserService.editStatus(sysUserRequest); return new SuccessResponseData(); } @@ -104,7 +115,7 @@ public class SysUserController { */ @PostResource(name = "系统用户_修改密码", path = "/sysUser/updatePassword") public ResponseData updatePwd(@RequestBody @Validated(SysUserRequest.updatePwd.class) SysUserRequest sysUserRequest) { - sysUserService.updatePassword(sysUserRequest); + sysUserService.editPassword(sysUserRequest); return new SuccessResponseData(); } @@ -128,7 +139,7 @@ public class SysUserController { */ @PostResource(name = "系统用户_修改头像", path = "/sysUser/updateAvatar") public ResponseData updateAvatar(@RequestBody @Validated(SysUserRequest.updateAvatar.class) SysUserRequest sysUserRequest) { - sysUserService.updateAvatar(sysUserRequest); + sysUserService.editAvatar(sysUserRequest); return new SuccessResponseData(); } @@ -156,18 +167,6 @@ public class SysUserController { return new SuccessResponseData(); } - /** - * 删除系统用户 - * - * @author luojie - * @date 2020/11/6 13:50 - */ - @PostResource(name = "系统用户_删除", path = "/sysUser/delete") - public ResponseData delete(@RequestBody @Validated(SysUserRequest.delete.class) SysUserRequest sysUserRequest) { - sysUserService.delete(sysUserRequest); - return new SuccessResponseData(); - } - /** * 查看系统用户 * @@ -179,65 +178,6 @@ public class SysUserController { return new SuccessResponseData(sysUserService.detail(sysUserRequest)); } - /** - * 查询系统用户 - * - * @author luojie - * @date 2020/11/6 13:49 - */ - @GetResource(name = "系统用户_查询", path = "/sysUser/page") - public ResponseData page(SysUserRequest sysUserRequest) { - return new SuccessResponseData(sysUserService.page(sysUserRequest)); - } - - /** - * 获取用户的角色列表 - * - * @author luojie - * @date 2020/11/6 13:50 - */ - @GetResource(name = "系统用户_获取用户的角色列表", path = "/sysUser/getUserRoles") - public ResponseData ownRole(@Validated(SysUserRequest.detail.class) SysUserRequest sysUserRequest) { - Long userId = sysUserRequest.getUserId(); - return new SuccessResponseData(sysUserRoleService.findListByUserId(userId)); - } - - /** - * 获取用户数据范围列表 - * - * @author luojie - * @date 2020/11/6 13:51 - */ - @GetResource(name = "系统用户_获取用户数据范围列表", path = "/sysUser/getUserDataScope") - public ResponseData ownData(@Validated(SysUserRequest.detail.class) SysUserRequest sysUserRequest) { - List userBindDataScope = sysUserService.getUserBindDataScope(sysUserRequest.getUserId()); - return new SuccessResponseData(userBindDataScope); - } - - /** - * 用户下拉列表，可以根据姓名搜索 - * - * @param sysUserRequest 请求参数：name 姓名(可选) - * @return 返回除超级管理员外的用户列表 - * @author luojie - * @date 2020/11/6 09:49 - */ - @GetResource(name = "系统用户_选择器", path = "/sysUser/selector") - public ResponseData selector(SysUserRequest sysUserRequest) { - return new SuccessResponseData(sysUserService.selector(sysUserRequest)); - } - - /** - * 导出用户 - * - * @author luojie - * @date 2020/11/6 13:57 - */ - @GetResource(name = "系统用户_导出", path = "/sysUser/export") - public void export(HttpServletResponse response) { - sysUserService.export(response); - } - /** * 获取当前登录用户的信息 * @@ -254,13 +194,73 @@ public class SysUserController { } /** - * 获取用户选择树数据 + * 查询系统用户 + * + * @author luojie + * @date 2020/11/6 13:49 + */ + @GetResource(name = "系统用户_查询", path = "/sysUser/page") + public ResponseData page(SysUserRequest sysUserRequest) { + return new SuccessResponseData(sysUserService.findPage(sysUserRequest)); + } + + /** + * 导出用户 + * + * @author luojie + * @date 2020/11/6 13:57 + */ + @GetResource(name = "系统用户_导出", path = "/sysUser/export") + public void export(HttpServletResponse response) { + sysUserService.export(response); + } + + /** + * 获取用户选择树数据（用在系统通知，选择发送人的时候） * * @author liuhanqing * @date 2021/1/15 8:28 */ - @GetResource(name = "获取用户选择树数据", path = "/sysUser/getUserSelectTree") + @GetResource(name = "获取用户选择树数据（用在系统通知，选择发送人的时候）", path = "/sysUser/getUserSelectTree") public SuccessResponseData getUserTree() { return new SuccessResponseData(this.sysUserService.userSelectTree(new SysUserRequest())); } + + /** + * 获取用户数据范围列表 + * + * @author luojie + * @date 2020/11/6 13:51 + */ + @GetResource(name = "系统用户_获取用户数据范围列表", path = "/sysUser/getUserDataScope") + public ResponseData ownData(@Validated(SysUserRequest.detail.class) SysUserRequest sysUserRequest) { + List userBindDataScope = sysUserService.getUserBindDataScope(sysUserRequest.getUserId()); + return new SuccessResponseData(userBindDataScope); + } + + /** + * 获取用户的角色列表 + * + * @author luojie + * @date 2020/11/6 13:50 + */ + @GetResource(name = "系统用户_获取用户的角色列表", path = "/sysUser/getUserRoles") + public ResponseData ownRole(@Validated(SysUserRequest.detail.class) SysUserRequest sysUserRequest) { + Long userId = sysUserRequest.getUserId(); + return new SuccessResponseData(sysUserRoleService.findListByUserId(userId)); + } + + /** + * 用户下拉列表，可以根据姓名搜索 + * + * @param sysUserRequest 请求参数：name 姓名(可选) + * @return 返回除超级管理员外的用户列表 + * @author luojie + * @date 2020/11/6 09:49 + */ + @GetResource(name = "系统用户_选择器", path = "/sysUser/selector") + public ResponseData selector(SysUserRequest sysUserRequest) { + return new SuccessResponseData(sysUserService.selector(sysUserRequest)); + } + } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/OnlineUserCreateFactory.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/OnlineUserCreateFactory.java index aa31ed570..6a3675eb6 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/OnlineUserCreateFactory.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/OnlineUserCreateFactory.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.system.modular.user.factory; import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser; import cn.stylefeng.roses.kernel.rule.enums.SexEnum; -import cn.stylefeng.roses.kernel.system.pojo.user.OnlineUserResponse; +import cn.stylefeng.roses.kernel.system.pojo.user.OnlineUserDTO; /** * 当前在线用户的创建工厂 @@ -18,9 +18,9 @@ public class OnlineUserCreateFactory { * @author fengshuonan * @date 2021/1/11 22:31 */ - public static OnlineUserResponse createOnlineUser(LoginUser loginUser) { + public static OnlineUserDTO createOnlineUser(LoginUser loginUser) { - OnlineUserResponse onlineUserResponse = new OnlineUserResponse(); + OnlineUserDTO onlineUserResponse = new OnlineUserDTO(); onlineUserResponse.setUserId(loginUser.getUserId()); onlineUserResponse.setAccount(loginUser.getAccount()); diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserLoginInfoFactory.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserLoginInfoFactory.java index 93fe51e9e..b2686935c 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserLoginInfoFactory.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserLoginInfoFactory.java @@ -10,7 +10,7 @@ import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser; import cn.stylefeng.roses.kernel.system.pojo.organization.DataScopeDTO; import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleDTO; -import cn.stylefeng.roses.kernel.system.pojo.user.SysUserOrgResponse; +import cn.stylefeng.roses.kernel.system.pojo.user.SysUserOrgDTO; import cn.stylefeng.roses.kernel.system.pojo.user.UserLoginInfoDTO; import java.util.*; @@ -38,7 +38,7 @@ public class UserLoginInfoFactory { public static UserLoginInfoDTO userLoginInfoDTO(SysUser sysUser, List roleResponseList, DataScopeDTO dataScopeResponse, - SysUserOrgResponse userOrgInfo, + SysUserOrgDTO userOrgInfo, Set resourceUrlsListByCodes, Set roleButtonCodes) { diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java index b4a29d65f..642e6f20a 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.system.modular.user.mapper; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser; -import cn.stylefeng.roses.kernel.system.pojo.user.SysUserResponse; +import cn.stylefeng.roses.kernel.system.pojo.user.SysUserDTO; import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -25,7 +25,7 @@ public interface SysUserMapper extends BaseMapper { * @author fengshuonan * @date 2020/11/21 15:16 */ - Page findUserPage(@Param("page") Page page, @Param("sysUserRequest") SysUserRequest sysUserRequest); + Page findUserPage(@Param("page") Page page, @Param("sysUserRequest") SysUserRequest sysUserRequest); /** * 查询用户列表 @@ -34,6 +34,6 @@ public interface SysUserMapper extends BaseMapper { * @author liuhanqing * @date 2021/1/15 11:04 */ - List findUserList(@Param("sysUserRequest") SysUserRequest sysUserRequest); + List findUserList(@Param("sysUserRequest") SysUserRequest sysUserRequest); } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml index d01aac414..964481069 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml @@ -3,7 +3,7 @@ - select suser.user_id as userId, suser.account as account, @@ -41,7 +41,7 @@ - select suser.user_id as userId, suser.account as account, diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserDataScopeService.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserDataScopeService.java index c73f3ef71..fc32b562b 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserDataScopeService.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserDataScopeService.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.system.modular.user.service; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserDataScope; -import cn.stylefeng.roses.kernel.system.pojo.UserDataScopeRequest; import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; +import cn.stylefeng.roses.kernel.system.pojo.user.request.UserDataScopeRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserOrgService.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserOrgService.java index 9accc70b5..6128cc86d 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserOrgService.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserOrgService.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.system.modular.user.service; import cn.stylefeng.roses.kernel.system.UserOrgServiceApi; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserOrg; -import cn.stylefeng.roses.kernel.system.pojo.UserOrgRequest; +import cn.stylefeng.roses.kernel.system.pojo.user.request.UserOrgRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -92,4 +92,4 @@ public interface SysUserOrgService extends IService, UserOrgServiceA List findList(UserOrgRequest userOrgResponse); -} \ No newline at end of file +} diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java index 1391ac41f..4401be75e 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.system.modular.user.service; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserRole; -import cn.stylefeng.roses.kernel.system.pojo.UserRoleRequest; import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; +import cn.stylefeng.roses.kernel.system.pojo.user.request.UserRoleRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java index 3226ba592..265141fdb 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java @@ -4,7 +4,7 @@ import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import cn.stylefeng.roses.kernel.system.UserServiceApi; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser; -import cn.stylefeng.roses.kernel.system.pojo.user.SysUserResponse; +import cn.stylefeng.roses.kernel.system.pojo.user.SysUserDTO; import cn.stylefeng.roses.kernel.system.pojo.user.UserSelectTreeNode; import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; import com.baomidou.mybatisplus.extension.service.IService; @@ -20,12 +20,10 @@ import java.util.List; */ public interface SysUserService extends IService, UserServiceApi { - /** * 新用户注册 * * @param sysUserRequest 请求参数 - * @return * @author chenjinlong * @date 2021/1/15 15:17 */ @@ -40,6 +38,15 @@ public interface SysUserService extends IService, UserServiceApi { */ void add(SysUserRequest sysUserRequest); + /** + * 删除系统用户 + * + * @param sysUserRequest 删除参数 + * @author fengshuonan + * @date 2020/11/21 14:54 + */ + void del(SysUserRequest sysUserRequest); + /** * 编辑用户 * @@ -56,7 +63,7 @@ public interface SysUserService extends IService, UserServiceApi { * @author fengshuonan * @date 2020/11/21 12:32 */ - void updateInfo(SysUserRequest sysUserRequest); + void editInfo(SysUserRequest sysUserRequest); /** * 修改状态 @@ -65,7 +72,7 @@ public interface SysUserService extends IService, UserServiceApi { * @author fengshuonan * @date 2020/11/21 14:19 */ - void changeStatus(SysUserRequest sysUserRequest); + void editStatus(SysUserRequest sysUserRequest); /** * 修改密码 @@ -74,7 +81,7 @@ public interface SysUserService extends IService, UserServiceApi { * @author fengshuonan * @date 2020/11/21 14:26 */ - void updatePassword(SysUserRequest sysUserRequest); + void editPassword(SysUserRequest sysUserRequest); /** * 重置密码 @@ -92,7 +99,7 @@ public interface SysUserService extends IService, UserServiceApi { * @author luojie * @date 2020/11/6 13:47 */ - void updateAvatar(SysUserRequest sysUserRequest); + void editAvatar(SysUserRequest sysUserRequest); /** * 授权角色给某个用户 @@ -112,15 +119,6 @@ public interface SysUserService extends IService, UserServiceApi { */ void grantData(SysUserRequest sysUserRequest); - /** - * 删除系统用户 - * - * @param sysUserRequest 删除参数 - * @author fengshuonan - * @date 2020/11/21 14:54 - */ - void delete(SysUserRequest sysUserRequest); - /** * 查看用户详情 * @@ -129,7 +127,7 @@ public interface SysUserService extends IService, UserServiceApi { * @author luojie * @date 2020/11/6 13:46 */ - SysUserResponse detail(SysUserRequest sysUserRequest); + SysUserDTO detail(SysUserRequest sysUserRequest); /** * 查询系统用户 @@ -139,17 +137,7 @@ public interface SysUserService extends IService, UserServiceApi { * @author fengshuonan * @date 2020/11/21 15:24 */ - PageResult page(SysUserRequest sysUserRequest); - - /** - * 用户下拉列表选择 - * - * @param sysUserRequest 查询参数 - * @return 用户列表集合 - * @author luojie - * @date 2020/11/6 13:47 - */ - List selector(SysUserRequest sysUserRequest); + PageResult findPage(SysUserRequest sysUserRequest); /** * 导出用户 @@ -160,6 +148,15 @@ public interface SysUserService extends IService, UserServiceApi { */ void export(HttpServletResponse response); + /** + * 用户选择树数据 + * + * @param sysUserRequest 参数 + * @author liuhanqing + * @date 2021/1/15 11:16 + */ + List userSelectTree(SysUserRequest sysUserRequest); + /** * 根据账号获取用户 * @@ -189,15 +186,6 @@ public interface SysUserService extends IService, UserServiceApi { */ String getUserAvatarUrl(Long fileId, String token); - /** - * 用户选择树数据 - * - * @param sysUserRequest 参数 - * @author liuhanqing - * @date 2021/1/15 11:16 - */ - List userSelectTree(SysUserRequest sysUserRequest); - /** * 根据机构id获取用户树节点列表 * @@ -206,4 +194,15 @@ public interface SysUserService extends IService, UserServiceApi { * @date 2021/1/15 11:16 */ List getUserTreeNodeList(Long orgId); + + /** + * 用户下拉列表选择 + * + * @param sysUserRequest 查询参数 + * @return 用户列表集合 + * @author luojie + * @date 2020/11/6 13:47 + */ + List selector(SysUserRequest sysUserRequest); + } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserDataScopeServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserDataScopeServiceImpl.java index 3b7882305..28bc1b22c 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserDataScopeServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserDataScopeServiceImpl.java @@ -6,8 +6,8 @@ import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserDataScope; import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserDataScopeMapper; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserDataScopeService; -import cn.stylefeng.roses.kernel.system.pojo.UserDataScopeRequest; import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; +import cn.stylefeng.roses.kernel.system.pojo.user.request.UserDataScopeRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java index e5083745a..afb29439d 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java @@ -3,12 +3,12 @@ package cn.stylefeng.roses.kernel.system.modular.user.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.system.exception.SystemModularException; -import cn.stylefeng.roses.kernel.system.exception.enums.SysUserOrgExceptionEnum; +import cn.stylefeng.roses.kernel.system.exception.enums.user.SysUserOrgExceptionEnum; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserOrg; import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserOrgMapper; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserOrgService; -import cn.stylefeng.roses.kernel.system.pojo.UserOrgRequest; -import cn.stylefeng.roses.kernel.system.pojo.user.SysUserOrgResponse; +import cn.stylefeng.roses.kernel.system.pojo.user.SysUserOrgDTO; +import cn.stylefeng.roses.kernel.system.pojo.user.request.UserOrgRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; -import static cn.stylefeng.roses.kernel.system.exception.enums.SysUserOrgExceptionEnum.EMPLOYEE_MANY_MAIN_NOT_FOUND; +import static cn.stylefeng.roses.kernel.system.exception.enums.user.SysUserOrgExceptionEnum.EMPLOYEE_MANY_MAIN_NOT_FOUND; /** * 用户组织机构关联信息 @@ -28,7 +28,7 @@ import static cn.stylefeng.roses.kernel.system.exception.enums.SysUserOrgExcepti public class SysUserOrgServiceServiceImpl extends ServiceImpl implements SysUserOrgService { @Override - public SysUserOrgResponse getUserOrgInfo(Long userId) { + public SysUserOrgDTO getUserOrgInfo(Long userId) { LambdaQueryWrapper sysUserOrgLambdaQueryWrapper = new LambdaQueryWrapper<>(); sysUserOrgLambdaQueryWrapper.eq(SysUserOrg::getUserId, userId); @@ -38,7 +38,7 @@ public class SysUserOrgServiceServiceImpl extends ServiceImpl impl sysUserOrgService.add(sysUser.getUserId(), sysUserRequest.getOrgId(), sysUserRequest.getPositionId()); } + @Override + @Transactional(rollbackFor = Exception.class) + public void del(SysUserRequest sysUserRequest) { + SysUser sysUser = this.querySysUser(sysUserRequest); + + // 不能删除超级管理员 + if (YesOrNotEnum.Y.getCode().equals(sysUser.getSuperAdminFlag())) { + throw new SystemModularException(SysUserExceptionEnum.USER_CAN_NOT_DELETE_ADMIN); + } + + // 获取被授权用户的所属机构 + SysUserOrgDTO userOrgInfo = sysUserOrgService.getUserOrgInfo(sysUser.getUserId()); + Long organizationId = userOrgInfo.getOrgId(); + + // 判断当前用户有无该用户的权限 + DataScopeUtil.quickValidateDataScope(organizationId); + + // 逻辑删除，设置标识位Y + sysUser.setDelFlag(YesOrNotEnum.Y.getCode()); + this.updateById(sysUser); + + Long userId = sysUser.getUserId(); + + // 删除该用户对应的员工表信息 + sysUserOrgService.delByUserId(userId); + + // 删除该用户对应的用户-角色表关联信息 + sysUserRoleService.delByUserId(userId); + + // 删除该用户对应的用户-数据范围表关联信息 + sysUserDataScopeService.delByUserId(userId); + } + @Override @Transactional(rollbackFor = Exception.class) public void edit(SysUserRequest sysUserRequest) { @@ -164,7 +197,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - public void updateInfo(SysUserRequest sysUserRequest) { + public void editInfo(SysUserRequest sysUserRequest) { SysUser sysUser = this.querySysUser(sysUserRequest); // 填充更新用户的信息 @@ -174,7 +207,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - public void changeStatus(SysUserRequest sysUserRequest) { + public void editStatus(SysUserRequest sysUserRequest) { // 校验状态在不在枚举值里 Integer statusFlag = sysUserRequest.getStatusFlag(); @@ -201,7 +234,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - public void updatePassword(SysUserRequest sysUserRequest) { + public void editPassword(SysUserRequest sysUserRequest) { // 获取当前用户的userId LoginUser loginUser = LoginContext.me().getLoginUser(); @@ -235,7 +268,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - public void updateAvatar(SysUserRequest sysUserRequest) { + public void editAvatar(SysUserRequest sysUserRequest) { // 新头像文件id Long fileId = sysUserRequest.getAvatar(); @@ -261,7 +294,7 @@ public class SysUserServiceImpl extends ServiceImpl impl SysUser sysUser = this.querySysUser(sysUserRequest); // 获取要授权角色的用户的所属机构 - SysUserOrgResponse userOrgInfo = sysUserOrgService.getUserOrgInfo(sysUser.getUserId()); + SysUserOrgDTO userOrgInfo = sysUserOrgService.getUserOrgInfo(sysUser.getUserId()); Long organizationId = userOrgInfo.getOrgId(); // 判断当前用户有无该用户的权限 @@ -277,7 +310,7 @@ public class SysUserServiceImpl extends ServiceImpl impl SysUser sysUser = this.querySysUser(sysUserRequest); // 获取被授权用户的所属机构 - SysUserOrgResponse userOrgInfo = sysUserOrgService.getUserOrgInfo(sysUser.getUserId()); + SysUserOrgDTO userOrgInfo = sysUserOrgService.getUserOrgInfo(sysUser.getUserId()); Long organizationId = userOrgInfo.getOrgId(); // 判断当前用户有无该用户的权限 @@ -287,48 +320,15 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - @Transactional(rollbackFor = Exception.class) - public void delete(SysUserRequest sysUserRequest) { - SysUser sysUser = this.querySysUser(sysUserRequest); - - // 不能删除超级管理员 - if (YesOrNotEnum.Y.getCode().equals(sysUser.getSuperAdminFlag())) { - throw new SystemModularException(SysUserExceptionEnum.USER_CAN_NOT_DELETE_ADMIN); - } - - // 获取被授权用户的所属机构 - SysUserOrgResponse userOrgInfo = sysUserOrgService.getUserOrgInfo(sysUser.getUserId()); - Long organizationId = userOrgInfo.getOrgId(); - - // 判断当前用户有无该用户的权限 - DataScopeUtil.quickValidateDataScope(organizationId); - - // 逻辑删除，设置标识位Y - sysUser.setDelFlag(YesOrNotEnum.Y.getCode()); - this.updateById(sysUser); - - Long userId = sysUser.getUserId(); - - // 删除该用户对应的员工表信息 - sysUserOrgService.delByUserId(userId); - - // 删除该用户对应的用户-角色表关联信息 - sysUserRoleService.delByUserId(userId); - - // 删除该用户对应的用户-数据范围表关联信息 - sysUserDataScopeService.delByUserId(userId); - } - - @Override - public SysUserResponse detail(SysUserRequest sysUserRequest) { - SysUserResponse sysUserResponse = new SysUserResponse(); + public SysUserDTO detail(SysUserRequest sysUserRequest) { + SysUserDTO sysUserResponse = new SysUserDTO(); // 获取用户基本信息 SysUser sysUser = this.querySysUser(sysUserRequest); BeanUtil.copyProperties(sysUser, sysUserResponse); // 获取用户组织绑定信息 - SysUserOrgResponse userOrgInfo = sysUserOrgService.getUserOrgInfo(sysUser.getUserId()); + SysUserOrgDTO userOrgInfo = sysUserOrgService.getUserOrgInfo(sysUser.getUserId()); sysUserResponse.setOrgId(userOrgInfo.getOrgId()); sysUserResponse.setPositionId(userOrgInfo.getPositionId()); @@ -339,36 +339,13 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - public PageResult page(SysUserRequest sysUserRequest) { + public PageResult findPage(SysUserRequest sysUserRequest) { - Page userPage = this.baseMapper.findUserPage(PageFactory.defaultPage(), sysUserRequest); + Page userPage = this.baseMapper.findUserPage(PageFactory.defaultPage(), sysUserRequest); return PageResultFactory.createPageResult(userPage); } - @Override - public List selector(SysUserRequest sysUserRequest) { - - LambdaQueryWrapper wrapper = createWrapper(sysUserRequest); - - // 排除超级管理员 - wrapper.ne(SysUser::getSuperAdminFlag, YesOrNotEnum.Y.getCode()); - - // 只查询id和name - wrapper.select(SysUser::getRealName, SysUser::getUserId); - List list = this.list(wrapper); - - ArrayList results = new ArrayList<>(); - for (SysUser sysUser : list) { - SimpleDict simpleDict = new SimpleDict(); - simpleDict.setId(sysUser.getUserId()); - simpleDict.setName(sysUser.getRealName()); - results.add(simpleDict); - } - - return results; - } - @Override public void export(HttpServletResponse response) { ExcelExportParam excelExportParam = new ExcelExportParam(); @@ -383,6 +360,30 @@ public class SysUserServiceImpl extends ServiceImpl impl officeExcelApi.easyExportDownload(excelExportParam); } + @Override + public List userSelectTree(SysUserRequest sysUserRequest) { + // 定义返回结果 + List treeNodeList = CollectionUtil.newArrayList(); + List orgList = organizationServiceApi.orgList(); + UserSelectTreeNode orgTreeNode; + for (HrOrganizationDTO hrOrganization : orgList) { + orgTreeNode = new UserSelectTreeNode(); + orgTreeNode.setId(String.valueOf(hrOrganization.getOrgId())); + orgTreeNode.setPId(String.valueOf(hrOrganization.getOrgParentId())); + orgTreeNode.setName(hrOrganization.getOrgName()); + orgTreeNode.setNodeType(TreeNodeEnum.ORG.getCode()); + orgTreeNode.setValue(String.valueOf(hrOrganization.getOrgId())); + orgTreeNode.setSort(hrOrganization.getOrgSort()); + treeNodeList.add(orgTreeNode); + List userNodeList = this.getUserTreeNodeList(hrOrganization.getOrgId()); + if (userNodeList.size() > 0) { + treeNodeList.addAll(userNodeList); + } + } + // 构建树并返回 + return new DefaultTreeBuildFactory().doTreeBuild(treeNodeList); + } + @Override public SysUser getUserByAccount(String account) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -418,6 +419,49 @@ public class SysUserServiceImpl extends ServiceImpl impl return fileInfoApi.getFileAuthUrl(fileId, token); } + @Override + public List getUserTreeNodeList(Long orgId) { + // 定义返回结果 + List treeNodeList = CollectionUtil.newArrayList(); + SysUserRequest userRequest = new SysUserRequest(); + userRequest.setOrgId(orgId); + List userList = this.baseMapper.findUserList(userRequest); + UserSelectTreeNode userTreeNode; + for (SysUserDTO user : userList) { + userTreeNode = new UserSelectTreeNode(); + userTreeNode.setId(String.valueOf(user.getUserId())); + userTreeNode.setPId(String.valueOf(user.getOrgId())); + userTreeNode.setName(user.getRealName()); + userTreeNode.setNodeType(TreeNodeEnum.USER.getCode()); + userTreeNode.setValue(String.valueOf(user.getUserId())); + treeNodeList.add(userTreeNode); + } + return treeNodeList; + } + + @Override + public List selector(SysUserRequest sysUserRequest) { + + LambdaQueryWrapper wrapper = createWrapper(sysUserRequest); + + // 排除超级管理员 + wrapper.ne(SysUser::getSuperAdminFlag, YesOrNotEnum.Y.getCode()); + + // 只查询id和name + wrapper.select(SysUser::getRealName, SysUser::getUserId); + List list = this.list(wrapper); + + ArrayList results = new ArrayList<>(); + for (SysUser sysUser : list) { + SimpleDict simpleDict = new SimpleDict(); + simpleDict.setId(sysUser.getUserId()); + simpleDict.setName(sysUser.getRealName()); + results.add(simpleDict); + } + + return results; + } + @Override public UserLoginInfoDTO getUserLoginInfo(String account) { @@ -433,7 +477,7 @@ public class SysUserServiceImpl extends ServiceImpl impl DataScopeDTO dataScopeResponse = dataScopeApi.getDataScope(userId, roleResponseList); // 4. 获取用户的组织机构和职位信息 - SysUserOrgResponse userOrgInfo = sysUserOrgService.getUserOrgInfo(userId); + SysUserOrgDTO userOrgInfo = sysUserOrgService.getUserOrgInfo(userId); // 5. 获取用户的所有资源url List resourceCodeList = roleServiceApi.getRoleResourceCodeList(roleIds); @@ -501,11 +545,11 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - public List onlineUserList(OnlineUserRequest onlineUserRequest) { + public List onlineUserList(OnlineUserRequest onlineUserRequest) { List loginUsers = sessionManagerApi.onlineUserList(); // 对象转化 - List result = loginUsers.stream().map(OnlineUserCreateFactory::createOnlineUser).collect(Collectors.toList()); + List result = loginUsers.stream().map(OnlineUserCreateFactory::createOnlineUser).collect(Collectors.toList()); // 如果带了条件则根据account筛选结果 if (StrUtil.isNotBlank(onlineUserRequest.getAccount())) { @@ -516,47 +560,29 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - public cn.stylefeng.roses.kernel.system.pojo.user.SysUserResponse getUserInfoByUserId(Long userId) { + public SysUserDTO getUserInfoByUserId(Long userId) { SysUser sysUser = this.getById(userId); if (ObjectUtil.isNotEmpty(sysUser)) { - return BeanUtil.copyProperties(sysUser, cn.stylefeng.roses.kernel.system.pojo.user.SysUserResponse.class); + return BeanUtil.copyProperties(sysUser, SysUserDTO.class); } return null; } - @Override public List queryAllUserIdList(SysUserRequest sysUserRequest) { LambdaQueryWrapper wrapper = createWrapper(sysUserRequest); // 排除超级管理员 -// wrapper.ne(SysUser::getSuperAdminFlag, YesOrNotEnum.Y.getCode()); + wrapper.ne(SysUser::getSuperAdminFlag, YesOrNotEnum.Y.getCode()); // 只查询id wrapper.select(SysUser::getUserId); + // 查询全部用户ID Function mapper = id -> Long.valueOf(id.toString()); - List userIds = this.listObjs(wrapper, mapper); - return userIds; - } - - /** - * 获取系统用户信息 - * - * @author liuhanqing - * @date 2021/1/4 22:54 - */ - @Override - public SysUserDTO getUserInfo(Long userId) { - SysUser sysUser = this.getById(userId); - if (ObjectUtil.isNull(sysUser)) { - throw new SystemModularException(SysUserExceptionEnum.USER_NOT_EXIST, userId); - } - SysUserDTO userDTO = new SysUserDTO(); - BeanUtil.copyProperties(sysUser, userDTO); - return userDTO; + return this.listObjs(wrapper, mapper); } @Override @@ -567,6 +593,7 @@ public class SysUserServiceImpl extends ServiceImpl impl // 只查询id wrapper.select(SysUser::getUserId); + // 查询用户 SysUser sysUser = this.getOne(wrapper); if (sysUser == null || sysUser.getUserId() == null) { @@ -590,51 +617,6 @@ public class SysUserServiceImpl extends ServiceImpl impl return sysUser; } - @Override - public List userSelectTree(SysUserRequest sysUserRequest) { - // 定义返回结果 - List treeNodeList = CollectionUtil.newArrayList(); - List orgList = organizationServiceApi.orgList(); - UserSelectTreeNode orgTreeNode; - for (HrOrganizationDTO hrOrganization : orgList) { - orgTreeNode = new UserSelectTreeNode(); - orgTreeNode.setId(String.valueOf(hrOrganization.getOrgId())); - orgTreeNode.setPId(String.valueOf(hrOrganization.getOrgParentId())); - orgTreeNode.setName(hrOrganization.getOrgName()); - orgTreeNode.setNodeType(TreeNodeEnum.ORG.getCode()); - orgTreeNode.setValue(String.valueOf(hrOrganization.getOrgId())); - orgTreeNode.setSort(hrOrganization.getOrgSort()); - treeNodeList.add(orgTreeNode); - List userNodeList = this.getUserTreeNodeList(hrOrganization.getOrgId()); - if (userNodeList.size() > 0) { - treeNodeList.addAll(userNodeList); - } - } - // 构建树并返回 - return new DefaultTreeBuildFactory().doTreeBuild(treeNodeList); - } - - @Override - public List getUserTreeNodeList(Long orgId) { - // 定义返回结果 - List treeNodeList = CollectionUtil.newArrayList(); - SysUserRequest userRequest = new SysUserRequest(); - userRequest.setOrgId(orgId); - List userList = this.baseMapper.findUserList(userRequest); - UserSelectTreeNode userTreeNode; - for (SysUserResponse user : userList) { - userTreeNode = new UserSelectTreeNode(); - userTreeNode.setId(String.valueOf(user.getUserId())); - userTreeNode.setPId(String.valueOf(user.getOrgId())); - userTreeNode.setName(user.getRealName()); - userTreeNode.setNodeType(TreeNodeEnum.USER.getCode()); - userTreeNode.setValue(String.valueOf(user.getUserId())); -// userTreeNode.setSort(hrOrganization.getOrgSort()); - treeNodeList.add(userTreeNode); - } - return treeNodeList; - } - /** * 创建查询用户的wrapper * @@ -644,14 +626,18 @@ public class SysUserServiceImpl extends ServiceImpl impl private LambdaQueryWrapper createWrapper(SysUserRequest sysUserRequest) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + // 查询未删除状态的 + queryWrapper.eq(SysUser::getDelFlag, YesOrNotEnum.N.getCode()); + + if (ObjectUtil.isEmpty(sysUserRequest)) { + return queryWrapper; + } + // SQL拼接 queryWrapper.eq(ObjectUtil.isNotEmpty(sysUserRequest.getUserId()), SysUser::getUserId, sysUserRequest.getUserId()); queryWrapper.like(ObjectUtil.isNotEmpty(sysUserRequest.getAccount()), SysUser::getAccount, sysUserRequest.getAccount()); queryWrapper.eq(ObjectUtil.isNotEmpty(sysUserRequest.getRealName()), SysUser::getRealName, sysUserRequest.getRealName()); - // 查询未删除状态的 - queryWrapper.eq(SysUser::getDelFlag, YesOrNotEnum.N.getCode()); - return queryWrapper; }