From 5b9f87937feb53890138dbcd3a94cd883997e950 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 26 十二月 2024 16:32:44 +0800
Subject: [PATCH] 修改菜单报错bug
---
iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/MenuServiceImpl.java | 141 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 130 insertions(+), 11 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 17d7e40..5f32ec2 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
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Lists;
import com.iailab.framework.common.enums.CommonStatusEnum;
@@ -10,11 +11,16 @@
import com.iailab.module.system.controller.admin.permission.vo.menu.MenuSaveVO;
import com.iailab.module.system.controller.admin.tenant.vo.packages.TenantPackageSaveReqVO;
import com.iailab.module.system.dal.dataobject.app.AppDO;
+import com.iailab.module.system.dal.dataobject.app.AppMenuDO;
import com.iailab.module.system.dal.dataobject.permission.MenuDO;
import com.iailab.module.system.dal.dataobject.permission.RoleDO;
+import com.iailab.module.system.dal.dataobject.permission.RoleMenuDO;
import com.iailab.module.system.dal.dataobject.tenant.TenantDO;
import com.iailab.module.system.dal.dataobject.tenant.TenantPackageDO;
+import com.iailab.module.system.dal.mysql.app.AppMapper;
+import com.iailab.module.system.dal.mysql.app.AppMenuMapper;
import com.iailab.module.system.dal.mysql.permission.MenuMapper;
+import com.iailab.module.system.dal.mysql.permission.RoleMenuMapper;
import com.iailab.module.system.dal.redis.RedisKeyConstants;
import com.iailab.module.system.enums.permission.MenuTypeEnum;
import com.iailab.module.system.service.app.AppService;
@@ -22,6 +28,7 @@
import com.iailab.module.system.service.tenant.TenantService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.annotation.Lazy;
@@ -30,10 +37,12 @@
import javax.annotation.Resource;
import java.util.*;
+import java.util.stream.Collectors;
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.framework.common.pojo.CommonResult.success;
+import static com.iailab.framework.common.util.collection.CollectionUtils.*;
+import static com.iailab.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static com.iailab.framework.tenant.core.context.TenantContextHolder.getTenantId;
import static com.iailab.module.system.dal.dataobject.permission.MenuDO.ID_ROOT;
import static com.iailab.module.system.enums.ErrorCodeConstants.*;
@@ -64,6 +73,13 @@
@Resource
private RoleService roleService;
+
+ @Resource
+ private RoleMenuMapper roleMenuMapper;
+ @Autowired
+ private AppMapper appMapper;
+ @Autowired
+ private AppMenuMapper appMenuMapper;
@Override
@CacheEvict(value = RedisKeyConstants.PERMISSION_MENU_ID_LIST, key = "#createReqVO.permission",
@@ -111,8 +127,10 @@
//菜单归属租户和应用
Long tenantId = getTenantId();
AppDO appDO = appService.getAppByTenantId(tenantId);
- updateObj.setTenantId(tenantId);
- updateObj.setAppId(appDO.getId());
+ if(ObjectUtils.isNotEmpty(appDO) && appDO.getTenantId() != 1) {
+ updateObj.setTenantId(tenantId);
+ updateObj.setAppId(appDO.getId());
+ }
menuMapper.updateById(updateObj);
}
@@ -151,8 +169,10 @@
@Override
public List<MenuDO> getAppMenuListByTenant(MenuListReqVO reqVO) {
+ // 获取 tenantId
+ Long tenantId = getTenantId();
// 查询所有菜单，并过滤掉关闭的节点
- List<MenuDO> menus = getAppMenuList(reqVO);
+ List<MenuDO> menus = getAppMenuList(tenantId, reqVO);
// 开启多租户的情况下，需要过滤掉未开通的菜单
tenantService.handleTenantMenu(menuIds -> menus.removeIf(menu -> !CollUtil.contains(menuIds, menu.getId())));
return menus;
@@ -175,6 +195,37 @@
enabledMenus.add(menu);
}
return enabledMenus;
+ }
+
+ @Override
+ public List<MenuDO> filterMenus(List<MenuDO> menuList, String type) {
+ if (CollUtil.isEmpty(menuList)){
+ return Collections.emptyList();
+ }
+ Map<Long, MenuDO> menuMap = convertMap(menuList, MenuDO::getId);
+ LambdaQueryWrapper<AppDO> queryWrapper = new LambdaQueryWrapper<>();
+
+ //查询所有的系统应用菜单
+ if("system".equals(type)) {
+ queryWrapper.eq(AppDO::getType, 0);
+ } else if("app".equals(type)) {
+ queryWrapper.eq(AppDO::getType, 1);
+ }
+ List<AppDO> appDOS = appMapper.selectList(queryWrapper);
+ List<Long> appIds = appDOS.stream().map(AppDO::getId).collect(Collectors.toList());
+ List<MenuDO> menuDOS = menuMapper.selectList(new LambdaQueryWrapper<MenuDO>().in(MenuDO::getAppId, appIds));
+ List<Long> systemMenuIds = menuDOS.stream().map(MenuDO::getId).collect(Collectors.toList());
+
+ // 遍历 menu 菜单，查找不是禁用的菜单，添加到 系统菜单（应用菜单） 结果
+ List<MenuDO> systemMenus = new ArrayList<>();
+ Set<Long> appMenuCache = new HashSet<>(); // 存下递归搜索过被禁用的菜单，防止重复的搜索
+ for (MenuDO menu : menuList) {
+ if (isAppMenu(menu, menuMap, appMenuCache, systemMenuIds)) {
+ continue;
+ }
+ systemMenus.add(menu);
+ }
+ return systemMenus;
}
private boolean isMenuDisabled(MenuDO node, Map<Long, MenuDO> menuMap, Set<Long> disabledMenuCache) {
@@ -202,16 +253,59 @@
return false;
}
+ private boolean isAppMenu(MenuDO node, Map<Long, MenuDO> menuMap, Set<Long> menuCache, List<Long> systemMenuIds) {
+ // 如果已经判定是禁用的节点，直接结束
+ if (menuCache.contains(node.getId())) {
+ return true;
+ }
+
+ // 2. 遍历到 parentId 为根节点，则无需判断
+ Long parentId = node.getParentId();
+ if (ObjUtil.equal(parentId, ID_ROOT)) {
+ if (!systemMenuIds.contains(node.getId())) {
+ menuCache.add(node.getId());
+ return true;
+ }
+ return false;
+ }
+
+ // 3. 继续遍历 parent 节点
+ MenuDO parent = menuMap.get(parentId);
+ if (parent == null || isAppMenu(parent, menuMap, menuCache, systemMenuIds)) {
+ menuCache.add(node.getId());
+ return true;
+ }
+ return false;
+ }
+
@Override
public List<MenuDO> getMenuList(MenuListReqVO reqVO) {
return menuMapper.selectList(reqVO);
}
@Override
- public List<MenuDO> getAppMenuList(MenuListReqVO reqVO) {
- // 获取 tenantId
- Long tenantId = getTenantId();
- return menuMapper.selectAppMenuList(tenantId, reqVO);
+ public List<MenuDO> getAppMenuList(Long tenantId, MenuListReqVO reqVO) {
+ List<MenuDO> menuDOS = menuMapper.selectAppMenuList(reqVO);
+ menuDOS = filterMenus(menuDOS, "app");
+ Set<Long> menuDOIds = menuDOS.stream().map(MenuDO::getId).collect(Collectors.toSet());
+ TenantDO tenant = tenantService.getTenant(tenantId);
+ TenantPackageDO tenantPackage = tenantPackageService.getTenantPackage(tenant.getPackageId());
+ Set<Long> tenantMenuIds = tenantPackage.getMenuIds();
+ menuDOS = menuDOS.stream().filter(menuDO -> tenantMenuIds.contains(menuDO.getId())).collect(Collectors.toList());
+ // 获得角色列表
+ Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(getLoginUserId());
+ List<RoleDO> roles = roleService.getRoleList(roleIds);
+ roles.removeIf(role -> !CommonStatusEnum.ENABLE.getStatus().equals(role.getStatus())); // 移除禁用的角色
+ if (roles.stream().noneMatch(role -> role.getCode().equals("tenant_admin"))) {
+ // 获得菜单列表
+ Set<Long> menuIds = permissionService.getRoleMenuListByRoleId(convertSet(roles, RoleDO::getId));
+ //取交集
+ menuIds.retainAll(menuDOIds);
+ List<MenuDO> menuList = getMenuList(menuIds);
+ menuList = filterDisableMenus(menuList);
+ return menuList;
+ }
+ return menuDOS;
}
@Override
@@ -227,12 +321,22 @@
}
@Override
+ public MenuDO getMenuByAppId(Long id) {
+ return menuMapper.selectOne(new LambdaQueryWrapper<MenuDO>().eq(MenuDO::getAppId, id).eq(MenuDO::getParentId, 0l));
+ }
+
+ @Override
public List<MenuDO> getMenuList(Collection<Long> ids) {
// 当 ids 为空时，返回一个空的实例对象
if (CollUtil.isEmpty(ids)) {
return Lists.newArrayList();
}
return menuMapper.selectBatchIds(ids);
+ }
+
+ @Override
+ public List<MenuDO> selectListByParentId(Collection<Long> ids) {
+ return menuMapper.selectListByParentId(ids);
}
/**
@@ -313,14 +417,29 @@
private void dealPermission(MenuDO menu) {
Long tenantId = menu.getTenantId();
- RoleDO role = roleService.getTenantAdminRole(tenantId);
+ RoleDO tenantRole = roleService.getTenantAdminRole(tenantId);
TenantDO tenant = tenantService.getTenant(tenantId);
TenantPackageDO tenantPackage = tenantPackageService.getTenantPackage(tenant.getPackageId());
Set<Long> menuIds = tenantPackage.getMenuIds();
menuIds.add(menu.getId());
tenantPackage.setMenuIds(menuIds);
tenantPackageService.updateTenantPackage(BeanUtils.toBean(tenantPackage, TenantPackageSaveReqVO.class));
- permissionService.assignRoleMenu(role.getId(), menuIds);
+ permissionService.assignRoleMenu(tenantRole.getId(), menuIds);
+ // 开发者自己创建的应用菜单默认赋权给创建者所拥有的角色
+ //查询当前用户所拥有的角色
+ Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(getLoginUserId());
+ List<RoleDO> roles = roleService.getRoleList(roleIds);
+ roles.removeIf(role -> !CommonStatusEnum.ENABLE.getStatus().equals(role.getStatus())); // 移除禁用的角色
+ roles.removeIf(role -> tenantRole.getId().equals(role.getId())); // 移除租户管理员角色
+ if (!roles.isEmpty()) {
+ roles.stream().forEach(roleDO -> {
+ RoleMenuDO roleMenuDO = new RoleMenuDO();
+ roleMenuDO.setMenuId(menu.getId());
+ roleMenuDO.setRoleId(roleDO.getId());
+ roleMenuDO.setTenantId(tenant.getId());
+ roleMenuMapper.insert(roleMenuDO);
+ });
+ }
}
}
--
Gitblit v1.9.3