From 9f4c4e77bd7936645d174f21a6abf8951b533e8d Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 18 一月 2022 17:51:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java
index 96ffa7d..5516885 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java
@@ -3,13 +3,17 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.sandu.common.enums.RoleLevelStatus;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.execption.EntityExistException;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.MenuParam;
+import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.bo.MenuNode;
import com.sandu.ximon.dao.domain.AdminRoleRelation;
import com.sandu.ximon.dao.domain.Menu;
+import com.sandu.ximon.dao.domain.Role;
import com.sandu.ximon.dao.domain.RoleMenuRelation;
import com.sandu.ximon.dao.mapper.AdminRoleRelationMapper;
import com.sandu.ximon.dao.mapper.MenuMapper;
@@ -17,6 +21,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -79,6 +84,12 @@
throw new BusinessException("鎵句笉鍒拌彍鍗曚俊鎭�");
}
+ List<Role> roles = SpringContextHolder.getBean(RoleService.class).listByAdminId(SecurityUtils.getUserId());
+ Integer roleLevel = roles.stream().map(Role::getLevel).min(Integer::compareTo).orElse(RoleLevelStatus.COMMON.getCode());
+ if(!RoleLevelStatus.SUPER.getCode().equals(roleLevel)){
+ throw new BusinessException("瓒呯骇绠＄悊鍛樻墠鍙互缂栬緫鑿滃崟");
+ }
+
Menu menu = new Menu();
BeanUtils.copyProperties(param,menu);
menu.setId(menuId);
@@ -91,4 +102,18 @@
.filter(menu -> menu.getPid().equals(0L))
.map(menu -> covertMenuNode(menu, list)).collect(Collectors.toList());
}
+
+ public boolean delMenu(Long menuId) {
+ Menu one = getById(menuId);
+ if (one == null) {
+ throw new BusinessException("鎵句笉鍒拌彍鍗曚俊鎭�");
+ }
+
+ List<Role> roles = SpringContextHolder.getBean(RoleService.class).listByAdminId(SecurityUtils.getUserId());
+ Integer roleLevel = roles.stream().map(Role::getLevel).min(Integer::compareTo).orElse(RoleLevelStatus.COMMON.getCode());
+ if(!RoleLevelStatus.SUPER.getCode().equals(roleLevel)){
+ throw new BusinessException("瓒呯骇绠＄悊鍛樻墠鍙互鍒犻櫎鑿滃崟");
+ }
+ return removeById(menuId);
+ }
}
--
Gitblit v1.9.3