From 309de8506f5e08dea1c8fdd0d377f0884aa21dd7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 18 三月 2024 18:21:39 +0800
Subject: [PATCH] 集成相关更改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index 486c729..0fc616d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -368,7 +368,7 @@
xmlResultDataObjectDetailDO.setCode("");
xmlResultDataObjectDetailDO.setId(applyDataVO.getId());
xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
- xmlResultDataObjectDetailDO.setMsg("缂栫爜缁存姢澶辫触:" + e.getMessage());
+ xmlResultDataObjectDetailDO.setMsg("缂栫爜鐢宠澶辫触:" + e.getMessage());
resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
});
}else{
@@ -376,7 +376,7 @@
xmlResultDataObjectDetailDO.setCode("");
xmlResultDataObjectDetailDO.setId("");
xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
- xmlResultDataObjectDetailDO.setMsg("缂栫爜缁存姢澶辫触:" + e.getMessage());
+ xmlResultDataObjectDetailDO.setMsg("缂栫爜鐢宠澶辫触:" + e.getMessage());
resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
}
e.printStackTrace();
@@ -578,7 +578,7 @@
ApplyDatasVO applyDatasVO=new ApplyDatasVO();
ApplyDatasVO editDatasVO=new ApplyDatasVO();
if(!CollectionUtils.isEmpty(cboList)){
- Map<String,ClientBusinessObject> oldpplyDataVOMap= cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
+ Map<String,ClientBusinessObject> oldpplyDataVOMap = cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
//鏁版嵁搴撲笉瀛樺湪鐨�
List<ApplyDataVO> applyApplyDataVOList = applyDataVOList.stream().filter(cbo -> {
String code =cbo.getCode();
@@ -2180,6 +2180,7 @@
codeBZApplyDTO.setLastModifier(applyBZDataVO.getEditor());
codeBZApplyDTO.setLcStatus(applyBZDataVO.getStatus());
ApplyBZDatasVO newApplyBZDatasVO=new ApplyBZDatasVO();
+ applyBZDataVO.setProp(proppertyVOList);
newApplyBZDatasVO.setObject(Arrays.asList(applyBZDataVO));
log.info("end锛氭暟鎹粍缁囧畬姣�");
this.getConfigDatas(finalSystemId, finalLibray, newApplyBZDatasVO, attrVOS, dataObjectVO);
@@ -2354,7 +2355,6 @@
return clientBusinessObjectList;
}
-
private List<CodeOrderSecDTO> getRuleCodeOrderSecDTOsBZ(CodeRuleVO ruleVO,CodeClassifyFullInfoBO classifyFullInfo){
List<CodeBasicSecVO> codeBasicSecVOS= ruleVO.getSecVOList();
List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
@@ -2366,7 +2366,6 @@
}
return codeOrderSecDTOList;
}
-
/***
* 鏍规嵁浼犲叆鐨勫弬鏁颁俊鎭牎楠岀爜娈佃鍒�
@@ -2461,7 +2460,9 @@
e.printStackTrace();
throw new Throwable("闆嗘垚绯荤粺鏍囪瘑涓猴細銆�" + systemId + "銆戯紝鍒嗙被搴撲负:銆�" + libray + "銆戠殑闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
}
- String path = stringStringMap.get(systemId);
+ // String path = stringStringMap.get(systemId);
+ // 蹇界暐key澶у皬鍐欙紝鑾峰彇閰嶇疆鐨勬槧灏勬枃浠惰矾寰�
+ String path = VciBaseUtil.getMapStrValueIgnoreCase(stringStringMap,systemId);
if (!CollectionUtils.isEmpty(libraryClsfDOList)) {
Map<String, List<ClsfAttrMappingDO>> libPropMaps = libraryClsfDOList.stream().collect(Collectors.toMap(LibraryClsfDO::getLibrary, LibraryClsfDO::getProp, (key1, key2) -> key2));
log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃�");
@@ -2586,7 +2587,9 @@
e.printStackTrace();
throw new Throwable("闆嗘垚绯荤粺鏍囪瘑涓猴細銆�" + systemId + "銆戯紝鍒嗙被搴撲负:銆�" + libray + "銆戠殑闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
}
- String path = stringStringMap.get(systemId);
+ // String path = stringStringMap.get(systemId);
+ // 蹇界暐key澶у皬鍐欙紝鑾峰彇閰嶇疆鐨勬槧灏勬枃浠惰矾寰�
+ String path = VciBaseUtil.getMapStrValueIgnoreCase(stringStringMap,systemId);
if (!CollectionUtils.isEmpty(libraryClsfDOList)) {
Map<String, List<ClsfAttrMappingDO>> libPropMaps = libraryClsfDOList.stream().collect(Collectors.toMap(LibraryClsfDO::getLibrary, LibraryClsfDO::getProp, (key1, key2) -> key2));
log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃�");
--
Gitblit v1.9.3