From 818a0170d8f2950d52cc7300a302356bbc523236 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期六, 14 九月 2024 11:27:10 +0800
Subject: [PATCH] 应用管理、租户管理、菜单权限管理等修改
---
iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/MenuServiceImpl.java | 65 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 0 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 b93065a..17d7e40 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
@@ -8,12 +8,20 @@
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;
+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.permission.MenuDO;
+import com.iailab.module.system.dal.dataobject.permission.RoleDO;
+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.permission.MenuMapper;
import com.iailab.module.system.dal.redis.RedisKeyConstants;
import com.iailab.module.system.enums.permission.MenuTypeEnum;
+import com.iailab.module.system.service.app.AppService;
+import com.iailab.module.system.service.tenant.TenantPackageService;
import com.iailab.module.system.service.tenant.TenantService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.annotation.Lazy;
@@ -26,6 +34,7 @@
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.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.*;
@@ -47,9 +56,19 @@
@Lazy // 延迟，避免循环依赖报错
private TenantService tenantService;
+ @Resource
+ private TenantPackageService tenantPackageService;
+
+ @Resource
+ private AppService appService;
+
+ @Resource
+ private RoleService roleService;
+
@Override
@CacheEvict(value = RedisKeyConstants.PERMISSION_MENU_ID_LIST, key = "#createReqVO.permission",
condition = "#createReqVO.permission != null")
+ @Transactional(rollbackFor = Exception.class)
public Long createMenu(MenuSaveVO createReqVO) {
// 校验父菜单存在
validateParentMenu(createReqVO.getParentId(), null);
@@ -59,7 +78,15 @@
// 插入数据库
MenuDO menu = BeanUtils.toBean(createReqVO, MenuDO.class);
initMenuProperty(menu);
+
+ //菜单归属租户和应用
+ Long tenantId = getTenantId();
+ menu.setTenantId(tenantId);
+ menu.setAppId(createReqVO.getAppId());
menuMapper.insert(menu);
+ if(tenantId != 1L) {
+ dealPermission(menu);
+ }
// 返回
return menu.getId();
}
@@ -67,6 +94,7 @@
@Override
@CacheEvict(value = RedisKeyConstants.PERMISSION_MENU_ID_LIST,
allEntries = true) // allEntries 清空所有缓存，因为 permission 如果变更，涉及到新老两个 permission。直接清理，简单有效
+ @Transactional(rollbackFor = Exception.class)
public void updateMenu(MenuSaveVO updateReqVO) {
// 校验更新的菜单是否存在
if (menuMapper.selectById(updateReqVO.getId()) == null) {
@@ -80,6 +108,11 @@
// 更新到数据库
MenuDO updateObj = BeanUtils.toBean(updateReqVO, MenuDO.class);
initMenuProperty(updateObj);
+ //菜单归属租户和应用
+ Long tenantId = getTenantId();
+ AppDO appDO = appService.getAppByTenantId(tenantId);
+ updateObj.setTenantId(tenantId);
+ updateObj.setAppId(appDO.getId());
menuMapper.updateById(updateObj);
}
@@ -111,6 +144,15 @@
public List<MenuDO> getMenuListByTenant(MenuListReqVO reqVO) {
// 查询所有菜单，并过滤掉关闭的节点
List<MenuDO> menus = getMenuList(reqVO);
+ // 开启多租户的情况下，需要过滤掉未开通的菜单
+ tenantService.handleTenantMenu(menuIds -> menus.removeIf(menu -> !CollUtil.contains(menuIds, menu.getId())));
+ return menus;
+ }
+
+ @Override
+ public List<MenuDO> getAppMenuListByTenant(MenuListReqVO reqVO) {
+ // 查询所有菜单，并过滤掉关闭的节点
+ List<MenuDO> menus = getAppMenuList(reqVO);
// 开启多租户的情况下，需要过滤掉未开通的菜单
tenantService.handleTenantMenu(menuIds -> menus.removeIf(menu -> !CollUtil.contains(menuIds, menu.getId())));
return menus;
@@ -163,6 +205,13 @@
@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);
}
@Override
@@ -258,4 +307,20 @@
}
}
+ /**
+ * 新创建菜单赋权给租户管理员
+ */
+
+ private void dealPermission(MenuDO menu) {
+ Long tenantId = menu.getTenantId();
+ RoleDO role = 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);
+ }
+
}
--
Gitblit v1.9.3