From d888c408cb8f54f680b526b664be81d903eee45e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 20 十月 2023 13:11:12 +0800
Subject: [PATCH] 前端代码打包
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 710c79e..d7375b9 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
@@ -85,9 +85,6 @@
@Resource
private IBtmTypeClient btmTypeClient;
- @Resource
- private NacosConfigCache nacosConfigCache;
-
/**
* 鏃ュ織
*/
@@ -129,7 +126,7 @@
public IPage<CodeClassifyVO> selectPlCodeClassifyPage(IPage<CodeClassifyVO> page, CodeClassifyVO plCodeClassify) {
return page.setRecords(codeClassifyMapper.selectPlCodeClassifyPage(page, plCodeClassify,AuthUtil.getTenantId()
.equals(
- nacosConfigCache
+ NacosConfigCache
.getAdminUserInfo()
.getTenantId()
) ? null:AuthUtil.getTenantId()));
@@ -526,14 +523,14 @@
doList = codeClassifyMapper
.selectCodeClassifyDOByTree(treeQueryObject.getConditionMap().get("id"),treeQueryObject.getConditionMap().get("lcStatus"),treeQueryObject.getParentOid(), AuthUtil.getTenantId()
.equals(
- nacosConfigCache
+ NacosConfigCache
.getAdminUserInfo()
.getTenantId()
) ? null:AuthUtil.getTenantId());
}else{
doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid(), AuthUtil.getTenantId()
.equals(
- nacosConfigCache
+ NacosConfigCache
.getAdminUserInfo()
.getTenantId()
) ? null:AuthUtil.getTenantId());
@@ -597,7 +594,7 @@
}
List<CodeClassify> doList =codeClassifyMapper.getRMLibByName(libNameList,"Enabled",AuthUtil.getTenantId()
.equals(
- nacosConfigCache
+ NacosConfigCache
.getAdminUserInfo()
.getTenantId()
) ? null:AuthUtil.getTenantId());
@@ -605,6 +602,17 @@
return voList;
}
+ /***
+ * 鏍规嵁oid鑾峰彇涓嬮潰鎵�鏈夌殑鍒嗙被淇℃伅
+ * @param oid
+ * @return
+ */
+ public List<CodeClassifyVO> selectAllClassifyByOid(String oid){
+ List<CodeClassify> codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(oid,AuthUtil.getTenantId());
+ List<CodeClassifyVO> voList = codeClassifyDO2VOs(codeClassifyList);
+ return voList;
+
+ }
/***
* 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅
* @param desc
@@ -769,7 +777,8 @@
if(allLevel){
List<CodeClassify> classifyDOS = codeClassifyMapper.selectAllLevelChildHasPath(codeClassifyOid,fieldInPath);
if(!CollectionUtils.isEmpty(classifyDOS)){
- classifyDOS = classifyDOS.stream().filter(s->FRAMEWORK_DATA_ENABLED.equalsIgnoreCase(s.getLcStatus())).collect(Collectors.toList());
+ // 杩欏効鐢╯tream鏈夌偣鎱�
+ classifyDOS = classifyDOS.parallelStream().filter(s->FRAMEWORK_DATA_ENABLED.equalsIgnoreCase(s.getLcStatus())).collect(Collectors.toList());
}
return codeClassifyDO2VOs(classifyDOS);
}else{
@@ -1149,7 +1158,8 @@
List<Map<String,Object>> cbos = codeClassifyMapper.selectAllLevelParentByOid(oid);
Map<String,String> oidLevelMap = new HashMap<>();
Optional.ofNullable(cbos).orElseGet(()->new ArrayList<>()).stream().forEach(cbo->{
- oidLevelMap.put(cbo.get("OID").toString(),cbo.get("LEVEL").toString());
+ // 鐢╧ey鍙杕ap鍊煎苟涓斾笉鍖哄垎澶у皬鍐�
+ oidLevelMap.put(cbo.getOrDefault("OID",cbo.get("oid")).toString(),cbo.get("LEVEL").toString());
});
if(CollectionUtils.isEmpty(oidLevelMap)){
return new ArrayList<>();
--
Gitblit v1.9.3