From f879ddd80a2bd267a0a575ef03f76d3ec2ae1504 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 04 一月 2024 11:42:22 +0800
Subject: [PATCH] bug列表269：集成日志查询bug修改。 270：关键属性校验，去掉多线程之后请求响应非常慢（之前报错线程阻塞的bug改成单线程导致非常慢，现在又改回ForJoinPool方式限制线程生成数量实现多线程并行，提升执行效率）。
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 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 035269d..50fdfa6 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;
}
@@ -88,7 +90,6 @@
return baseMapper.lazyMenuPage(parentId, param, Condition.getPage(query));
}
-
@Override
public List<MenuVO> routes(String roleId, Long topMenuId) {
if (StringUtil.isBlank(roleId)) {
@@ -102,7 +103,7 @@
roleMenus = allMenus;
}
// 闈炶秴绾х鐞嗗憳骞朵笖涓嶆槸椤堕儴鑿滃崟璇锋眰鍒欒繑鍥炲搴旇鑹叉潈闄愯彍鍗�
- else if (!AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
+ else if (!VciBaseUtil.checkAdminTenant() && Func.isEmpty(topMenuId)) {
roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId)));
}
// 椤堕儴鑿滃崟璇锋眰杩斿洖瀵瑰簲瑙掕壊鏉冮檺鑿滃崟
@@ -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:'+ #btmType +':'+ #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()){
@@ -341,7 +353,7 @@
LambdaQueryWrapper<Menu> wrapper = Wrappers.<Menu>query()
.lambda()
.in(Menu::getCode, codes)
- .eq(Menu::getIsDeleted,0) /*鏈鍒犻櫎*/
+ .eq(Menu::getIsDeleted,BladeConstant.DB_NOT_DELETED) /*鏈鍒犻櫎*/
.eq(Menu::getCategory,1) /*鑿滃崟绫诲瀷涓嶈兘涓烘寜閽�*/
.orderByAsc(Menu::getCode); /*鏍规嵁code鎺掑簭涓巆lassify鐨刡tmtypeid瀵瑰簲*/
// 瓒呯涓嶇敤鏍规嵁瑙掕壊鏉ユ煡璇�
@@ -360,6 +372,17 @@
}
}
return this.list(wrapper);
+ }
+
+ /**
+ * 鏍规嵁鐖剁骇鑿滃崟鐨刢ode鏌ヨ鎸夐挳淇℃伅
+ * @param code
+ * @return
+ */
+ @Override
+ public List<Menu> getButtonByParentCode(String code) {
+ List<Menu> buttonList = menuMapper.getButtonByParentCode(code);
+ return buttonList;
}
/**
@@ -418,4 +441,23 @@
return this.saveBatch(newButtons) ? R.success("鎸夐挳鍏嬮殕鎴愬姛锛�"):R.fail("鎸夐挳鍏嬮殕澶辫触锛�");
}
+ /**
+ * 鏍规嵁涓婚敭鑾峰彇鑿滃崟淇℃伅
+ * @param ids
+ * @return
+ */
+ @Override
+ public List<Menu> getMenuListById(List<String> ids,String parentId) {
+ LambdaQueryWrapper<Menu> wrapper = Wrappers.<Menu>query()
+ .lambda().eq(Menu::getCategory, "2")
+ .eq(Menu::getIsDeleted,BladeConstant.DB_NOT_DELETED);
+ if(VciBaseUtil.checkAdminTenant()){
+ wrapper.eq(Menu::getParentId,parentId);
+ }else {
+ wrapper.in(Menu::getId, ids);
+ }
+ List<Menu> menuList = this.list(wrapper);
+ return menuList;
+ }
+
}
--
Gitblit v1.9.3