From f00e6f6f26d6dc6fc8f606de01f37ec643daa383 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 10 十一月 2023 14:17:16 +0800
Subject: [PATCH] 编码规则自定义流水算法
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
index 1846607..472b595 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
@@ -16,19 +16,17 @@
*/
package com.vci.ubcs.system.service.impl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.vci.ubcs.starter.enumpack.CodeTableNameEnum;
import com.vci.ubcs.starter.util.MybatisParameterUtil;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.system.cache.NacosConfigCache;
import com.vci.ubcs.system.cache.SysCache;
import com.vci.ubcs.system.dto.MenuDTO;
import com.vci.ubcs.system.entity.*;
-import com.vci.ubcs.system.user.entity.User;
-import com.vci.ubcs.system.user.feign.IUserClient;
import com.vci.ubcs.system.vo.MenuVO;
import com.vci.ubcs.system.mapper.MenuMapper;
import com.vci.ubcs.system.service.IMenuService;
@@ -52,7 +50,6 @@
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
-import javax.management.relation.Role;
import java.util.*;
import java.util.stream.Collectors;
@@ -74,7 +71,6 @@
private final ITopMenuSettingService topMenuSettingService;
private final static String PARENT_ID = "parentId";
private final static Integer MENU_CATEGORY = 1;
- private final NacosConfigCache nacosConfigCache;
@Override
public List<MenuVO> lazyList(Long parentId, Map<String, Object> param) {
@@ -101,7 +97,8 @@
List<Menu> allMenus = baseMapper.allMenu();
List<Menu> roleMenus;
// 瓒呯骇绠＄悊鍛樺苟涓斾笉鏄《閮ㄨ彍鍗曡姹傚垯杩斿洖鍏ㄩ儴鑿滃崟
- if (AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
+ // if (AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
+ if (VciBaseUtil.checkAdminTenant() && Func.isEmpty(topMenuId)) {
roleMenus = allMenus;
}
// 闈炶秴绾х鐞嗗憳骞朵笖涓嶆槸椤堕儴鑿滃崟璇锋眰鍒欒繑鍥炲搴旇鑹叉潈闄愯彍鍗�
@@ -144,7 +141,7 @@
@Override
public List<MenuVO> buttons(String roleId) {
- List<Menu> buttons = (AuthUtil.isAdministrator()) ? baseMapper.allButtons() : baseMapper.buttons(Func.toLongList(roleId));
+ List<Menu> buttons = (VciBaseUtil.checkAdminTenant()) ? baseMapper.allButtons() : baseMapper.buttons(Func.toLongList(roleId));
MenuWrapper menuWrapper = new MenuWrapper();
return menuWrapper.listNodeVO(buttons);
}
@@ -156,15 +153,17 @@
@Override
public List<TreeNode> grantTree(BladeUser user) {
- List<TreeNode> menuTree = user.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId())
+ /*List<TreeNode> menuTree = user.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId())
&& user.getUserId().equals(nacosConfigCache.getAdminUserInfo().getUserId())
- ? baseMapper.grantTree() : baseMapper.grantTreeByRole(Func.toLongList(user.getRoleId()));
+ ? baseMapper.grantTree() : baseMapper.grantTreeByRole(Func.toLongList(user.getRoleId()));*/
+ // 淇敼涓烘墍鏈夌敤鎴烽兘鑳芥煡璇㈡墍鏈夛紝鍥犱负娌℃潈闄愮殑鐢ㄦ埛涓嶅叿澶囪繖涓彍鍗曢〉闈㈢殑鏉冮檺锛屼篃灏辨病蹇呰闄愬埗鐢ㄦ埛鏌ヨ嚜宸辩殑
+ List<TreeNode> menuTree = baseMapper.grantTree();
return ForestNodeMerger.merge(tenantPackageTree(menuTree, user.getTenantId()));
}
@Override
public List<TreeNode> grantTopTree(BladeUser user) {
- List<TreeNode> menuTree = user.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId()) ? baseMapper.grantTopTree() : baseMapper.grantTopTreeByRole(Func.toLongList(user.getRoleId()));
+ List<TreeNode> menuTree = user.getTenantId().equals(NacosConfigCache.getAdminUserInfo().getTenantId()) ? baseMapper.grantTopTree() : baseMapper.grantTopTreeByRole(Func.toLongList(user.getRoleId()));
return ForestNodeMerger.merge(tenantPackageTree(menuTree, user.getTenantId()));
}
@@ -227,12 +226,12 @@
@Override
public List<TreeNode> grantDataScopeTree(BladeUser user) {
- return ForestNodeMerger.merge(user.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId()) ? baseMapper.grantDataScopeTree() : baseMapper.grantDataScopeTreeByRole(Func.toLongList(user.getRoleId())));
+ return ForestNodeMerger.merge(user.getTenantId().equals(NacosConfigCache.getAdminUserInfo().getTenantId()) ? baseMapper.grantDataScopeTree() : baseMapper.grantDataScopeTreeByRole(Func.toLongList(user.getRoleId())));
}
@Override
public List<TreeNode> grantApiScopeTree(BladeUser user) {
- return ForestNodeMerger.merge(user.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId()) ? baseMapper.grantApiScopeTree() : baseMapper.grantApiScopeTreeByRole(Func.toLongList(user.getRoleId())));
+ return ForestNodeMerger.merge(user.getTenantId().equals(NacosConfigCache.getAdminUserInfo().getTenantId()) ? baseMapper.grantApiScopeTree() : baseMapper.grantApiScopeTreeByRole(Func.toLongList(user.getRoleId())));
}
@Override
@@ -312,9 +311,19 @@
return saveOrUpdate(menu);
}
+ /**
+ * 鑾峰彇鑿滃崟涓嬮潰鐨勬寜閽�
+ * @param btmType 涓氬姟绫诲瀷
+ * @return List<Menu>
+ */
@Override
- public List<Menu> getMenuButtonByType(String btmType) {
- return baseMapper.selectMenuChildByBtnType(btmType);
+ //@Cacheable(cacheNames = MENU_CACHE, key = "'auth:menuButton:'+ #btmType +':'+ #userId ")
+ public List<Menu> getMenuButtonByType(String btmType,Long userId) {
+ List<String> roleIds = null;
+ if(!VciBaseUtil.checkAdminTenant()){
+ roleIds = Arrays.asList(AuthUtil.getUser().getRoleId().split(","));
+ }
+ return baseMapper.selectMenuChildByBtnType(btmType,roleIds);
}
/**
@@ -336,9 +345,7 @@
.eq(Menu::getCategory,1) /*鑿滃崟绫诲瀷涓嶈兘涓烘寜閽�*/
.orderByAsc(Menu::getCode); /*鏍规嵁code鎺掑簭涓巆lassify鐨刡tmtypeid瀵瑰簲*/
// 瓒呯涓嶇敤鏍规嵁瑙掕壊鏉ユ煡璇�
- if(!AuthUtil.getTenantId().equals(NacosConfigCache.getAdminUserInfo().getTenantId())
- && !AuthUtil.getUserId().equals(NacosConfigCache.getAdminUserInfo().getUserId())
- ){
+ if(!VciBaseUtil.checkAdminTenant()){
if(Func.isBlank(userId.toString()) && Func.isBlank(AuthUtil.getUserId().toString())){
throw new ServiceException("鑾峰彇鐢ㄦ埛id澶辫触");
}
--
Gitblit v1.9.3