From 33f5b404064d528da54157a786031503ff723932 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 三月 2024 08:58:49 +0800
Subject: [PATCH] 集成相关更改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 250 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 163 insertions(+), 87 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 40aa35b..9528c9e 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
@@ -283,8 +283,12 @@
systemId = interParameterVO.getData().getSystemId();
UserVO userVo = interParameterVO.getData().getUser();
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
-
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT),this.getRequest());
+ try {
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT), this.getRequest());
+ }catch (Throwable e){
+ errorid[0] ="1";
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触.");
+ }
List<ClassfyVO> classVOList = classfysVO.getClassify();
InterParameterVO finalInterParameterVO = interParameterVO;
//杩欐槸璐﹀彿淇℃伅
@@ -368,7 +372,6 @@
resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
});
}else{
-
XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
xmlResultDataObjectDetailDO.setCode("");
xmlResultDataObjectDetailDO.setId("");
@@ -377,6 +380,7 @@
resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
}
e.printStackTrace();
+ log.error(e.getMessage());
}finally {
XMLResultClassfyVO resultClassfyVO = new XMLResultClassfyVO();
resultClassfyVO.setClassCode(classVO.getClassCode());
@@ -395,6 +399,7 @@
}catch (Throwable e){
e.printStackTrace();
msg="鐢宠缂栫爜澶辫触:"+e.getMessage();
+ log.error(msg);
/* XMLResultSystemVO XMLResultSystemVO=new XMLResultSystemVO();
XMLResultSystemVO.setErrorid(errorid);
XMLResultSystemVO.setMsg("鐢宠缂栫爜澶辫触锛�->"+e.getMessage());
@@ -416,10 +421,10 @@
if(!CollectionUtils.isEmpty(resultClassfyVOList)) {
resultClassfyVOList.stream().forEach(xMLResultClassfyVO -> {
xMLResultClassfyVO.getObjects().stream().forEach(objec -> {
- if (!(objec.getErrorid().equals("0") || objec.getErrorid().equals("204"))) {
+ if (!(objec.getErrorid().equals("0")||objec.getErrorid().equals("201") ||objec.getErrorid().equals("205")|| objec.getErrorid().equals("204"))) {
issucess[0] = false;
- msg=objec.getMsg();
}
+ msg=objec.getMsg();
});
});
}
@@ -430,6 +435,7 @@
this.saveLogs(systemId, systemId, data, resultStr, issucess[0], msg, "applyCode");
}catch (Throwable e){
e.printStackTrace();
+ log.error(e.getMessage());
}
}
log.info("杩斿洖鍙傛暟:"+resultStr);
@@ -461,7 +467,11 @@
if(personData==null){
throw new Throwable("浼犲叆鍙傛暟涓簄ull");
}
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemCode.toLowerCase(Locale.ROOT),this.getRequest());
+ try {
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemCode.toLowerCase(),this.getRequest());
+ }catch (Throwable e){
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+ }
masterDataList = personData.getMasterData();
String personLibrary = personAndDeptConfig.getPersonLibrary();
if (StringUtils.isBlank(personLibrary)) {
@@ -568,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();
@@ -726,33 +736,36 @@
public ResultOrgData syncDataForOrg(OrgData orgData) {
boolean isUsedFlag= personAndDeptConfig.isUsedFlag();
ResultOrgData resultOrgData=new ResultOrgData();
- boolean isPersonApplyGroupCode= personAndDeptConfig.isPersonApplyGroupCode();
+ boolean isPersonApplyGroupCode= personAndDeptConfig.isDeptApplyGroupCode();
List<ResultMdMapping> resultMdMappingList=new ArrayList<>();
AtomicBoolean success= new AtomicBoolean(true);
String message="";
String systemCode="";
if(isUsedFlag){
List<OrgMasterData> orgMasterDataList=new ArrayList<>();
- List<String> fields= VciBaseUtil.str2List(personAndDeptConfig.getPersonFields());
+ List<String> fields= VciBaseUtil.str2List(personAndDeptConfig.getDeptFields());
try {
if(orgData==null){
throw new Throwable("浼犲叆鍙傛暟涓簄ull");
}
systemCode=orgData.getSystemCode();
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemCode.toLowerCase(),this.getRequest());
-
- orgMasterDataList = orgData.getMasterData();
- String personLibrary = personAndDeptConfig.getPersonLibrary();
- if (StringUtils.isBlank(personLibrary)) {
- success.set(false);
- log.info("闆嗘垚閰嶇疆缂哄皯浜哄憳搴撹妭鐐逛俊鎭�,personLibrary->" + personLibrary);
- throw new Throwable("闆嗘垚閰嶇疆缂哄皯浜哄憳搴撹妭鐐逛俊鎭�,personLibrary->" + personLibrary);
+ try {
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemCode.toLowerCase(),this.getRequest());
+ }catch (Throwable e){
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
}
- String personClassCode = personAndDeptConfig.getPersonClassCode();
+ orgMasterDataList = orgData.getMasterData();
+ String deptLibrary = personAndDeptConfig.getDeptLibrary();
+ if (StringUtils.isBlank(deptLibrary)) {
+ success.set(false);
+ log.info("闆嗘垚閰嶇疆缂哄皯閮ㄩ棬搴撹妭鐐逛俊鎭�,deptLibrary->" + deptLibrary);
+ throw new Throwable("闆嗘垚閰嶇疆缂哄皯閮ㄩ棬搴撹妭鐐逛俊鎭�,deptLibrary->" + deptLibrary);
+ }
+ String deptClassCode = personAndDeptConfig.getDeptClassCode();
ClassfyVO classfyVO = new ClassfyVO();
- classfyVO.setLibrary(personLibrary);
- classfyVO.setClassCode(personClassCode);
- CodeClassifyVO codeClassifyVO=this.getClassfy(classfyVO,personLibrary);
+ classfyVO.setLibrary(deptLibrary);
+ classfyVO.setClassCode(deptClassCode);
+ CodeClassifyVO codeClassifyVO=this.getClassfy(classfyVO,deptLibrary);
log.info("end锛氬垎绫绘煡璇㈠畬姣�");
//鑾峰彇鍒嗙被妯℃澘淇℃伅
if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
@@ -762,7 +775,7 @@
CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
success.set(false);
- throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旀ā鏉�");
+ throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旀ā鏉�");
}
List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) &&
@@ -865,7 +878,7 @@
LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs=new LinkedList<>();
if(editDatasVO.getObject()!=null&&editDatasVO.getObject().size()>0){
DataObjectVO dataObjectVO = new DataObjectVO();
- this.getConfigDatas(systemCode, personLibrary, editDatasVO, attrVOS, dataObjectVO);
+ this.getConfigDatas(systemCode, deptLibrary, editDatasVO, attrVOS, dataObjectVO);
log.info("start锛氫慨鏀规暟鎹墽琛屽畬姣�");
boolean personApplyGroupCode =personAndDeptConfig.isPersonApplyGroupCode();
mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,personApplyGroupCode);
@@ -873,7 +886,7 @@
}
if(applyDatasVO.getObject()!=null&&applyDatasVO.getObject().size()>0) {
DataObjectVO dataObjectVO = new DataObjectVO();
- this.getConfigDatas(systemCode, personLibrary, applyDatasVO, attrVOS, dataObjectVO);
+ this.getConfigDatas(systemCode, deptLibrary, applyDatasVO, attrVOS, dataObjectVO);
CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyVO.getOid());
CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo);
@@ -959,7 +972,7 @@
}
}catch (Throwable e){
success.set(false);
- message="浜哄憳鏁版嵁鎺ュ彈澶辫触:"+e.getMessage();
+ message="閮ㄩ棬鏁版嵁鎺ュ彈澶辫触:"+e.getMessage();
//缁勭粐杩斿洖缁撴灉
boolean finalSuccess = success.get();
String finalMessage = message;
@@ -1036,7 +1049,12 @@
UserVO userVo = interParameterVO.getData().getUser();
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
//passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT),this.getRequest());
+ try {
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+ }catch (Throwable e){
+ errorid = "1";
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+ }
List<ClassfyVO> classVOList = classfysVO.getClassify();
InterParameterVO finalInterParameterVO = interParameterVO;
//杩欐槸璐﹀彿淇℃伅
@@ -1144,10 +1162,10 @@
if(!CollectionUtils.isEmpty(resultClassfyVOList)) {
resultClassfyVOList.stream().forEach(xMLResultClassfyVO -> {
xMLResultClassfyVO.getObjects().stream().forEach(objec -> {
- if (!(objec.getErrorid().equals("0") || objec.getErrorid().equals("204"))) {
+ if (!(objec.getErrorid().equals("0")||objec.getErrorid().equals("201") ||objec.getErrorid().equals("205")|| objec.getErrorid().equals("204"))) {
issucess[0] = false;
- msg=objec.getMsg();
}
+ msg=objec.getMsg();
});
});
}
@@ -1212,7 +1230,12 @@
systemId=queryData.getSystemId();
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
//passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+ try {
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+ }catch (Throwable e){
+ errorid = "1";
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+ }
QueryLibraryVO libraryVO= queryData.getLibrary();
String libId= libraryVO.getId();
@@ -1373,7 +1396,12 @@
UserVO userVo=condtionsVO.getUser();
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
//passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+ try {
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+ }catch (Throwable e){
+ errorid = "1";
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+ }
CondtionVO condtionVO= condtionsVO.getCondtion();
SessionInfo sessionInfo = new SessionInfo();
sessionInfo.setUserId(userVo.getUserName());
@@ -1591,7 +1619,12 @@
systemId=queryData.getSystemId();
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
//passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+ try {
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+ }catch (Throwable e){
+ errorid = "1";
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+ }
QueryLibraryVO libraryVO= queryData.getLibrary();
String libId= libraryVO.getId();
@@ -2049,7 +2082,12 @@
UserVO userVo = applyBZParamVO.getData().getUser();
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
//passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(), this.getRequest());
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+ try {
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+ }catch (Throwable e){
+ errorid[0] = "1";
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+ }
//杩欐槸璐﹀彿淇℃伅
SessionInfo sessionInfo = new SessionInfo();
sessionInfo.setUserId(userVo.getUserName());
@@ -2142,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);
@@ -2189,10 +2228,10 @@
if(!CollectionUtils.isEmpty(resultClassfyVOList)) {
resultClassfyVOList.stream().forEach(xMLResultClassfyVO -> {
xMLResultClassfyVO.getObjects().stream().forEach(objec -> {
- if (!(objec.getErrorid().equals("0") || objec.getErrorid().equals("204"))) {
+ if (!(objec.getErrorid().equals("0")||objec.getErrorid().equals("201")||objec.getErrorid().equals("205") || objec.getErrorid().equals("204"))) {
issucess[0] = false;
- msg=objec.getMsg();
}
+ msg=objec.getMsg();
});
});
}
@@ -2208,6 +2247,7 @@
//璋冪敤闆嗗洟鐢宠鎺ュ彛鐢宠闆嗗洟鐮�
return resultStr;
}
+
private void setPropertyValue(String key,String value,List<ProppertyVO> proppertyVOList){
ProppertyVO proppertyVO=new ProppertyVO();
proppertyVO.setKey(key);
@@ -2215,6 +2255,7 @@
proppertyVOList.add(proppertyVO);
}
+
/***
* 鏌ヨ鏍￠獙鍒嗙被淇℃伅
* @param classfyVO
@@ -2257,6 +2298,7 @@
}
return classifyVO;
}
+
/***
* 鏌ヨ鏍￠獙鍒嗙被淇℃伅
* @param classfyVO
@@ -2316,7 +2358,6 @@
return clientBusinessObjectList;
}
-
private List<CodeOrderSecDTO> getRuleCodeOrderSecDTOsBZ(CodeRuleVO ruleVO,CodeClassifyFullInfoBO classifyFullInfo){
List<CodeBasicSecVO> codeBasicSecVOS= ruleVO.getSecVOList();
List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
@@ -2328,7 +2369,6 @@
}
return codeOrderSecDTOList;
}
-
/***
* 鏍规嵁浼犲叆鐨勫弬鏁颁俊鎭牎楠岀爜娈佃鍒�
@@ -2393,41 +2433,60 @@
return codeOrderSecDTOList;
}
+ /***
+ * 璇诲彇灞炴�ф槧灏勯厤缃俊鎭�
+ * @param systemId
+ * @param libray
+ * @param applyDatasVO
+ * @param codeClassifyTemplateAttrVOList
+ * @param dataObjectVO
+ * @throws Throwable
+ */
public void getConfigDatas(String systemId,String libray, ApplyBZDatasVO applyDatasVO,List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOList,DataObjectVO dataObjectVO) throws Throwable {
LinkedHashMap<String,LinkedHashMap<String,String>> dataKeyValueMap=new LinkedHashMap<>();
//濡傛灉灏嗘暟鎹浆鎹㈡垚鎵�闇�瑕佺殑鏁版嵁瀵硅薄
Map<String, String> attrMapConfigMap=new HashMap<>();
Map<String, String> propMaps=new HashMap<>();
- try {
- log.info("寮�濮嬭鍙栫郴缁熼厤缃枃浠� start");
- Map<String, String> stringStringMap=attributeMapConfig.getSystem_attrmap();
- log.info("闆嗘垚绯荤粺灞炴�ф槧灏勯厤缃枃浠舵潯鐩暟-銆�"+stringStringMap.size());
- //stringStringMap.put("RLM","D:\\RLM.xml");
- if(!CollectionUtils.isEmpty(stringStringMap)) {
+ log.info("寮�濮嬭鍙栫郴缁熼厤缃枃浠� start");
+ Map<String, String> stringStringMap=attributeMapConfig.getSystem_attrmap();
+ log.info("闆嗘垚绯荤粺灞炴�ф槧灏勯厤缃枃浠舵潯鐩暟-銆�"+stringStringMap.size());
+ //stringStringMap.put("RLM","D:\\RLM.xml");
+ if(!CollectionUtils.isEmpty(stringStringMap)) {
+ List<LibraryClsfDO> libraryClsfDOList=new ArrayList<>();
+ try {
log.info("info锛氶渶瑕佽鍙栭厤缃枃浠�");
LibraryDO libraryDO = gennerAttrMapUtil.getNewInstance().gennerAttrMapBySystem(systemId, stringStringMap);
- List<LibraryClsfDO> libraryClsfDOList = libraryDO.getClsf();
- 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 + "浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃�");
- String path=stringStringMap.get(systemId);
- if (libPropMaps.containsKey(libray.toUpperCase(Locale.ROOT))) {
- log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�");
- List<ClsfAttrMappingDO> clsfAttrMappingDOList = libPropMaps.get(libray.toUpperCase(Locale.ROOT));
- propMaps = clsfAttrMappingDOList.stream().collect(Collectors.toMap(ClsfAttrMappingDO::getSourceKey, ClsfAttrMappingDO::getTargetKey, (key1, key2) -> key2));
- log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�,灞炴�ф槧灏勬潯鐩暟+" + clsfAttrMappingDOList.size());
- }else{
- throw new Throwable("鏍规嵁绯荤粺鏍囪瘑銆�"+systemId+"銆戞壘鍒板搴旂殑閰嶇疆鏂囦欢:銆�"+path+"銆戯紝浣嗘湭鑾峰彇鍒板搴旂殑搴撱��"+libray+"銆戝睘鎬ф槧灏勪俊鎭厤缃�");
- }
- }
+ libraryClsfDOList = libraryDO.getClsf();
+ } catch (Throwable e) {
+ objerrorCode = "1";
+ e.printStackTrace();
+ throw new Throwable("闆嗘垚绯荤粺鏍囪瘑涓猴細銆�" + systemId + "銆戯紝鍒嗙被搴撲负:銆�" + libray + "銆戠殑闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
}
- log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�"+libray+"浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃� end ");
- }catch (Throwable e){
- objerrorCode="1";
- e.printStackTrace();
- throw new Throwable("闆嗘垚绯荤粺鏍囪瘑涓猴細銆�"+systemId+"銆戯紝鍒嗙被搴撲负:銆�"+libray+"銆戠殑闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
+ // 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 + "浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃�");
+ if (libPropMaps.containsKey(libray.toUpperCase(Locale.ROOT))) {
+ log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�");
+ List<ClsfAttrMappingDO> clsfAttrMappingDOList = libPropMaps.get(libray.toUpperCase(Locale.ROOT));
+ propMaps = clsfAttrMappingDOList.stream().collect(Collectors.toMap(ClsfAttrMappingDO::getSourceKey, ClsfAttrMappingDO::getTargetKey, (key1, key2) -> key2));
+ log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�,灞炴�ф槧灏勬潯鐩暟+" + clsfAttrMappingDOList.size());
+ } else {
+ objerrorCode = "1";
+ throw new Throwable("鏍规嵁绯荤粺鏍囪瘑銆�" + systemId + "銆戞壘鍒板搴旂殑閰嶇疆鏂囦欢:銆�" + path + "銆戯紝浣嗘湭鑾峰彇鍒板搴旂殑搴撱��" + libray + "銆戝睘鎬ф槧灏勪俊鎭厤缃�");
+ }
+ }else{
+ objerrorCode = "1";
+ throw new Throwable("鏍规嵁绯荤粺鏍囪瘑銆�" + systemId + "銆戞壘鍒板搴旂殑閰嶇疆鏂囦欢:銆�" + path + "銆戯紝浣嗘湭鑾峰彇鍒板搴旂殑搴撱��" + libray + "銆戝睘鎬ф槧灏勪俊鎭厤缃�");
+ }
+ }else{
+ objerrorCode = "1";
+ throw new Throwable("鏈幏鍙栧埌闆嗘垚灞炴�ф槧灏勭郴缁熼厤缃俊鎭�");
}
+ log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�"+libray+"浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃� end ");
LinkedList<String> rowNameList=new LinkedList<>();
LinkedHashMap<String,Integer> filedIndexMap=new LinkedHashMap<>();
//鏍规嵁鍒嗙被妯℃澘缁勭粐鏁版嵁
@@ -2502,7 +2561,13 @@
}
/***
- * 鏍规嵁灞炴�ф槧灏勮浆鎹㈢紪鐮佹墍闇�瀛楁
+ * 璇诲彇灞炴�ф槧灏勯厤缃俊鎭�
+ * @param systemId
+ * @param libray
+ * @param applyDatasVO
+ * @param codeClassifyTemplateAttrVOList
+ * @param dataObjectVO
+ * @throws Throwable
*/
public void getConfigDatas(String systemId,String libray, ApplyDatasVO applyDatasVO,List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOList,DataObjectVO dataObjectVO) throws Throwable {
@@ -2510,35 +2575,45 @@
//濡傛灉灏嗘暟鎹浆鎹㈡垚鎵�闇�瑕佺殑鏁版嵁瀵硅薄
Map<String, String> attrMapConfigMap=new HashMap<>();
Map<String, String> propMaps=new HashMap<>();
- try {
- log.info("寮�濮嬭鍙栫郴缁熼厤缃枃浠� start");
- Map<String, String> stringStringMap=attributeMapConfig.getSystem_attrmap();
- log.info("闆嗘垚绯荤粺灞炴�ф槧灏勯厤缃枃浠舵潯鐩暟-銆�"+stringStringMap.size());
- //stringStringMap.put("RLM","D:\\RLM.xml");
- if(!CollectionUtils.isEmpty(stringStringMap)) {
+ log.info("寮�濮嬭鍙栫郴缁熼厤缃枃浠� start");
+ Map<String, String> stringStringMap=attributeMapConfig.getSystem_attrmap();
+ log.info("闆嗘垚绯荤粺灞炴�ф槧灏勯厤缃枃浠舵潯鐩暟-銆�"+stringStringMap.size());
+ //stringStringMap.put("RLM","D:\\RLM.xml");
+ if(!CollectionUtils.isEmpty(stringStringMap)) {
+ List<LibraryClsfDO> libraryClsfDOList=new ArrayList<>();
+ try {
log.info("info锛氶渶瑕佽鍙栭厤缃枃浠�");
LibraryDO libraryDO = gennerAttrMapUtil.getNewInstance().gennerAttrMapBySystem(systemId, stringStringMap);
- List<LibraryClsfDO> libraryClsfDOList = libraryDO.getClsf();
- 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 + "浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃�");
- String path=stringStringMap.get(systemId);
- if (libPropMaps.containsKey(libray.toUpperCase(Locale.ROOT))) {
- log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�");
- List<ClsfAttrMappingDO> clsfAttrMappingDOList = libPropMaps.get(libray.toUpperCase(Locale.ROOT));
- propMaps = clsfAttrMappingDOList.stream().collect(Collectors.toMap(ClsfAttrMappingDO::getSourceKey, ClsfAttrMappingDO::getTargetKey, (key1, key2) -> key2));
- log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�,灞炴�ф槧灏勬潯鐩暟+" + clsfAttrMappingDOList.size());
- }else{
- throw new Throwable("鏍规嵁绯荤粺鏍囪瘑銆�"+systemId+"銆戞壘鍒板搴旂殑閰嶇疆鏂囦欢:銆�"+path+"銆戯紝浣嗘湭鑾峰彇鍒板搴旂殑搴撱��"+libray+"銆戝睘鎬ф槧灏勪俊鎭厤缃�");
- }
- }
+ libraryClsfDOList = libraryDO.getClsf();
+ } catch (Throwable e) {
+ objerrorCode = "1";
+ e.printStackTrace();
+ throw new Throwable("闆嗘垚绯荤粺鏍囪瘑涓猴細銆�" + systemId + "銆戯紝鍒嗙被搴撲负:銆�" + libray + "銆戠殑闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
}
- log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�"+libray+"浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃� end ");
- }catch (Throwable e){
- objerrorCode="1";
- e.printStackTrace();
- throw new Throwable("闆嗘垚绯荤粺鏍囪瘑涓猴細銆�"+systemId+"銆戯紝鍒嗙被搴撲负:銆�"+libray+"銆戠殑闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
+ // 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 + "浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃�");
+ if (libPropMaps.containsKey(libray.toUpperCase(Locale.ROOT))) {
+ log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�");
+ List<ClsfAttrMappingDO> clsfAttrMappingDOList = libPropMaps.get(libray.toUpperCase(Locale.ROOT));
+ propMaps = clsfAttrMappingDOList.stream().collect(Collectors.toMap(ClsfAttrMappingDO::getSourceKey, ClsfAttrMappingDO::getTargetKey, (key1, key2) -> key2));
+ log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�,灞炴�ф槧灏勬潯鐩暟+" + clsfAttrMappingDOList.size());
+ } else {
+ objerrorCode = "1";
+ throw new Throwable("鏍规嵁绯荤粺鏍囪瘑銆�" + systemId + "銆戞壘鍒板搴旂殑閰嶇疆鏂囦欢:銆�" + path + "銆戯紝浣嗘湭鑾峰彇鍒板搴旂殑搴撱��" + libray + "銆戝睘鎬ф槧灏勪俊鎭厤缃�");
+ }
+ }else{
+ objerrorCode = "1";
+ throw new Throwable("鏍规嵁绯荤粺鏍囪瘑銆�" + systemId + "銆戞壘鍒板搴旂殑閰嶇疆鏂囦欢:銆�" + path + "銆戯紝浣嗘湭鑾峰彇鍒板搴旂殑搴撱��" + libray + "銆戝睘鎬ф槧灏勪俊鎭厤缃�");
+ }
+ }else{
+ objerrorCode = "1";
+ throw new Throwable("鏈幏鍙栧埌闆嗘垚灞炴�ф槧灏勭郴缁熼厤缃俊鎭�");
}
+ log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�"+libray+"浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃� end ");
LinkedList<String> rowNameList=new LinkedList<>();
LinkedHashMap<String,Integer> filedIndexMap=new LinkedHashMap<>();
//鏍规嵁鍒嗙被妯℃澘缁勭粐鏁版嵁
@@ -2616,6 +2691,7 @@
throw new Throwable("缁勭粐鏁版嵁鏄犲皠鍊煎け璐�");
}
}
+
/***
* 璁板綍鏃ュ織淇℃伅
* @param systemId
--
Gitblit v1.9.3