From 45ac0f23e12ac2a45c6affe9e39d0897e4fad618 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 16 二月 2023 17:06:10 +0800
Subject: [PATCH] !286 合并 多租户功能 * add 新增 ruoyi-common-tenant 多租户模块 全框架适配多租户改动 * update 优化 隐藏页面主键 * remove 移除 缓存列表功能(多租户缓存功能繁杂多样 没有办法在页面管理) * update 重构 全局缓存KEY 与 常用缓存KEY做区分 * update 重构 OssFactory 加载方式 改为每次比对配置做实例更新 * update 优化 SaTokenDao 改为 Bean 注入 便于扩展 * update 重构 项目初始化数据改为懒加载 不提供热加载 * update 重构 验证码开关使用配置文件(经调查少有动态开启需求) * update 优化 启用 sqlserver 高版本语法 简化sql脚本语法 * update 优化 DataPermissionHelper 增加 开启/关闭 忽略数据权限功能 * update 优化 连接池增加 keepaliveTime 探活参数 * update 优化 调整连接池最长生命周期 防止出现警告 * update 优化 代码生成页面模板 校验不必要的表单数据 * add 新增 StringUtils splitTo 与 splitList 方法 优化业务代码
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 183 +++++++++++++--------------------------------
1 files changed, 52 insertions(+), 131 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index 7e13c9f..29cdcb5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -2,13 +2,14 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.utils.BeanCopyUtils;
import com.ruoyi.common.core.utils.StreamUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.TreeBuildUtils;
@@ -16,6 +17,7 @@
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.system.domain.SysRoleMenu;
+import com.ruoyi.system.domain.SysTenantPackage;
import com.ruoyi.system.domain.bo.SysMenuBo;
import com.ruoyi.system.domain.vo.MetaVo;
import com.ruoyi.system.domain.vo.RouterVo;
@@ -23,6 +25,7 @@
import com.ruoyi.system.mapper.SysMenuMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.mapper.SysRoleMenuMapper;
+import com.ruoyi.system.mapper.SysTenantPackageMapper;
import com.ruoyi.system.service.ISysMenuService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -41,6 +44,7 @@
private final SysMenuMapper baseMapper;
private final SysRoleMapper roleMapper;
private final SysRoleMenuMapper roleMenuMapper;
+ private final SysTenantPackageMapper sysTenantPackageMapper;
/**
* 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃
@@ -49,8 +53,8 @@
* @return 鑿滃崟鍒楄〃
*/
@Override
- public List<SysMenu> selectMenuList(Long userId) {
- return selectMenuList(new SysMenu(), userId);
+ public List<SysMenuVo> selectMenuList(Long userId) {
+ return selectMenuList(new SysMenuBo(), userId);
}
/**
@@ -60,11 +64,11 @@
* @return 鑿滃崟鍒楄〃
*/
@Override
- public List<SysMenu> selectMenuList(SysMenu menu, Long userId) {
- List<SysMenu> menuList = null;
+ public List<SysMenuVo> selectMenuList(SysMenuBo menu, Long userId) {
+ List<SysMenuVo> menuList;
// 绠＄悊鍛樻樉绀烘墍鏈夎彍鍗曚俊鎭�
- if (LoginHelper.isAdmin(userId)) {
- menuList = baseMapper.selectList(new LambdaQueryWrapper<SysMenu>()
+ if (LoginHelper.isSuperAdmin(userId)) {
+ menuList = baseMapper.selectVoList(new LambdaQueryWrapper<SysMenu>()
.like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
.eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible())
.eq(StringUtils.isNotBlank(menu.getStatus()), SysMenu::getStatus, menu.getStatus())
@@ -78,7 +82,8 @@
.eq(StringUtils.isNotBlank(menu.getStatus()), "m.status", menu.getStatus())
.orderByAsc("m.parent_id")
.orderByAsc("m.order_num");
- menuList = baseMapper.selectMenuListByUserId(wrapper);
+ List<SysMenu> list = baseMapper.selectMenuListByUserId(wrapper);
+ menuList = BeanCopyUtils.copyList(list, SysMenuVo.class);
}
return menuList;
}
@@ -95,7 +100,7 @@
Set<String> permsSet = new HashSet<>();
for (String perm : perms) {
if (StringUtils.isNotEmpty(perm)) {
- permsSet.addAll(Arrays.asList(perm.trim().split(",")));
+ permsSet.addAll(StringUtils.splitList(perm.trim()));
}
}
return permsSet;
@@ -113,7 +118,7 @@
Set<String> permsSet = new HashSet<>();
for (String perm : perms) {
if (StringUtils.isNotEmpty(perm)) {
- permsSet.addAll(Arrays.asList(perm.trim().split(",")));
+ permsSet.addAll(StringUtils.splitList(perm.trim()));
}
}
return permsSet;
@@ -127,8 +132,8 @@
*/
@Override
public List<SysMenu> selectMenuTreeByUserId(Long userId) {
- List<SysMenu> menus = null;
- if (LoginHelper.isAdmin(userId)) {
+ List<SysMenu> menus;
+ if (LoginHelper.isSuperAdmin(userId)) {
menus = baseMapper.selectMenuTreeAll();
} else {
menus = baseMapper.selectMenuTreeByUserId(userId);
@@ -149,6 +154,30 @@
}
/**
+ * 鏍规嵁绉熸埛濂楅ID鏌ヨ鑿滃崟鏍戜俊鎭�
+ *
+ * @param packageId 绉熸埛濂楅ID
+ * @return 閫変腑鑿滃崟鍒楄〃
+ */
+ @Override
+ public List<Long> selectMenuListByPackageId(Long packageId) {
+ SysTenantPackage tenantPackage = sysTenantPackageMapper.selectById(packageId);
+ List<Long> menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong);
+ if (CollUtil.isEmpty(menuIds)) {
+ return List.of();
+ }
+ List<Long> parentIds = null;
+ if (tenantPackage.getMenuCheckStrictly()) {
+ parentIds = baseMapper.selectObjs(new LambdaQueryWrapper<SysMenu>()
+ .select(SysMenu::getParentId)
+ .in(SysMenu::getMenuId, menuIds), Convert::toLong);
+ }
+ return baseMapper.selectObjs(new LambdaQueryWrapper<SysMenu>()
+ .in(SysMenu::getMenuId, menuIds)
+ .notIn(CollUtil.isNotEmpty(parentIds), SysMenu::getMenuId, parentIds), Convert::toLong);
+ }
+
+ /**
* 鏋勫缓鍓嶇璺敱鎵�闇�瑕佺殑鑿滃崟
*
* @param menus 鑿滃崟鍒楄〃
@@ -160,9 +189,9 @@
for (SysMenu menu : menus) {
RouterVo router = new RouterVo();
router.setHidden("1".equals(menu.getVisible()));
- router.setName(getRouteName(menu));
- router.setPath(getRouterPath(menu));
- router.setComponent(getComponent(menu));
+ router.setName(menu.getRouteName());
+ router.setPath(menu.getRouterPath());
+ router.setComponent(menu.getComponentInfo());
router.setQuery(menu.getQueryParam());
router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
List<SysMenu> cMenus = menu.getChildren();
@@ -170,23 +199,23 @@
router.setAlwaysShow(true);
router.setRedirect("noRedirect");
router.setChildren(buildMenus(cMenus));
- } else if (isMenuFrame(menu)) {
+ } else if (menu.isMenuFrame()) {
router.setMeta(null);
List<RouterVo> childrenList = new ArrayList<>();
RouterVo children = new RouterVo();
children.setPath(menu.getPath());
- children.setComponent(menu.getComponent());
+ children.setComponent(menu.getComponentInfo());
children.setName(StringUtils.capitalize(menu.getPath()));
children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
children.setQuery(menu.getQueryParam());
childrenList.add(children);
router.setChildren(childrenList);
- } else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) {
+ } else if (menu.getParentId().intValue() == 0 && menu.isInnerLink()) {
router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon()));
router.setPath("/");
List<RouterVo> childrenList = new ArrayList<>();
RouterVo children = new RouterVo();
- String routerPath = innerLinkReplaceEach(menu.getPath());
+ String routerPath = SysMenu.innerLinkReplaceEach(menu.getPath());
children.setPath(routerPath);
children.setComponent(UserConstants.INNER_LINK);
children.setName(StringUtils.capitalize(routerPath));
@@ -206,7 +235,7 @@
* @return 涓嬫媺鏍戠粨鏋勫垪琛�
*/
@Override
- public List<Tree<Long>> buildMenuTreeSelect(List<SysMenu> menus) {
+ public List<Tree<Long>> buildMenuTreeSelect(List<SysMenuVo> menus) {
if (CollUtil.isEmpty(menus)) {
return CollUtil.newArrayList();
}
@@ -304,94 +333,6 @@
}
/**
- * 鑾峰彇璺敱鍚嶇О
- *
- * @param menu 鑿滃崟淇℃伅
- * @return 璺敱鍚嶇О
- */
- public String getRouteName(SysMenu menu) {
- String routerName = StringUtils.capitalize(menu.getPath());
- // 闈炲閾惧苟涓旀槸涓�绾х洰褰曪紙绫诲瀷涓虹洰褰曪級
- if (isMenuFrame(menu)) {
- routerName = StringUtils.EMPTY;
- }
- return routerName;
- }
-
- /**
- * 鑾峰彇璺敱鍦板潃
- *
- * @param menu 鑿滃崟淇℃伅
- * @return 璺敱鍦板潃
- */
- public String getRouterPath(SysMenu menu) {
- String routerPath = menu.getPath();
- // 鍐呴摼鎵撳紑澶栫綉鏂瑰紡
- if (menu.getParentId().intValue() != 0 && isInnerLink(menu)) {
- routerPath = innerLinkReplaceEach(routerPath);
- }
- // 闈炲閾惧苟涓旀槸涓�绾х洰褰曪紙绫诲瀷涓虹洰褰曪級
- if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
- && UserConstants.NO_FRAME.equals(menu.getIsFrame())) {
- routerPath = "/" + menu.getPath();
- }
- // 闈炲閾惧苟涓旀槸涓�绾х洰褰曪紙绫诲瀷涓鸿彍鍗曪級
- else if (isMenuFrame(menu)) {
- routerPath = "/";
- }
- return routerPath;
- }
-
- /**
- * 鑾峰彇缁勪欢淇℃伅
- *
- * @param menu 鑿滃崟淇℃伅
- * @return 缁勪欢淇℃伅
- */
- public String getComponent(SysMenu menu) {
- String component = UserConstants.LAYOUT;
- if (StringUtils.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) {
- component = menu.getComponent();
- } else if (StringUtils.isEmpty(menu.getComponent()) && menu.getParentId().intValue() != 0 && isInnerLink(menu)) {
- component = UserConstants.INNER_LINK;
- } else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu)) {
- component = UserConstants.PARENT_VIEW;
- }
- return component;
- }
-
- /**
- * 鏄惁涓鸿彍鍗曞唴閮ㄨ烦杞�
- *
- * @param menu 鑿滃崟淇℃伅
- * @return 缁撴灉
- */
- public boolean isMenuFrame(SysMenu menu) {
- return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType())
- && menu.getIsFrame().equals(UserConstants.NO_FRAME);
- }
-
- /**
- * 鏄惁涓哄唴閾剧粍浠�
- *
- * @param menu 鑿滃崟淇℃伅
- * @return 缁撴灉
- */
- public boolean isInnerLink(SysMenu menu) {
- return menu.getIsFrame().equals(UserConstants.NO_FRAME) && StringUtils.ishttp(menu.getPath());
- }
-
- /**
- * 鏄惁涓簆arent_view缁勪欢
- *
- * @param menu 鑿滃崟淇℃伅
- * @return 缁撴灉
- */
- public boolean isParentView(SysMenu menu) {
- return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType());
- }
-
- /**
* 鏍规嵁鐖惰妭鐐圭殑ID鑾峰彇鎵�鏈夊瓙鑺傜偣
*
* @param list 鍒嗙被琛�
@@ -415,34 +356,14 @@
*/
private void recursionFn(List<SysMenu> list, SysMenu t) {
// 寰楀埌瀛愯妭鐐瑰垪琛�
- List<SysMenu> childList = getChildList(list, t);
+ List<SysMenu> childList = StreamUtils.filter(list, n -> n.getParentId().equals(t.getMenuId()));
t.setChildren(childList);
for (SysMenu tChild : childList) {
- if (hasChild(list, tChild)) {
+ // 鍒ゆ柇鏄惁鏈夊瓙鑺傜偣
+ if (list.stream().anyMatch(n -> n.getParentId().equals(tChild.getMenuId()))) {
recursionFn(list, tChild);
}
}
}
- /**
- * 寰楀埌瀛愯妭鐐瑰垪琛�
- */
- private List<SysMenu> getChildList(List<SysMenu> list, SysMenu t) {
- return StreamUtils.filter(list, n -> n.getParentId().equals(t.getMenuId()));
- }
-
- /**
- * 鍒ゆ柇鏄惁鏈夊瓙鑺傜偣
- */
- private boolean hasChild(List<SysMenu> list, SysMenu t) {
- return CollUtil.isNotEmpty(getChildList(list, t));
- }
-
- /**
- * 鍐呴摼鍩熷悕鐗规畩瀛楃鏇挎崲
- */
- public String innerLinkReplaceEach(String path) {
- return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS, Constants.WWW, "."},
- new String[]{"", "", "", "/"});
- }
}
--
Gitblit v1.9.3