From bfce748e37a753c729e15dd233600379f504d019 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 四月 2022 13:59:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 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..e2945b0 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
@@ -2,14 +2,19 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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 +22,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;
@@ -30,6 +36,8 @@
public class MenuService extends BaseServiceImpl<MenuMapper, Menu> {
private final RoleMenuRelationService roleMenuRelationService;
+ private MenuMapper menuMapper;
+
/**
* 鑾峰彇瑙掕壊涓嬬殑鑿滃崟
*/
@@ -39,12 +47,14 @@
if (CollectionUtil.isEmpty(menuIdList)) {
return null;
}
- return listByIds(menuIdList);
+
+ return menuMapper.listMenuById(menuIdList);
}
public boolean addMenu(MenuParam param) {
Menu menu = new Menu();
- BeanUtils.copyProperties(param,menu);
+ BeanUtils.copyProperties(param, menu);
+ menu.setPermission(param.getRouterName());
return save(menu);
}
@@ -73,22 +83,52 @@
return node;
}
- public boolean updateMenu(Long menuId,MenuParam param) {
+ public boolean updateMenu(Long menuId, MenuParam param) {
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("瓒呯骇绠＄悊鍛樻墠鍙互缂栬緫鑿滃崟");
+ }
+
Menu menu = new Menu();
- BeanUtils.copyProperties(param,menu);
+ BeanUtils.copyProperties(param, menu);
+ menu.setPermission(param.getRouterName());
menu.setId(menuId);
return updateById(menu);
}
public List<MenuNode> treeList() {
- List<Menu> list = list();
+ LambdaQueryWrapper<Menu> menuLambdaQueryWrapper = Wrappers.lambdaQuery(Menu.class).orderByAsc(Menu::getSeq);
+ List<Menu> list = list(menuLambdaQueryWrapper);
return list.stream()
.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("瓒呯骇绠＄悊鍛樻墠鍙互鍒犻櫎鑿滃崟");
+ }
+ List<Long> list = menuMapper.listMenuIfBinding(menuId);
+ List<Long> list1 = menuMapper.listMenuIfBinding1(menuId);
+
+ if (list.size() == 0 && list1.size() == 0) {
+ return removeById(menuId);
+ } else {
+ throw new BusinessException("鑿滃崟姝ｅ湪浣跨敤锛岃鍕垮垹闄�");
+ }
+
+ }
}
--
Gitblit v1.9.3