From 1c3919f11f5eb5b3c2ba74d95ca6fcdf11ce9bf9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 25 一月 2024 10:17:35 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
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 04d1501..da10e36 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
@@ -119,11 +119,6 @@
private CodeBasicSecMapper codeBasicSecMapper;
/**
- * 鑷畾涔夊苟鍙慒orkJoinPool
- */
- private static final ForkJoinPool customForkJoinPool = new ForkJoinPool(Runtime.getRuntime().availableProcessors()-1);
-
- /**
* 涓婄骇鑺傜偣鐨勫睘鎬у悕绉�
*/
public static final String PARENT_FIELD_NAME = "parentCodeClassifyOid";
@@ -567,6 +562,7 @@
}
if(StringUtils.isNotBlank(id) || StringUtils.isNotBlank(lcStatus) ){
//String tableName = this.getTableName(treeQueryObject.getConditionMap().get("btmTypeId"),treeQueryObject.getConditionMap().get("id"), treeQueryObject.getConditionMap().get("lcStatus"));
+ // TODO: 2024-1-24 23:25鎴戝幓鎺変簡鎳掑姞杞斤紝鍥犱负浼氬奖鍝嶆暟鎹巿鏉冭繃婊わ紝鑰屼笖杩欏効鎰熻娌″繀瑕佸仛鎳掑姞杞�
doList = codeClassifyMapper
.selectCodeClassifyDOByTree(
treeQueryObject.getConditionMap().get("id"),
@@ -593,16 +589,18 @@
// 闈炶秴绠¤繃婊ゆ湭鎺堟潈鐨勫垎绫�
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"));
+ R<List<String>> viewClassByRoleIds = sysClient.getViewClassByRoleIds(
+ Arrays.asList(AuthUtil.getUser().getRoleId().split(",")),
+ treeQueryObject.getConditionMap().getOrDefault("authType","classify_auth"),
+ treeQueryObject.getConditionMap().getOrDefault("buttonCode","classify_view"),
+ treeQueryObject.getConditionMap().getOrDefault("menuCode","classifyTree")
+ );
// 璇锋眰澶辫触鎴栬�呰姹傚緱鍒扮殑鍏峰鏌ョ湅鏉冮檺鐨勫垎绫籭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 -> {
@@ -624,7 +622,7 @@
/*Boolean checkHasChild = checkHasChild(tree.getOid());
tree.setLeaf(!checkHasChild);*/
if (classifyIds.contains(tree.getOid())) {
- // 濡傛灉椤跺眰鑺傜偣瀛樺湪浜� classifyIds 涓紝鐩存帴淇濈暀鍏跺瓙鑺傜偣闆嗗悎
+ // 濡傛灉椤跺眰鑺傜偣瀛樺湪 classifyIds 锛岀洿鎺ヤ繚鐣欏叾瀛愯妭鐐归泦鍚�
continue;
}
if (tree.getChildren() != null && !tree.getChildren().isEmpty()) {
--
Gitblit v1.9.3