From 735b8b4c7eea4a5a6d42f25f070944f85e9603d9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 18 一月 2024 19:55:49 +0800
Subject: [PATCH] 分类查询接口优化
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleCharacterController.java | 3 +++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 36 ++++++++++++++++++++----------------
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java | 2 +-
Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml | 2 +-
4 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleCharacterController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleCharacterController.java
index 5d6b29a..138f53a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleCharacterController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleCharacterController.java
@@ -19,6 +19,7 @@
public class CodeRuleCharacterController {
@Resource
private ICodeRuleCharacterService iCodeRuleCharacterService;
+
/**
* 浣跨敤缂栫爜瑙勫垯oid鑾峰彇鏁版嵁
* @param codeRuleId 瑙勫垯oid
@@ -28,6 +29,7 @@
public R<List<Map<String,String>>> getDataByOid(@RequestParam("codeRuleId")String codeRuleId,@RequestParam("chartType")String chartType){
return R.data(iCodeRuleCharacterService.getDataByRuleId(codeRuleId,chartType));
}
+
/**
* 淇濆瓨瑙勫垯瀵硅薄
* @param codeRuleCharacterVO 瑙勫垯瀛楃瀵硅薄
@@ -37,6 +39,7 @@
public R addSave(@RequestBody CodeRuleCharacterVO codeRuleCharacterVO){
return iCodeRuleCharacterService.saveOrUpdate(codeRuleCharacterVO,1);
}
+
/**
* 淇敼瑙勫垯瀵硅薄
* @param codeRuleCharacterVO 瑙勫垯瀛楃瀵硅薄
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index 2284000..04d1501 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -71,6 +71,7 @@
import java.awt.event.ItemEvent;
import java.io.File;
import java.util.*;
+import java.util.concurrent.ForkJoinPool;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -116,6 +117,12 @@
@Resource
private CodeBasicSecMapper codeBasicSecMapper;
+
+ /**
+ * 鑷畾涔夊苟鍙慒orkJoinPool
+ */
+ private static final ForkJoinPool customForkJoinPool = new ForkJoinPool(Runtime.getRuntime().availableProcessors()-1);
+
/**
* 涓婄骇鑺傜偣鐨勫睘鎬у悕绉�
*/
@@ -578,33 +585,30 @@
List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME);
treeWrapperOptions.copyFromTreeQuery(treeQueryObject);
- List<Tree> tree= revisionModelUtil.doList2Trees(voList,treeWrapperOptions,(CodeClassifyVO s) ->{
+ List<Tree> tree = revisionModelUtil.doList2Trees(voList,treeWrapperOptions,(CodeClassifyVO s) ->{
//鍙互鍦ㄨ繖閲屽鐞嗘爲鑺傜偣鐨勬樉绀�
return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s
.getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : "");
});
- //瓒呯鏄剧ず鎵�鏈夊垎绫�
- if(VciBaseUtil.checkAdminTenant()){
- Iterator var6 = tree.listIterator();
- while(var6.hasNext()){
- Tree trees = (Tree) var6.next();
- boolean checkHasChild=codeClassifyMapper.checkHasChild(trees.getOid());
- if(checkHasChild){
- trees.setLeaf(false);
- }else{
- trees.setLeaf(true);
- }
- }
- }else {
+ // 闈炶秴绠¤繃婊ゆ湭鎺堟潈鐨勫垎绫�
+ if(!VciBaseUtil.checkAdminTenant()){
// 閭ｄ簺鍒嗙被鍏峰鏌ョ湅鏉冮檺
R<List<String>> viewClassByRoleIds = sysClient.getViewClassByRoleIds(Arrays.asList(AuthUtil.getUser().getRoleId().split(",")),treeQueryObject.getConditionMap().getOrDefault("authType","classify_auth"),treeQueryObject.getConditionMap().getOrDefault("menuCode","classify_view"));
// 璇锋眰澶辫触鎴栬�呰姹傚緱鍒扮殑鍏峰鏌ョ湅鏉冮檺鐨勫垎绫籭d闆嗗悎涓虹┖
if(!viewClassByRoleIds.isSuccess() && viewClassByRoleIds.getData().isEmpty()){
throw new ServiceException("涓绘暟鎹煡鐪嬫潈闄愭湭閰嶇疆锛屾垨閰嶇疆鏈夎锛�");
}
+ long startTime = System.currentTimeMillis();
// 杩囨护
filterTreeNodes(tree,viewClassByRoleIds.getData());
+ long endTime = System.currentTimeMillis();
+ System.out.println(("鎵ц鏃堕棿锛�"+(endTime-startTime)/1000)+"s");
}
+ // 鍔犺浇鍒嗙被鏄惁鍏锋湁瀛愬垎绫�
+ tree.parallelStream().forEach(item -> {
+ boolean checkHasChild = checkHasChild(item.getOid());
+ item.setLeaf(!checkHasChild);
+ });
return tree;
}
@@ -617,8 +621,8 @@
Iterator<Tree> iterator = trees.iterator();
while (iterator.hasNext()) {
Tree tree = iterator.next();
- Boolean checkHasChild = codeClassifyMapper.checkHasChild(tree.getOid());
- tree.setLeaf(!checkHasChild);
+ /*Boolean checkHasChild = checkHasChild(tree.getOid());
+ tree.setLeaf(!checkHasChild);*/
if (classifyIds.contains(tree.getOid())) {
// 濡傛灉椤跺眰鑺傜偣瀛樺湪浜� classifyIds 涓紝鐩存帴淇濈暀鍏跺瓙鑺傜偣闆嗗悎
continue;
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 9139a1f..c577eee 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
@@ -99,7 +99,6 @@
List<Menu> allMenus = baseMapper.allMenu();
List<Menu> roleMenus;
// 瓒呯骇绠＄悊鍛樺苟涓斾笉鏄《閮ㄨ彍鍗曡姹傚垯杩斿洖鍏ㄩ儴鑿滃崟
- // if (AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
if (VciBaseUtil.checkAdminTenant() && Func.isEmpty(topMenuId)) {
roleMenus = allMenus;
}
@@ -229,6 +228,7 @@
* 绉熸埛鑿滃崟鏉冮檺鑷畾涔夌瓫閫�
*/
private List<Menu> tenantPackageMenu(List<Menu> menu) {
+ // 绉熸埛鍖呴厤缃煡璇�
TenantPackage tenantPackage = SysCache.getTenantPackage(AuthUtil.getTenantId());
if (Func.isNotEmpty(tenantPackage) && tenantPackage.getId() > 0L) {
List<Long> menuIds = Func.toLongList(tenantPackage.getMenuId());
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml
index 5ac1285..68dd8a2 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml
@@ -242,7 +242,7 @@
WHERE
ps."CATEGORY" = 1
<if test="roleId != null and roleId != ''">
- AND ps.ID = prom.MENU_ID
+ AND pm.ID = prom.MENU_ID
AND prom.ROLE_ID = #{roleId}
</if>
AND pm.IS_DELETED = 0
--
Gitblit v1.9.3