From 4d6ef8b333cb6b9a4ca97966c6a696d56b0f3c89 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 01 三月 2024 16:31:06 +0800
Subject: [PATCH] 近义词查询规则清空当前id和text

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java |  206 ++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 138 insertions(+), 68 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..30d7676 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)) {
@@ -739,8 +749,11 @@
 					throw new Throwable("浼犲叆鍙傛暟涓簄ull");
 				}
 				systemCode=orgData.getSystemCode();
-				passwordFreeLoginService.pwdFreeLoginByBoolean(systemCode.toLowerCase(),this.getRequest());
-
+				try {
+					passwordFreeLoginService.pwdFreeLoginByBoolean(systemCode.toLowerCase(),this.getRequest());
+				}catch (Throwable e){
+					throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+				}
 				orgMasterDataList = orgData.getMasterData();
 				String personLibrary = personAndDeptConfig.getPersonLibrary();
 				if (StringUtils.isBlank(personLibrary)) {
@@ -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();
 						});
 					});
 				}
@@ -2393,41 +2432,58 @@
 		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);
+			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 +2558,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 +2572,43 @@
 		//濡傛灉灏嗘暟鎹浆鎹㈡垚鎵�闇�瑕佺殑鏁版嵁瀵硅薄
 		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);
+			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<>();
 		//鏍规嵁鍒嗙被妯℃澘缁勭粐鏁版嵁

--
Gitblit v1.9.3