From 0eaf43c76455f4dc0892ccf7c35d061494df3e01 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Mon, 15 Apr 2024 13:41:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=9C=8D=E5=8A=A1=E5=AE=9E=E7=8E=B0=EF=BC=8C=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E7=AD=9B=E9=80=89=E7=94=B1ID=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E4=B8=BA=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsl/oa/controllers/AuthController.java | 2 +- src/main/java/com/jsl/oa/dao/UserDAO.java | 4 +-- .../oa/model/vodata/UserCurrentBackVO.java | 2 +- .../jsl/oa/model/vodata/UserReturnBackVO.java | 2 +- .../jsl/oa/services/impl/AuthServiceImpl.java | 12 +++++-- .../jsl/oa/services/impl/UserServiceImpl.java | 2 +- .../java/com/jsl/oa/utils/Processing.java | 32 ++++++++++++++++++- 7 files changed, 47 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/jsl/oa/controllers/AuthController.java b/src/main/java/com/jsl/oa/controllers/AuthController.java index 8300945..c26aa60 100755 --- a/src/main/java/com/jsl/oa/controllers/AuthController.java +++ b/src/main/java/com/jsl/oa/controllers/AuthController.java @@ -178,7 +178,7 @@ public class AuthController { if (bindingResult.hasErrors()) { return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult)); } - return authService.authChangePassword(request, userChangePasswordVO); + return authService.authChangePassword(userChangePasswordVO, request); } /** diff --git a/src/main/java/com/jsl/oa/dao/UserDAO.java b/src/main/java/com/jsl/oa/dao/UserDAO.java index cecf804..5ea8f50 100755 --- a/src/main/java/com/jsl/oa/dao/UserDAO.java +++ b/src/main/java/com/jsl/oa/dao/UserDAO.java @@ -118,10 +118,10 @@ public class UserDAO { * * @param id */ - public void userLock(Long id,Long isLock) { + public void userLock(Long id, Long isLock) { log.info("\t> 执行 DAO 层 UserDAO.userLock 方法"); log.info("\t\t> 从 MySQL 获取数据"); - userMapper.userLock(id,isLock); + userMapper.userLock(id, isLock); } public void userEditProfile(UserEditProfileVO userEditProfileVO) { diff --git a/src/main/java/com/jsl/oa/model/vodata/UserCurrentBackVO.java b/src/main/java/com/jsl/oa/model/vodata/UserCurrentBackVO.java index 1385644..199ac08 100755 --- a/src/main/java/com/jsl/oa/model/vodata/UserCurrentBackVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserCurrentBackVO.java @@ -32,7 +32,7 @@ public class UserCurrentBackVO { @Data @Accessors(chain = true) public static class ReturnUserRole { - private Long rid; + private String name; } @Data diff --git a/src/main/java/com/jsl/oa/model/vodata/UserReturnBackVO.java b/src/main/java/com/jsl/oa/model/vodata/UserReturnBackVO.java index 07f52d7..80bd69e 100755 --- a/src/main/java/com/jsl/oa/model/vodata/UserReturnBackVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserReturnBackVO.java @@ -25,7 +25,7 @@ public class UserReturnBackVO { @Data @Accessors(chain = true) public static class ReturnUserRole { - private Long rid; + private String name; } @Data diff --git a/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java index 25776df..abcf33c 100755 --- a/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java @@ -5,6 +5,7 @@ import com.jsl.oa.common.constant.BusinessConstants; import com.jsl.oa.dao.PermissionDAO; import com.jsl.oa.dao.RoleDAO; import com.jsl.oa.mapper.UserMapper; +import com.jsl.oa.model.dodata.RoleDO; import com.jsl.oa.model.dodata.RoleUserDO; import com.jsl.oa.model.dodata.UserDO; import com.jsl.oa.model.vodata.*; @@ -281,14 +282,21 @@ public class AuthServiceImpl implements AuthService { } else { getUserRole.setUid(null); } + // 获取角色信息 + RoleDO getRole = roleDAO.getRoleById(getUserRole.getRid()); + String getRoleString; + if (getRole != null) { + getRoleString = getRole.getRoleName(); + } else { + getRoleString = "default"; + } userReturnBackVO.setUser(new UserReturnBackVO.ReturnUser() .setId(userDO.getId()) .setJobId(userDO.getJobId()) .setUsername(userDO.getUsername()) .setEmail(userDO.getEmail()) .setPhone(userDO.getPhone())) - .setRole(new UserReturnBackVO.ReturnUserRole() - .setRid(getUserRole.getRid())) + .setRole(new UserReturnBackVO.ReturnUserRole().setName(getRoleString)) .setToken(token) .setPermission(getPermissionForString); return ResultUtil.success("登陆成功", userReturnBackVO); diff --git a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java index 050c9dc..72df623 100755 --- a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java @@ -124,7 +124,7 @@ public class UserServiceImpl implements UserService { } // 检查是否存在 Role 筛选 if (userAllCurrentVO.getRole() != null) { - userCurrentBackVO.getUsers().removeIf(it -> !userAllCurrentVO.getRole().equals(it.getRole().getRid())); + userCurrentBackVO.getUsers().removeIf(it -> !userAllCurrentVO.getRole().equals(it.getRole().getName())); } return ResultUtil.success(userCurrentBackVO); } diff --git a/src/main/java/com/jsl/oa/utils/Processing.java b/src/main/java/com/jsl/oa/utils/Processing.java index 2ce83d2..14a6d4f 100755 --- a/src/main/java/com/jsl/oa/utils/Processing.java +++ b/src/main/java/com/jsl/oa/utils/Processing.java @@ -299,7 +299,37 @@ public class Processing { // 获取权限列表信息 getPermissionForString = permissionDAO.getPermission(userDO.getId()); } - userCurrent.setUser(new UserCurrentBackVO.ReturnUser().setId(userDO.getId()).setJobId(userDO.getJobId()).setUsername(userDO.getUsername()).setAddress(userDO.getAddress()).setPhone(userDO.getPhone()).setEmail(userDO.getEmail()).setAge(userDO.getAge()).setSignature(userDO.getSignature()).setAvatar(userDO.getAvatar()).setNickname(userDO.getNickname()).setSex(userDO.getSex()).setEnabled(userDO.getEnabled()).setAccountNoExpired(userDO.getAccountNoExpired()).setCredentialsNoExpired(userDO.getCredentialsNoExpired()).setRecommend(userDO.getRecommend()).setAccountNoLocked(userDO.getAccountNoLocked()).setDescription(userDO.getDescription()).setCreatedAt(userDO.getCreatedAt()).setUpdatedAt(userDO.getUpdatedAt()).setIsDelete(userDO.getIsDelete())).setRole(new UserCurrentBackVO.ReturnUserRole().setRid(getUserRole.getRid())).setPermission(getPermissionForString); + RoleDO getRole = roleDAO.getRoleById(getUserRole.getRid()); + String getRoleString; + if (getRole != null) { + getRoleString = getRole.getRoleName(); + } else { + getRoleString = "default"; + } + userCurrent + .setUser(new UserCurrentBackVO.ReturnUser() + .setId(userDO.getId()) + .setJobId(userDO.getJobId()) + .setUsername(userDO.getUsername()) + .setAddress(userDO.getAddress()) + .setPhone(userDO.getPhone()) + .setEmail(userDO.getEmail()) + .setAge(userDO.getAge()) + .setSignature(userDO.getSignature()) + .setAvatar(userDO.getAvatar()) + .setNickname(userDO.getNickname()) + .setSex(userDO.getSex()) + .setEnabled(userDO.getEnabled()) + .setAccountNoExpired(userDO.getAccountNoExpired()) + .setCredentialsNoExpired(userDO.getCredentialsNoExpired()) + .setRecommend(userDO.getRecommend()) + .setAccountNoLocked(userDO.getAccountNoLocked()) + .setDescription(userDO.getDescription()) + .setCreatedAt(userDO.getCreatedAt()) + .setUpdatedAt(userDO.getUpdatedAt()) + .setIsDelete(userDO.getIsDelete())) + .setRole(new UserCurrentBackVO.ReturnUserRole().setName(getRoleString)) + .setPermission(getPermissionForString); return userCurrent; } From 102b900e5581c2c3b21f054c87c1ffef7a7fde85 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Mon, 15 Apr 2024 15:37:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?patch:=20=E9=94=99=E8=AF=AF=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java index 72df623..ab7cda2 100755 --- a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java @@ -262,7 +262,7 @@ public class UserServiceImpl implements UserService { UserDO userDO = userDAO.getUserById(Processing.getAuthHeaderToUserId(request)); UserProfileVo userProfileVo = new UserProfileVo(); Processing.copyProperties(userDO, userProfileVo); - userProfileVo.setRole(roleDAO.getRoleNameByUid(userDO.getId()).getDisplayName()); + userProfileVo.setRole(roleDAO.getRoleNameByUid(userDO.getId()).getRoleName()); userProfileVo.setSex(Processing.getSex(userDO.getSex())); return ResultUtil.success(userProfileVo); } From 327f26fc30832e1d2579cd9a2a86634407336008 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Mon, 15 Apr 2024 16:17:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor=EF=BC=9A=E5=B0=86Role=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E6=9B=BF=E6=8D=A2=E4=B8=BAString=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BB=A5=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsl/oa/model/vodata/UserAllCurrentVO.java | 2 +- .../java/com/jsl/oa/model/vodata/UserCurrentBackVO.java | 8 +------- .../java/com/jsl/oa/model/vodata/UserReturnBackVO.java | 8 +------- .../java/com/jsl/oa/services/impl/AuthServiceImpl.java | 2 +- .../java/com/jsl/oa/services/impl/UserServiceImpl.java | 2 +- src/main/java/com/jsl/oa/utils/Processing.java | 2 +- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/jsl/oa/model/vodata/UserAllCurrentVO.java b/src/main/java/com/jsl/oa/model/vodata/UserAllCurrentVO.java index 63b7eaf..a2e7538 100644 --- a/src/main/java/com/jsl/oa/model/vodata/UserAllCurrentVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserAllCurrentVO.java @@ -9,5 +9,5 @@ public class UserAllCurrentVO { private Long page; private Long limit; private String search; - private Long role; + private String role; } diff --git a/src/main/java/com/jsl/oa/model/vodata/UserCurrentBackVO.java b/src/main/java/com/jsl/oa/model/vodata/UserCurrentBackVO.java index 199ac08..a1d24b1 100755 --- a/src/main/java/com/jsl/oa/model/vodata/UserCurrentBackVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserCurrentBackVO.java @@ -25,16 +25,10 @@ public class UserCurrentBackVO { @Accessors(chain = true) public static class UserCurrent { private ReturnUser user; - private ReturnUserRole role; + private String role; private List permission; } - @Data - @Accessors(chain = true) - public static class ReturnUserRole { - private String name; - } - @Data @Accessors(chain = true) public static class ReturnUser { diff --git a/src/main/java/com/jsl/oa/model/vodata/UserReturnBackVO.java b/src/main/java/com/jsl/oa/model/vodata/UserReturnBackVO.java index 80bd69e..694da21 100755 --- a/src/main/java/com/jsl/oa/model/vodata/UserReturnBackVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserReturnBackVO.java @@ -18,16 +18,10 @@ import java.util.List; @Accessors(chain = true) public class UserReturnBackVO { private ReturnUser user; - private ReturnUserRole role; + private String role; private String token; private List permission; - @Data - @Accessors(chain = true) - public static class ReturnUserRole { - private String name; - } - @Data @Accessors(chain = true) public static class ReturnUser { diff --git a/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java index abcf33c..697c9d3 100755 --- a/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java @@ -296,7 +296,7 @@ public class AuthServiceImpl implements AuthService { .setUsername(userDO.getUsername()) .setEmail(userDO.getEmail()) .setPhone(userDO.getPhone())) - .setRole(new UserReturnBackVO.ReturnUserRole().setName(getRoleString)) + .setRole(getRoleString) .setToken(token) .setPermission(getPermissionForString); return ResultUtil.success("登陆成功", userReturnBackVO); diff --git a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java index ab7cda2..c25c4ed 100755 --- a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java @@ -124,7 +124,7 @@ public class UserServiceImpl implements UserService { } // 检查是否存在 Role 筛选 if (userAllCurrentVO.getRole() != null) { - userCurrentBackVO.getUsers().removeIf(it -> !userAllCurrentVO.getRole().equals(it.getRole().getName())); + userCurrentBackVO.getUsers().removeIf(it -> !userAllCurrentVO.getRole().equals(it.getRole())); } return ResultUtil.success(userCurrentBackVO); } diff --git a/src/main/java/com/jsl/oa/utils/Processing.java b/src/main/java/com/jsl/oa/utils/Processing.java index 14a6d4f..b0d8546 100755 --- a/src/main/java/com/jsl/oa/utils/Processing.java +++ b/src/main/java/com/jsl/oa/utils/Processing.java @@ -328,7 +328,7 @@ public class Processing { .setCreatedAt(userDO.getCreatedAt()) .setUpdatedAt(userDO.getUpdatedAt()) .setIsDelete(userDO.getIsDelete())) - .setRole(new UserCurrentBackVO.ReturnUserRole().setName(getRoleString)) + .setRole(getRoleString) .setPermission(getPermissionForString); return userCurrent; }