From 82e18ec922efbc258060dc2e54874cb6a77477ea Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 27 十二月 2023 15:00:12 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 b2b00e7..f5682d4 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
@@ -68,12 +68,14 @@
private final IRoleMenuService roleMenuService;
private final IRoleScopeService roleScopeService;
+ private final MenuMapper menuMapper;
private final ITopMenuSettingService topMenuSettingService;
private final static String PARENT_ID = "parentId";
private final static Integer MENU_CATEGORY = 1;
@Override
public List<MenuVO> lazyList(Long parentId, Map<String, Object> param) {
+ //int i = 1 / 0;
if (Func.isEmpty(Func.toStr(param.get(PARENT_ID)))) {
parentId = null;
}
@@ -87,7 +89,6 @@
}
return baseMapper.lazyMenuPage(parentId, param, Condition.getPage(query));
}
-
@Override
public List<MenuVO> routes(String roleId, Long topMenuId) {
@@ -159,6 +160,17 @@
// 淇敼涓烘墍鏈夌敤鎴烽兘鑳芥煡璇㈡墍鏈夛紝鍥犱负娌℃潈闄愮殑鐢ㄦ埛涓嶅叿澶囪繖涓彍鍗曢〉闈㈢殑鏉冮檺锛屼篃灏辨病蹇呰闄愬埗鐢ㄦ埛鏌ヨ嚜宸辩殑
List<TreeNode> menuTree = baseMapper.grantTree();
return ForestNodeMerger.merge(tenantPackageTree(menuTree, user.getTenantId()));
+ }
+
+ /**
+ * 鏍规嵁瑙掕壊id鑾峰彇鑿滃崟鏍戝舰缁撴瀯
+ * @param roleId
+ * @return
+ */
+ @Override
+ public List<TreeNode> grantTreeByRoleIds(List<Long> roleId) {
+ List<TreeNode> menuTree = baseMapper.grantTreeByRole(roleId);
+ return ForestNodeMerger.merge(menuTree);
}
@Override
@@ -317,7 +329,7 @@
* @return List<Menu>
*/
@Override
- @Cacheable(cacheNames = MENU_CACHE, key = "'auth:menuButton:' + #userId")
+ //@Cacheable(cacheNames = MENU_CACHE, key = "'auth:menuButton:'+ #btmType +':'+ #userId ")
public List<Menu> getMenuButtonByType(String btmType,Long userId) {
List<String> roleIds = null;
if(!VciBaseUtil.checkAdminTenant()){
@@ -363,6 +375,17 @@
}
/**
+ * 鏍规嵁鐖剁骇鑿滃崟鐨刢ode鏌ヨ鎸夐挳淇℃伅
+ * @param code
+ * @return
+ */
+ @Override
+ public List<Menu> getButtonByParentCode(String code) {
+ List<Menu> buttonList = menuMapper.getButtonByParentCode(code);
+ return buttonList;
+ }
+
+ /**
* 瀵筀eepAlive鍊艰浆鎹㈡垚甯冨皵绫诲瀷杩涜灏佽
*
* @param childMenu
--
Gitblit v1.9.3