From d9f9ba31913bb9f5053ad78109e8a3c1c00f1e6a Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期二, 23 七月 2024 09:58:30 +0800
Subject: [PATCH] update framework
---
iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/MenuServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/MenuServiceImpl.java b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/MenuServiceImpl.java
index 125fb04..9c90502 100644
--- a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/MenuServiceImpl.java
+++ b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/MenuServiceImpl.java
@@ -1,6 +1,10 @@
package com.iailab.module.system.service.permission;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Lists;
+import com.iailab.framework.common.enums.CommonStatusEnum;
import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.module.system.controller.admin.permission.vo.menu.MenuListReqVO;
import com.iailab.module.system.controller.admin.permission.vo.menu.MenuSaveVO;
@@ -9,8 +13,6 @@
import com.iailab.module.system.dal.redis.RedisKeyConstants;
import com.iailab.module.system.enums.permission.MenuTypeEnum;
import com.iailab.module.system.service.tenant.TenantService;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
@@ -19,18 +21,19 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
import static com.iailab.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.iailab.framework.common.util.collection.CollectionUtils.convertList;
+import static com.iailab.framework.common.util.collection.CollectionUtils.convertMap;
import static com.iailab.module.system.dal.dataobject.permission.MenuDO.ID_ROOT;
import static com.iailab.module.system.enums.ErrorCodeConstants.*;
+
/**
* 菜单 Service 实现
*
- * @author iailab
+ * @author 芋道源码
*/
@Service
@Slf4j
@@ -106,6 +109,7 @@
@Override
public List<MenuDO> getMenuListByTenant(MenuListReqVO reqVO) {
+ // 查询所有菜单，并过滤掉关闭的节点
List<MenuDO> menus = getMenuList(reqVO);
// 开启多租户的情况下，需要过滤掉未开通的菜单
tenantService.handleTenantMenu(menuIds -> menus.removeIf(menu -> !CollUtil.contains(menuIds, menu.getId())));
@@ -113,6 +117,50 @@
}
@Override
+ public List<MenuDO> filterDisableMenus(List<MenuDO> menuList) {
+ if (CollUtil.isEmpty(menuList)){
+ return Collections.emptyList();
+ }
+ Map<Long, MenuDO> menuMap = convertMap(menuList, MenuDO::getId);
+
+ // 遍历 menu 菜单，查找不是禁用的菜单，添加到 enabledMenus 结果
+ List<MenuDO> enabledMenus = new ArrayList<>();
+ Set<Long> disabledMenuCache = new HashSet<>(); // 存下递归搜索过被禁用的菜单，防止重复的搜索
+ for (MenuDO menu : menuList) {
+ if (isMenuDisabled(menu, menuMap, disabledMenuCache)) {
+ continue;
+ }
+ enabledMenus.add(menu);
+ }
+ return enabledMenus;
+ }
+
+ private boolean isMenuDisabled(MenuDO node, Map<Long, MenuDO> menuMap, Set<Long> disabledMenuCache) {
+ // 如果已经判定是禁用的节点，直接结束
+ if (disabledMenuCache.contains(node.getId())) {
+ return true;
+ }
+
+ // 1. 遍历到 parentId 为根节点，则无需判断
+ Long parentId = node.getParentId();
+ if (ObjUtil.equal(parentId, ID_ROOT)) {
+ if (CommonStatusEnum.isDisable(node.getStatus())) {
+ disabledMenuCache.add(node.getId());
+ return true;
+ }
+ return false;
+ }
+
+ // 2. 继续遍历 parent 节点
+ MenuDO parent = menuMap.get(parentId);
+ if (parent == null || isMenuDisabled(parent, menuMap, disabledMenuCache)) {
+ disabledMenuCache.add(node.getId());
+ return true;
+ }
+ return false;
+ }
+
+ @Override
public List<MenuDO> getMenuList(MenuListReqVO reqVO) {
return menuMapper.selectList(reqVO);
}
--
Gitblit v1.9.3