style: 优化登录用户信息角色相关信息命名

1.roles => roleCodes 2.roleSet => roles
continew-org · Sep 1, 2023 · be394f3 · be394f3
1 parent d20aadf
commit be394f3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.../src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java b/.../src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java
@@ -108,7 +108,7 @@ public Expression getSqlSegment(Expression where, String mappedStatementId) {
  */
  private static Expression buildDataScopeFilter(LoginUser user, String tableAlias, Expression where) {
  Expression expression = null;
- for (RoleDTO role : user.getRoleSet()) {
+ for (RoleDTO role : user.getRoles()) {
  DataScopeEnum dataScope = role.getDataScope();
  if (DataScopeEnum.ALL.equals(dataScope)) {
  return where;

diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java
@@ -60,12 +60,12 @@ public class LoginUser implements Serializable {
  /**
  * 角色编码集合
  */
- private Set<String> roles;
+ private Set<String> roleCodes;
 
  /**
  * 角色集合
  */
- private Set<RoleDTO> roleSet;
+ private Set<RoleDTO> roles;
 
  /**
  * 令牌

diff --git a/...system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenPermissionImpl.java b/...system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenPermissionImpl.java
@@ -48,6 +48,6 @@ public List<String> getPermissionList(Object loginId, String loginType) {
  @Override
  public List<String> getRoleList(Object loginId, String loginType) {
  LoginUser loginUser = LoginHelper.getLoginUser();
- return new ArrayList<>(loginUser.getRoles());
+ return new ArrayList<>(loginUser.getRoleCodes());
  }
 }
diff --git a/...-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java b/...-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java
@@ -79,8 +79,8 @@ public String login(String username, String password) {
  // 登录
  LoginUser loginUser = BeanUtil.copyProperties(user, LoginUser.class);
  loginUser.setPermissions(permissionService.listPermissionByUserId(userId));
- loginUser.setRoles(permissionService.listRoleCodeByUserId(userId));
- loginUser.setRoleSet(roleService.listByUserId(userId));
+ loginUser.setRoleCodes(permissionService.listRoleCodeByUserId(userId));
+ loginUser.setRoles(roleService.listByUserId(userId));
  LoginHelper.login(loginUser);
 
  // 返回令牌

diff --git a/...n-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java b/...n-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java
@@ -85,7 +85,7 @@ public List<LoginUser> list(OnlineUserQuery query) {
  public void cleanByRoleId(Long roleId) {
  List<LoginUser> loginUserList = this.list(new OnlineUserQuery());
  loginUserList.parallelStream().forEach(u -> {
- if (u.getRoleSet().stream().anyMatch(r -> r.getId().equals(roleId))) {
+ if (u.getRoles().stream().anyMatch(r -> r.getId().equals(roleId))) {
  try {
  StpUtil.logoutByTokenValue(u.getToken());
  } catch (NotLoginException ignored) {

diff --git a/...in-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/LoginController.java b/...in-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/LoginController.java
@@ -101,7 +101,7 @@ public R<UserInfoVO> getUserInfo() {
  UserDetailVO userDetailVO = userService.get(loginUser.getId());
  UserInfoVO userInfoVO = BeanUtil.copyProperties(userDetailVO, UserInfoVO.class);
  userInfoVO.setPermissions(loginUser.getPermissions());
- userInfoVO.setRoles(loginUser.getRoles());
+ userInfoVO.setRoles(loginUser.getRoleCodes());
  return R.ok(userInfoVO);
  }