普通用户登录fix

zhanzhiqin

2022-03-09 7477ef6ab4e6aa1189424c5bd3af6f12ae591e88

普通用户登录fix

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java

@@ -74,7 +74,7 @@
            return ResponseUtil.error(ResponseStatusEnums.DISABLE_ACCOUNT.getCode(), ResponseStatusEnums.DISABLE_ACCOUNT.getMessage());
        }

        Collection<GrantedAuthority> grantedAuthorities = roleService.mapToGrantedAuthorities(admin.getId());
        Collection<GrantedAuthority> grantedAuthorities = roleService.mapToGrantedAuthorities(admin.getId(), true);

        LoginUserInfo loginUserInfo = new LoginUserInfo();
        loginUserInfo.setUserId(admin.getId());

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java

@@ -107,7 +107,7 @@
            return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
        }

        Collection<GrantedAuthority> grantedAuthorities = roleService.mapToGrantedAuthorities(client.getId());
        Collection<GrantedAuthority> grantedAuthorities = roleService.mapToGrantedAuthorities(client.getId(), false);

        LoginUserInfo loginUserInfo = new LoginUserInfo();
        loginUserInfo.setUserId(client.getId());

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminDetailsServiceImpl.java

@@ -27,7 +27,7 @@

    @Override
    public UserDetails loadUserByUsername(String username) {
        log.info("loadUserByUsername ==  {}",username);
        log.info("loadUserByUsername ==  {}", username);
        Admin admin = adminService.findByUserName(username);
        if (admin == null) {
            throw new IllegalArgumentException("账号不存在");
@@ -39,7 +39,7 @@
    private UserDetails createJwtUser(Admin admin) {
        return new AdminJwtUser(
                admin,
                roleService.mapToGrantedAuthorities(admin.getId())
                roleService.mapToGrantedAuthorities(admin.getId(), true)
        );
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java

@@ -32,6 +32,7 @@
public class RoleService extends BaseServiceImpl<RoleMapper, Role> {

    private final AdminRoleRelationService adminRoleRelationService;
    private final ClientRoleRelationService clientRoleRelationService;
    private final RoleMenuRelationService roleMenuRelationService;
    private final MenuService menuService;
    private final MenuMapper menuMapper;
@@ -40,10 +41,14 @@
    /**
     * 获取指定管理员的spring security权限认证列表
     */
    public Collection<GrantedAuthority> mapToGrantedAuthorities(Long adminId) {

        // 获取管理员的角色id
        List<Role> roles = listByAdminId(adminId);
    public Collection<GrantedAuthority> mapToGrantedAuthorities(Long adminId, boolean flag) {
        List<Role> roles;
        if (flag) {
            // 获取管理员的角色id
            roles = listByAdminId(adminId);
        } else {
            roles = listByClientId(adminId);
        }

        if (CollectionUtil.isEmpty(roles)) {
            throw new BusinessException("当前用户没有角色");
@@ -76,6 +81,19 @@
        // 获取管理员的角色id
        List<AdminRoleRelation> list = adminRoleRelationService.list(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId, adminId).select(AdminRoleRelation::getRoleId));
        List<Long> roleIdList = list.stream().map(AdminRoleRelation::getRoleId).collect(Collectors.toList());
        if (CollectionUtil.isEmpty(roleIdList)) {
            return null;
        }
        return listByIds(roleIdList);
    }

    /**
     * 获取某个普通用户的角色列表
     */
    public List<Role> listByClientId(Long clientId) {
        // 获取普通用户的角色id
        List<ClientRoleRelation> list = clientRoleRelationService.list(Wrappers.lambdaQuery(ClientRoleRelation.class).eq(ClientRoleRelation::getClientId, clientId).select(ClientRoleRelation::getRoleId));
        List<Long> roleIdList = list.stream().map(ClientRoleRelation::getRoleId).collect(Collectors.toList());
        if (CollectionUtil.isEmpty(roleIdList)) {
            return null;
        }
@@ -149,7 +167,7 @@
            throw new BusinessException("找不到角色");
        }
        //超级管理员不能删除
        if(RoleLevelStatus.SUPER.getCode().equals(role.getLevel())){
        if (RoleLevelStatus.SUPER.getCode().equals(role.getLevel())) {
            throw new BusinessException("当前角色为超级管理员，无法删除");
        }