From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java | 99 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 78 insertions(+), 21 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java
index 2426ae0..3d35427 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.system.UserInfo;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.enums.RoleLevelStatus;
@@ -12,6 +13,7 @@
import com.sandu.ximon.admin.param.RoleParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.*;
+import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.mapper.MenuMapper;
import com.sandu.ximon.dao.mapper.RoleMapper;
import lombok.AllArgsConstructor;
@@ -32,6 +34,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,17 +43,21 @@
/**
* 鑾峰彇鎸囧畾绠＄悊鍛樼殑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("褰撳墠鐢ㄦ埛娌℃湁瑙掕壊");
}
List<Long> roleIdList = roles.stream().map(Role::getId).collect(Collectors.toList());
- List<Long> menuIdList = roleMenuRelationService.list(Wrappers.lambdaQuery(RoleMenuRelation.class).in(RoleMenuRelation::getRoleId, roleIdList).select(RoleMenuRelation::getMenuId))
- .stream().map(RoleMenuRelation::getMenuId).distinct().collect(Collectors.toList());
+ List<Long> menuIdList = roleMenuRelationService.list(Wrappers.lambdaQuery(RoleMenuRelation.class).in(RoleMenuRelation::getRoleId, roleIdList)
+ .select(RoleMenuRelation::getMenuId)).stream().map(RoleMenuRelation::getMenuId).distinct().collect(Collectors.toList());
Set<String> menuPermissions = new HashSet<>();
// 鑿滃崟鏉冮檺
@@ -74,8 +81,22 @@
*/
public List<Role> listByAdminId(Long adminId) {
// 鑾峰彇绠＄悊鍛樼殑瑙掕壊id
- List<AdminRoleRelation> list = adminRoleRelationService.list(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId, adminId).select(AdminRoleRelation::getRoleId));
+ 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;
}
@@ -90,7 +111,23 @@
Role role = new Role();
role.setName(param.getName());
role.setRemark(param.getRemark());
- role.setLevel(RoleLevelStatus.COMMON.getCode());
+ //璁剧疆瑙掕壊鏉冮檺绛夌骇
+ if (param.getLevel() != null) {
+ if (param.getLevel().equals(RoleLevelStatus.SUPER.getCode())) {
+ throw new BusinessException("鏃犳硶娣诲姞瓒呯骇绠＄悊鍛樿鑹�");
+ } else if (param.getLevel().equals(RoleLevelStatus.COMMON.getCode())) {
+ role.setLevel(RoleLevelStatus.COMMON.getCode());
+ } else if (param.getLevel().equals(RoleLevelStatus.NORMAL.getCode())) {
+ role.setLevel(RoleLevelStatus.NORMAL.getCode());
+ } else if (param.getLevel().equals(RoleLevelStatus.NORMAL2.getCode())) {
+ role.setLevel(RoleLevelStatus.NORMAL2.getCode());
+ } else {
+ role.setLevel(RoleLevelStatus.NORMAL.getCode());
+ }
+ } else {
+ role.setLevel(RoleLevelStatus.NORMAL.getCode());
+ }
+
if (!save(role)) {
throw new BusinessException("娣诲姞瑙掕壊澶辫触");
}
@@ -106,12 +143,35 @@
if (role == null) {
throw new BusinessException("鎵句笉鍒拌鑹蹭俊鎭�");
}
+ //鍒ゆ柇鏄湁鏉冮檺淇敼
assertLevels(role.getLevel());
- Role update = new Role();
- update.setId(roleId);
- update.setName(param.getName());
- update.setRemark(param.getRemark());
- if (!updateById(update)) {
+
+ role.setName(param.getName());
+ role.setRemark(param.getRemark());
+
+ if (!role.getLevel().equals(RoleLevelStatus.SUPER.getCode())) {
+ //璁剧疆瑙掕壊鏉冮檺绛夌骇
+ if (param.getLevel() != null) {
+ if (param.getLevel().equals(RoleLevelStatus.SUPER.getCode())) {
+ throw new BusinessException("鏃犳硶淇敼鎴愯秴绾х鐞嗗憳瑙掕壊");
+ } else if (param.getLevel().equals(RoleLevelStatus.COMMON.getCode())) {
+ role.setLevel(RoleLevelStatus.COMMON.getCode());
+ } else if (param.getLevel().equals(RoleLevelStatus.NORMAL.getCode())) {
+ role.setLevel(RoleLevelStatus.NORMAL.getCode());
+ } else if (param.getLevel().equals(RoleLevelStatus.NORMAL2.getCode())) {
+ role.setLevel(RoleLevelStatus.NORMAL2.getCode());
+ } else {
+ role.setLevel(RoleLevelStatus.NORMAL.getCode());
+ }
+ } else {
+ role.setLevel(RoleLevelStatus.NORMAL.getCode());
+ }
+ } else if (!param.getLevel().equals(RoleLevelStatus.SUPER.getCode())) {
+ throw new BusinessException("瓒呯骇绠＄悊鍛樿鑹茬瓑绾ф棤娉曚慨鏀癸紒");
+ }
+
+
+ if (!updateById(role)) {
throw new BusinessException("缂栬緫瑙掕壊澶辫触");
}
roleMenuRelationService.remove(Wrappers.lambdaQuery(RoleMenuRelation.class).eq(RoleMenuRelation::getRoleId, roleId));
@@ -149,7 +209,7 @@
throw new BusinessException("鎵句笉鍒拌鑹�");
}
//瓒呯骇绠＄悊鍛樹笉鑳藉垹闄�
- if(RoleLevelStatus.SUPER.getCode().equals(role.getLevel())){
+ if (RoleLevelStatus.SUPER.getCode().equals(role.getLevel())) {
throw new BusinessException("褰撳墠瑙掕壊涓鸿秴绾х鐞嗗憳锛屾棤娉曞垹闄�");
}
@@ -157,6 +217,10 @@
List<AdminRoleRelation> list = adminRoleRelationService.list(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getRoleId, role));
if (CollectionUtil.isNotEmpty(list)) {
throw new BusinessException("褰撳墠瑙掕壊鏈夌鐞嗗憳浣跨敤锛屾棤娉曞垹闄�");
+ }
+ List<ClientRoleRelation> listClient = clientRoleRelationService.list(Wrappers.lambdaQuery(ClientRoleRelation.class).eq(ClientRoleRelation::getRoleId, role));
+ if (CollectionUtil.isNotEmpty(listClient)) {
+ throw new BusinessException("褰撳墠瑙掕壊鏈夌敤鎴蜂娇鐢紝鏃犳硶鍒犻櫎");
}
roleMenuRelationService.remove(Wrappers.lambdaQuery(RoleMenuRelation.class).eq(RoleMenuRelation::getRoleId, roleId));
return removeById(roleId);
@@ -170,13 +234,6 @@
}
List<RoleDetail> list = baseMapper.listRole(roleIdList);
- for (RoleDetail roleDetail : list) {
- if (roleDetail.getId() == 1) {
- roleDetail.setMenuIdList(menuMapper.listMenu());
-
- break;
- }
- }
return list;
}
--
Gitblit v1.9.3