From e9ae27404803d0616e06ed21027408a71b4bc19c Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期三, 05 三月 2025 17:34:02 +0800
Subject: [PATCH] 集成申码接口调整：当码值按照约定传表名为空的业务场景下传null校验问题和码值组装问题。
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 305 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 254 insertions(+), 51 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 79a077a..3c11372 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
@@ -38,7 +38,10 @@
import com.vci.ubcs.code.webService.annotation.VciWebservice;
import com.vci.ubcs.code.webService.config.AttributeMapConfig;
import com.vci.ubcs.code.webService.config.PersonAndDeptConfig;
+import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.feign.IBtmTypeClient;
+import com.vci.ubcs.omd.feign.IDictClient;
+import com.vci.ubcs.omd.feign.IEnumClient;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
@@ -78,6 +81,7 @@
import static com.vci.ubcs.code.constant.MdmEngineConstant.DEFAULT_SYNC_ATTR_LIST;
import static com.vci.ubcs.code.enumpack.CodeSecTypeEnum.CODE_CLASSIFY_SEC;
+import static com.vci.ubcs.code.enumpack.CodeSecTypeEnum.CODE_REFER_SEC;
/***
* 缁熶竴鎺ュ彛
@@ -283,6 +287,7 @@
}
}catch (Throwable e){
errorid[0] ="101";
+ log.error("鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�",e);
throw new Throwable("鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�");
}
ClassfysVO classfysVO = interParameterVO.getData().getClassifys();
@@ -293,7 +298,7 @@
passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT), this.getRequest());
}catch (Throwable e){
errorid[0] ="1";
- throw new Throwable("鐢ㄦ埛閴存潈澶辫触.");
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触锛屽師鍥狅細"+e.getMessage());
}
List<ClassfyVO> classVOList = classfysVO.getClassify();
//InterParameterVO finalInterParameterVO = interParameterVO;
@@ -368,6 +373,7 @@
} catch (Throwable e) {
List<ApplyDataVO> applyDataVOList= classVO.getObjects().getObject();
objerrorCode="1";
+ log.error("缂栫爜鐢宠澶辫触:",e);
if(!CollectionUtils.isEmpty(applyDataVOList)) {
applyDataVOList.stream().forEach(applyDataVO -> {
XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
@@ -386,7 +392,7 @@
resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
}
e.printStackTrace();
- log.error(e.getMessage());
+ //log.error(e.getMessage());
}finally {
XMLResultClassfyVO resultClassfyVO = new XMLResultClassfyVO();
resultClassfyVO.setClassCode(classVO.getClassCode());
@@ -405,7 +411,8 @@
}catch (Throwable e){
e.printStackTrace();
msg="鐢宠缂栫爜澶辫触:"+e.getMessage();
- log.error(msg);
+ //log.error(msg);
+ log.error("缂栫爜鐢宠澶辫触:",e);
/* XMLResultSystemVO XMLResultSystemVO=new XMLResultSystemVO();
XMLResultSystemVO.setErrorid(errorid);
XMLResultSystemVO.setMsg("鐢宠缂栫爜澶辫触锛�->"+e.getMessage());
@@ -441,7 +448,8 @@
this.saveLogs(systemId, systemId, data, resultStr, issucess[0], msg, "applyCode");
}catch (Throwable e){
e.printStackTrace();
- log.error(e.getMessage());
+ //log.error(e.getMessage());
+ log.error("淇濆瓨鏃ュ織鍑洪敊,鍘熷洜:",e);
}
}
log.info("杩斿洖鍙傛暟:"+resultStr);
@@ -475,6 +483,7 @@
try {
passwordFreeLoginService.pwdFreeLoginByBoolean(systemCode.toLowerCase(),this.getRequest());
}catch (Throwable e){
+ log.error("鐢ㄦ埛閴存潈澶辫触:",e);
throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
}
masterDataList = personData.getMasterData();
@@ -553,7 +562,7 @@
object.setOperate("create");
applyDataVOList.add(object);
}
- codeList.add(personMasterData.getLm_code());
+ codeList.add(object.getCode());
});
R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
@@ -608,8 +617,8 @@
DataObjectVO dataObjectVO = new DataObjectVO();
this.getConfigDatas(systemCode, personLibrary, editDatasVO, attrVOS, dataObjectVO);
log.info("start锛氫慨鏀规暟鎹墽琛屽畬姣�");
- boolean personApplyGroupCode =personAndDeptConfig.isPersonApplyGroupCode();
- mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,personApplyGroupCode);
+ // boolean personApplyGroupCode =personAndDeptConfig.isPersonApplyGroupCode();
+ mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,isPersonApplyGroupCode);
log.info("end锛氫慨鏀规暟鎹墽琛屽畬姣�");
}
if(applyDatasVO.getObject()!=null&&applyDatasVO.getObject().size()>0) {
@@ -671,9 +680,10 @@
}
}
} catch (Exception e) {
+ log.error("鏁版嵁淇濆瓨澶辫触:",e);
mesg=e.getMessage();
e.printStackTrace();
- throw new ServiceException(e.getMessage());
+ // throw new ServiceException(e.getMessage());
}finally {
XMLResultDataObjectDetailDO x=new XMLResultDataObjectDetailDO();
x.setId(rowData.getOid());
@@ -705,6 +715,7 @@
success.set(false);
message = "浜哄憳鏁版嵁鎺ユ敹澶辫触:"+e.getMessage();
msg = "浜哄憳鏁版嵁鎺ユ敹澶辫触:"+e.getMessage();
+ log.error( "浜哄憳鏁版嵁鎺ユ敹澶辫触:",e);
//缁勭粐杩斿洖缁撴灉
boolean finalSuccess = success.get();
String finalMessage = message;
@@ -729,6 +740,7 @@
//璁板綍鏃ュ織
this.saveLogs(systemCode, systemCode, data, resultStr, success.get(), msg, "syncDataForPerson");
}catch (Throwable e){
+ log.error( "鏃ュ織淇濆瓨澶辫触:",e);
e.printStackTrace();
}
}
@@ -762,6 +774,7 @@
try {
passwordFreeLoginService.pwdFreeLoginByBoolean(systemCode.toLowerCase(),this.getRequest());
}catch (Throwable e){
+ log.error( "鐢ㄦ埛閴存潈澶辫触:",e);
throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
}
orgMasterDataList = orgData.getMasterData();
@@ -796,10 +809,10 @@
List<ApplyDataVO> deleteDataVOList=new ArrayList<>();
orgMasterDataList.stream().forEach(orgMasterData -> {
ApplyDataVO object=new ApplyDataVO();
- object.setCode(orgMasterData.getMdm_code());//缂栫爜
+ object.setCode(orgMasterData.getDepartment_code());//缂栫爜
object.setCreator(orgMasterData.getCreator());//鍒涘缓鑰�
object.setEditor(orgMasterData.getModifier());//淇敼鑰�
- object.setId(orgMasterData.getDepartment_code());//涓婚敭
+ object.setId(orgMasterData.getId());//涓婚敭
object.setStatus(CodeDefaultLC.RELEASED.getValue());//鐘舵�佸垯闇�瑕佸垽鏂�
Map<String,String> dataMap= VciBaseUtil.objectToMapString(orgMasterData);
List<ProppertyVO> proppertyVOList = new ArrayList<>();
@@ -834,7 +847,7 @@
object.setOperate("create");
applyDataVOList.add(object);
}
- codeList.add(orgMasterData.getMdm_code());
+ codeList.add(object.getCode());
});
R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
@@ -889,7 +902,7 @@
DataObjectVO dataObjectVO = new DataObjectVO();
this.getConfigDatas(systemCode, deptLibrary, editDatasVO, attrVOS, dataObjectVO);
log.info("start锛氫慨鏀规暟鎹墽琛屽畬姣�");
- boolean personApplyGroupCode = personAndDeptConfig.isPersonApplyGroupCode();
+ boolean personApplyGroupCode = false;//personAndDeptConfig.isPersonApplyGroupCode();
mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,personApplyGroupCode);
log.info("end锛氫慨鏀规暟鎹墽琛屽畬姣�");
}
@@ -904,8 +917,9 @@
}
List<XMLResultDataObjectDetailDO> xDOs=new CopyOnWriteArrayList<>();
//闄愬埗绾跨▼骞惰鏁伴噺
- customForkJoinPool.submit(()->{
- dataObjectVO.getRowData().parallelStream().forEach(rowData->{
+ //customForkJoinPool.submit(()->{
+ // dataObjectVO.getRowData().parallelStream().forEach(rowData->{
+ dataObjectVO.getRowData().forEach(rowData->{
String mesg="";
try {
CodeOrderDTO orderDTO = new CodeOrderDTO();
@@ -921,7 +935,7 @@
//瑙勫垯涔嬪畾涔変负鍙彉鐮佹瀛樺偍涓绘暟鎹紶閫掕繃鏉ョ殑鏁版嵁
CodeOrderSecDTO CodeOrderSecDTO = new CodeOrderSecDTO();
CodeOrderSecDTO.setSecOid(codeBasicSecVO.getOid());
- CodeOrderSecDTO.setSecValue(rowData.getOid());
+ CodeOrderSecDTO.setSecValue(rowData.getCode());
codeOrderSecDTOList.add(CodeOrderSecDTO);
}
});
@@ -930,33 +944,34 @@
orderDTO.setSecDTOList(codeOrderSecDTOList);//瀛樺偍缂栫爜
orderDTO.setData(rowData.getFiledValue());
String code = engineService.addSaveCodeNotauthUser(orderDTO,false);
- /*if(StringUtils.isNotBlank(code)) {
- //rowData.setCode(code);
- StringBuffer sqlsb = new StringBuffer();
- sqlsb.append(" select * from ");
- sqlsb.append(tableName);
- sqlsb.append(" where 1=1 ");
- sqlsb.append(" and lastr=1 and lastv=1");
- sqlsb.append(" and id in (");
- sqlsb.append(VciBaseUtil.toInSql(code));
- sqlsb.append(")");
- List<Map<String, String>> newDataMapList = commonsMapper.queryByOnlySqlForMap(sqlsb.toString());
- if (!CollectionUtils.isEmpty(newDataMapList)) {
- String oid = StringUtils.isBlank(newDataMapList.get(0).get("OID")) ? "" : newDataMapList.get(0).get("OID");
- List<String> oidList = new ArrayList<>();
- oidList.add(oid);
- //濡傛灉鏈夌敵璇峰氨鍘昏皟鐢ㄧ敵璇烽泦鍥㈢爜
- if (isPersonApplyGroupCode) {
- mdmIOService.sendApplyGroupcode(oidList, templateVO.getBtmTypeId(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue());
- success.set(true);
- mesg = "鏁版嵁淇濆瓨鎴愬姛锛岀瓑寰呯敵璇烽泦鍥㈢爜";
+ /*if(StringUtils.isNotBlank(code)) {
+ //rowData.setCode(code);
+ StringBuffer sqlsb = new StringBuffer();
+ sqlsb.append(" select * from ");
+ sqlsb.append(tableName);
+ sqlsb.append(" where 1=1 ");
+ sqlsb.append(" and lastr=1 and lastv=1");
+ sqlsb.append(" and id in (");
+ sqlsb.append(VciBaseUtil.toInSql(code));
+ sqlsb.append(")");
+ List<Map<String, String>> newDataMapList = commonsMapper.queryByOnlySqlForMap(sqlsb.toString());
+ if (!CollectionUtils.isEmpty(newDataMapList)) {
+ String oid = StringUtils.isBlank(newDataMapList.get(0).get("OID")) ? "" : newDataMapList.get(0).get("OID");
+ List<String> oidList = new ArrayList<>();
+ oidList.add(oid);
+ //濡傛灉鏈夌敵璇峰氨鍘昏皟鐢ㄧ敵璇烽泦鍥㈢爜
+ if (isPersonApplyGroupCode) {
+ mdmIOService.sendApplyGroupcode(oidList, templateVO.getBtmTypeId(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue());
+ success.set(true);
+ mesg = "鏁版嵁淇濆瓨鎴愬姛锛岀瓑寰呯敵璇烽泦鍥㈢爜";
+ }
}
- }
- }*/
+ }*/
} catch (Exception e) {
+ log.error( "閮ㄩ棬鏁版嵁鎺ユ敹澶辫触:",e);
mesg=e.getMessage();
e.printStackTrace();
- throw new ServiceException(e.getMessage());
+ // throw new ServiceException(e.getMessage());
}finally {
XMLResultDataObjectDetailDO x=new XMLResultDataObjectDetailDO();
x.setId(rowData.getOid());
@@ -966,7 +981,7 @@
xDOs.add(x);
}
});
- }).join();
+ //}).join();
resultDataObjectDetailDOs.addAll(xDOs);
boolean finalSuccess1 = success.get();
String finalMessage1 = message;
@@ -986,6 +1001,7 @@
success.set(false);
message = "閮ㄩ棬鏁版嵁鎺ユ敹澶辫触:"+e.getMessage();
msg = "閮ㄩ棬鏁版嵁鎺ユ敹澶辫触:"+e.getMessage();
+ log.error( "閮ㄩ棬鏁版嵁鎺ユ敹澶辫触:",e);
//缁勭粐杩斿洖缁撴灉
boolean finalSuccess = success.get();
String finalMessage = message;
@@ -1010,6 +1026,7 @@
//璁板綍鏃ュ織
this.saveLogs(systemCode, systemCode, data, resultStr, success.get(), msg, "syncDataForOrg");
}catch (Throwable e){
+ log.error( "淇濆瓨鏃ュ織澶辫触:",e);
e.printStackTrace();
}
}
@@ -1066,6 +1083,7 @@
passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
}catch (Throwable e){
errorid = "1";
+ log.error("鐢ㄦ埛閴存潈澶辫触",e);
throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
}
List<ClassfyVO> classVOList = classfysVO.getClassify();
@@ -1121,6 +1139,8 @@
mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,isCodeOrGroupCode);
log.info("end锛氫慨鏀规暟鎹墽琛屽畬姣�");
} catch (Throwable e) {
+ msg="缂栫爜鏇存敼/鐘舵�佹洿鏀�/鍒犻櫎:";
+ log.error(msg,e);
List<ApplyDataVO> applyDataVOList= classVO.getObjects().getObject();
objerrorCode="1";
if(!CollectionUtils.isEmpty(applyDataVOList)) {
@@ -1154,6 +1174,7 @@
}catch (Throwable e){
e.printStackTrace();
msg="缂栫爜鏇存敼/鐘舵�佹洿鏀�/鍒犻櫎:"+e.getMessage();
+ log.error(msg,e);
/* XMLResultSystemVO XMLResultSystemVO=new XMLResultSystemVO();
XMLResultSystemVO.setErrorid(errorid);
XMLResultSystemVO.setMsg("鐢宠缂栫爜澶辫触锛�->"+e.getMessage());
@@ -1188,6 +1209,7 @@
//璁板綍鏃ュ織
this.saveLogs(systemId, systemId, data, resultStr, issucess[0], msg, "syncEditData");
}catch (Throwable e){
+ log.error("淇濆瓨鏃ュ織澶辫触",e);
e.printStackTrace();
}
}
@@ -1214,7 +1236,7 @@
log.info("鏌ヨ鍒嗙被鐨勬暟鎹被鍨�:->"+dataType);
ResultClassifyVO resultClassifyVO =new ResultClassifyVO();
List<ClassifyVO> classifyVOList=new ArrayList<>();
- com.vci.ubcs.code.vo.webserviceModel.classify.ResultData resultData=new com.vci.ubcs.code.vo.webserviceModel.classify.ResultData();
+ ResultData resultData=new ResultData();
try {
if (StringUtils.isBlank(data)) {
errorid = "101";
@@ -1236,6 +1258,7 @@
errorid = "101";
msg="鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�";
e.printStackTrace();
+ log.error("鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�",e);
throw new Throwable("鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�");
}
QueryData queryData=queryClassifyVO.getData();
@@ -1342,7 +1365,9 @@
resultData.setLibrary(libraryVo);
}catch (Throwable e){
e.printStackTrace();
+
msg="鏌ヨ鍒嗙被澶辫触:"+e.getMessage();
+ log.error(msg,e);
}finally {
resultData.setErrorid(errorid);
resultData.setMsg(msg);
@@ -1363,6 +1388,7 @@
//璁板綍鏃ュ織
this.saveLogs(systemId, systemId, data, resultStr, issucess, msg, "queryClassify");
}catch (Throwable e){
+ log.error("淇濆瓨鏃ュ織淇℃伅澶辫触锛�",e);
e.printStackTrace();
}
log.info("杩斿洖鍙傛暟:"+resultStr);
@@ -1402,6 +1428,7 @@
errorid = "101";
msg = "鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�";
e.printStackTrace();
+ log.error( "鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�",e);
throw new Throwable("鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�");
}
CondtionsVO condtionsVO=dataCondtionsVO.getCondtions();
@@ -1413,6 +1440,7 @@
passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
}catch (Throwable e){
errorid = "1";
+ log.error("鐢ㄦ埛閴存潈澶辫触",e);
throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
}
CondtionVO condtionVO= condtionsVO.getCondtion();
@@ -1567,7 +1595,9 @@
}
}catch (Throwable e){
e.printStackTrace();
+
msg="鏌ヨ鏁版嵁澶辫触:"+e.getMessage();
+ log.error(msg,e);
}finally {
resultDataVO.setErrorid(errorid);
resultDataVO.setMsg(msg);
@@ -1587,6 +1617,7 @@
try { //璁板綍鏃ュ織
this.saveLogs(systemId, systemId, data, resultStr, issucess, msg, "queryData");
}catch (Throwable e){
+ log.error("淇濆瓨鏃ュ織淇℃伅澶辫触:",e);
e.printStackTrace();
}
log.info("杩斿洖鍙傛暟:"+resultStr);
@@ -1625,6 +1656,7 @@
} catch (Throwable e) {
errorid = "101";
msg = "鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�";
+ log.error(msg,e);
e.printStackTrace();
throw new Throwable("鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�");
}
@@ -1637,6 +1669,7 @@
passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
}catch (Throwable e){
errorid = "1";
+ log.error("鐢ㄦ埛閴存潈澶辫触",e);
throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
}
@@ -2025,6 +2058,7 @@
}catch (Throwable e){
e.printStackTrace();
msg="鏌ヨ鍒嗙被澶辫触:"+e.getMessage();
+ log.error("鏌ヨ鍒嗙被澶辫触:",e);
}finally {
resultClassifyRuleData.setErrorid(errorid);
resultClassifyRuleData.setMsg(msg);
@@ -2045,6 +2079,7 @@
//璁板綍鏃ュ織
this.saveLogs(systemId, systemId, data, resultStr, issucess, msg, "queryClassifyRule");
}catch (Throwable e){
+ log.error("淇濆瓨鏃ュ織淇℃伅澶辫触:",e);
e.printStackTrace();
}
log.info("杩斿洖鍙傛暟:"+resultStr);
@@ -2089,6 +2124,7 @@
}
} catch (Throwable e) {
errorid[0] = "101";
+ log.error("鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�:",e);
throw new Throwable("鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�");
}
classfyBZVO = applyBZParamVO.getData().getClassify();
@@ -2100,6 +2136,7 @@
passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
}catch (Throwable e){
errorid[0] = "1";
+ log.error("鐢ㄦ埛閴存潈澶辫触:",e);
throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
}
//杩欐槸璐﹀彿淇℃伅
@@ -2205,6 +2242,7 @@
} catch (Throwable e) {
objerrorCode = "1";
msg="缂栫爜鐢宠澶辫触:" +e.getMessage();
+ log.error(msg,e);
e.printStackTrace();
}finally {
XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
@@ -2229,6 +2267,7 @@
}catch (Throwable e){
e.printStackTrace();
msg="鐢宠缂栫爜澶辫触:"+e.getMessage();
+ log.error(msg,e);
}finally {
XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO();
xmlResultSystemVO.setClassifys(resultClassfyVOList);
@@ -2254,6 +2293,7 @@
//璁板綍鏃ュ織
this.saveLogs(systemId, systemId, data, resultStr, issucess[0], msg, "applyCodeForBZ");
}catch (Throwable e){
+ log.error("淇濆瓨鏃ュ織淇℃伅澶辫触锛�",e);
e.printStackTrace();
}
}
@@ -2308,6 +2348,7 @@
}
}catch (Throwable e){
objerrorCode="100";
+ log.error("鑾峰彇鍒嗙被淇℃伅澶辫触:",e);
throw new Throwable("鑾峰彇鍒嗙被淇℃伅澶辫触:"+e.getMessage());
}
return classifyVO;
@@ -2351,6 +2392,7 @@
}
}catch (Throwable e){
objerrorCode="100";
+ log.error("鑾峰彇鍒嗙被淇℃伅澶辫触:",e);
throw new Throwable("鑾峰彇鍒嗙被淇℃伅澶辫触:"+e.getMessage());
}
return classifyVO;
@@ -2384,8 +2426,13 @@
return codeOrderSecDTOList;
}
- /***
+ /**
* 鏍规嵁浼犲叆鐨勫弬鏁颁俊鎭牎楠岀爜娈佃鍒�
+ * @param SectionVOList
+ * @param ruleVO
+ * @param classifyFullInfo
+ * @return
+ * @throws Throwable
*/
private List<CodeOrderSecDTO> getRuleCodeOrderSecDTOs(List<SectionVO> SectionVOList,CodeRuleVO ruleVO,CodeClassifyFullInfoBO classifyFullInfo) throws Throwable{
List<CodeBasicSecVO> codeBasicSecVOS= ruleVO.getSecVOList();
@@ -2398,9 +2445,12 @@
Map<String,String> errorMap=new HashMap<>();
for(CodeBasicSecVO codeBasicSecVO: codeBasicSecVOS) {
String sectype = codeBasicSecVO.getSecType();
- String newSecName=codeBasicSecVO.getName();
+ // String newSecName=codeBasicSecVO.getName();
String classifySecOid= codeBasicSecVO.getOid();
String message="";
+ //#NaN?琛ㄧず鐮佸�间负绌虹殑鍦烘櫙
+ String nullSymbol = EnumCache.getValue("nullSymbol", "NULL");
+ nullSymbol = Func.isBlank(nullSymbol) ? "#NaN?":nullSymbol;
if (!sectype.equals(CodeSecTypeEnum.CODE_SERIAL_SEC.getValue())) {
String name = codeBasicSecVO.getName();
String sectypeText = codeBasicSecVO.getSecTypeText();
@@ -2411,15 +2461,14 @@
CodeOrderSecDTO.setSecOid(codeBasicSecVO.getOid());
String sectypeValue = sectionVOMap.get(name);
log.info("鐮佹鍊�:"+sectypeValue);
- CodeSecTypeEnum secType = CodeSecTypeEnum.forValue(sectype);
- if(CODE_CLASSIFY_SEC.equals(secType)) {//濡傛灉鏄垎绫荤殑璇濓紝鍒欓渶瑕佸尮閰嶄紶杩囨潵鐨勫垎绫讳唬鍙蜂笌
+ // CodeSecTypeEnum secType = CodeSecTypeEnum.forValue(sectype);
+ if(CODE_CLASSIFY_SEC.getValue().equals(sectype)) {//濡傛灉鏄垎绫荤殑璇濓紝鍒欓渶瑕佸尮閰嶄紶杩囨潵鐨勫垎绫讳唬鍙蜂笌
//鍏堢畝绉版槸鍚︽湁鍏宠仈妯℃澘锛屾湁妯℃澘瑕佸厛鍒犻櫎
List<CodeClassifyValue> codeClassifyValueDOList = codeClassifyValueService.list(Wrappers.<CodeClassifyValue>query().lambda().eq(CodeClassifyValue::getCodeClassifySecOid,classifySecOid));
-
if (!CollectionUtils.isEmpty(codeClassifyValueDOList)) {
Map<String, CodeClassifyValue> codeClassifyValueDOMap = codeClassifyValueDOList.stream().collect(Collectors.toMap(s -> s.getId(), t -> t, (o1, o2) -> o2));
- if(codeClassifyValueDOMap.containsKey(sectypeValue)){
- CodeClassifyValue codeClassifyValue= codeClassifyValueDOMap.get(sectypeValue);
+ if(codeClassifyValueDOMap.containsKey(sectypeValue) || nullSymbol.equals(sectypeValue)){
+ CodeClassifyValue codeClassifyValue = codeClassifyValueDOMap.get(sectypeValue);
sectypeValue=codeClassifyValue.getOid();
}else {
//throw new Throwable("浼犲叆鐨勫垎绫荤爜娈碉細銆�" + name + " 鍊硷細" + sectypeValue + "銆戯紝涓嶇鍚堝綋鍓嶅垎绫诲眰绾т唬鍙�");
@@ -2427,9 +2476,157 @@
errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
}
}
+ }else if(CODE_REFER_SEC.getValue().equals(sectype)){
+ String referBtmId=codeBasicSecVO.getReferBtmId();
+ String btmName=codeBasicSecVO.getReferBtmName();
+ String referConfig= codeBasicSecVO.getReferConfig();
+ CoderefersecSearchVO coderefersecSearchVO=new CoderefersecSearchVO();
+ if(StringUtils.isNotBlank(referConfig)){
+ coderefersecSearchVO = JSONObject.toJavaObject(JSONObject.parseObject(referConfig), CoderefersecSearchVO.class);
+ }
+ String buildSqlwhere="";
+ List<CodeSectionValueVO> codeSectionValueVOList=new ArrayList<>();
+ if(coderefersecSearchVO!=null) {
+ Map<String, Object> condtionMap = new HashMap<>();
+ String valueField= coderefersecSearchVO.getValueField();
+ if(StringUtils.isNotBlank(valueField)){
+ condtionMap.put(valueField,sectypeValue);
+ }
+ if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.DEFAULT.getValue()) || coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.GRID.getValue())) {//榛樿鏍峰紡/鍒楄〃
+ List<CodeSrchCondConfigVO> codeSrchCondConfigVOList = coderefersecSearchVO.getCodeSrchCondConfigVOS();
+ if (!CollectionUtils.isEmpty(codeSrchCondConfigVOList)) {
+ codeSrchCondConfigVOList.stream().forEach(codeSrchCondConfigVO -> {
+ condtionMap.put(codeSrchCondConfigVO.getFilterField() + codeSrchCondConfigVO.getFilterType(), codeSrchCondConfigVO.getFilterValue());
+ });
+ }
+ if(!CollectionUtils.isEmpty(condtionMap)) {
+ buildSqlwhere = UBCSSqlKeyword.buildSqlwhere(condtionMap);
+ }
+ //浣跨敤浼犲叆鐨勪笟鍔＄被鍨嬫煡璇㈣〃
+ R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referBtmId));
+ if (!listR.isSuccess() || listR.getData().size() == 0) {
+ throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
+ }
+ String referTable = listR.getData().get(0).getTableName();
+ StringBuffer sb = new StringBuffer();
+ sb.append(" select * from ");
+ sb.append(referTable);
+ sb.append(" where 1=1 ");
+ if (StringUtils.isNotBlank(buildSqlwhere)) {
+ sb.append(buildSqlwhere);
+ }
+ List<Map> ListMap = commonsMapper.selectBySql(sb.toString());
+ //String valueField = coderefersecSearchVO.getValueField();
+ String textField = coderefersecSearchVO.getTextField();
+ final int[] num = {0};
+ if (!CollectionUtils.isEmpty(ListMap)) {
+ ListMap.stream().forEach(map -> {
+ num[0]++;
+ String id = Func.isNull(map.getOrDefault("OID".toUpperCase(Locale.ROOT), "")) ? "" : map.getOrDefault("OID".toUpperCase(Locale.ROOT), "").toString();
+ String value = Func.isNull(map.getOrDefault(valueField.toUpperCase(Locale.ROOT), "")) ? "" : map.getOrDefault(valueField.toUpperCase(Locale.ROOT), "").toString();
+ String text = Func.isNull(map.getOrDefault(textField.toUpperCase(Locale.ROOT), "")) ? "" : map.getOrDefault(textField.toUpperCase(Locale.ROOT), "").toString();
+ String description = Func.isNull(map.getOrDefault("description".toUpperCase(Locale.ROOT), "")) ? "" : map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString();
+ CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, id, "", description);
+ codeSectionValueVOList.add(sectionValueVO);
+ });
+ }
+ }else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.TREE.getValue())) {//鏍戝舰
+ //浣跨敤浼犲叆鐨勪笟鍔＄被鍨嬫煡璇㈣〃
+ R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referBtmId));
+ if (!listR.isSuccess() || listR.getData().size() == 0) {
+ throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
+ }
+ String referTable = listR.getData().get(0).getTableName();
+
+ String oidFieldName = StringUtils.isNotBlank(coderefersecSearchVO.getParentUsedField())?coderefersecSearchVO.getParentUsedField():coderefersecSearchVO.getValueField();
+ String parentValue =coderefersecSearchVO.getParentValue();
+ String parentFieldName =StringUtils.isBlank(coderefersecSearchVO.getParentFieldName())?"":coderefersecSearchVO.getParentFieldName();
+ List<CodeSrchCondConfigVO> codeSrchCondConfigVOList = coderefersecSearchVO.getCodeSrchCondConfigVOS();
+ List<CodeShowFieldConfigVO> codeShowFieldConfigVOS=coderefersecSearchVO.getCodeShowFieldConfigVOS();
+ if (!CollectionUtils.isEmpty(codeSrchCondConfigVOList)) {
+ codeSrchCondConfigVOList.stream().forEach(codeSrchCondConfigVO -> {
+ condtionMap.put(codeSrchCondConfigVO.getFilterField() + codeSrchCondConfigVO.getFilterType(), codeSrchCondConfigVO.getFilterValue());
+ });
+ }
+ if(!CollectionUtils.isEmpty(condtionMap)) {
+ buildSqlwhere = UBCSSqlKeyword.buildSqlwhere(condtionMap);
+ }
+ //if("all".equals(coderefersecSearchVO.getLoadType())) {
+ String parentOidSql = "";
+ if(StringUtils.isNotBlank(parentValue)){
+ String temp=parentValue;
+ if(temp.startsWith(QueryOptionConstant.IN)){
+ temp = temp.substring((QueryOptionConstant.IN).length()).trim();
+ parentOidSql = " in " + ((temp.startsWith("(") && temp.endsWith(")"))?temp:"(" + temp + ")");
+ }else if(temp.startsWith(QueryOptionConstant.NOTIN)){
+ parentOidSql = " not in " + ((temp.startsWith("(") && temp.endsWith(")"))?temp:"(" + temp + ")");
+ }else if(temp.startsWith(QueryOptionConstant.NOTEQUAL)){
+ temp = temp.substring((QueryOptionConstant.NOTEQUAL).length()).trim();
+ parentOidSql = QueryOptionConstant.NOTEQUAL + " " + ((temp.startsWith("'") && temp.endsWith("'"))?temp:"'" + temp + "'");
+ }else if(temp.startsWith(QueryOptionConstant.MORETHAN)){
+ temp = temp.substring((QueryOptionConstant.MORETHAN).length()).trim();
+ parentOidSql = QueryOptionConstant.MORETHAN + " " + ((temp.startsWith("'") && temp.endsWith("'"))?temp:"'" + temp + "'");
+ }else if(temp.startsWith(QueryOptionConstant.MORE)){
+ temp = temp.substring((QueryOptionConstant.MORE).length()).trim();
+ parentOidSql = QueryOptionConstant.MORE + " " + ((temp.startsWith("'") && temp.endsWith("'"))?temp:"'" + temp + "'");
+ }else if(temp.startsWith(QueryOptionConstant.LESSTHAN)){
+ temp = temp.substring((QueryOptionConstant.LESSTHAN).length()).trim();
+ parentOidSql = QueryOptionConstant.LESSTHAN + " " + ((temp.startsWith("'") && temp.endsWith("'"))?temp:"'" + temp + "'");
+ }else if(temp.startsWith(QueryOptionConstant.LESS)){
+ temp = temp.substring((QueryOptionConstant.LESS).length()).trim();
+ parentOidSql = QueryOptionConstant.LESS + " " + ((temp.startsWith("'") && temp.endsWith("'"))?temp:"'" + temp + "'");
+ }else if (temp.startsWith(QueryOptionConstant.ISNOTNULL)) {
+ parentOidSql = " is not null";
+ } else if (temp.startsWith(QueryOptionConstant.ISNULL)) {
+ parentOidSql = " is null";
+ } else if(temp.contains("*")){
+ parentOidSql = " like " + ((temp.startsWith("'") && temp.endsWith("'"))?temp:"'" + temp + "'").replace("*","%");
+ }else {
+ parentOidSql = " = " + ((temp.startsWith("'") && temp.endsWith("'"))?temp:"'" + temp + "'");
+ }
+ }
+ //鏌ヨ鍏ㄩ儴鐨勪俊鎭�
+ buildSqlwhere+= " and oid in (select oid from " +referTable + " START WITH " + coderefersecSearchVO.getParentFieldName() + " "+
+ parentOidSql +
+ " CONNECT BY PRIOR " + oidFieldName + " = " + parentFieldName + ")";
+ StringBuffer sb = new StringBuffer();
+ sb.append(" select * from ");
+ sb.append(referTable);
+ sb.append(" where 1=1 ");
+ if (StringUtils.isNotBlank(buildSqlwhere)) {
+ sb.append(buildSqlwhere);
+ }
+ List<Map> ListMap = commonsMapper.selectBySql(sb.toString());
+ String textField = coderefersecSearchVO.getTextField();
+ final int[] num = {0};
+ if (!CollectionUtils.isEmpty(ListMap)) {
+ ListMap.stream().forEach(map -> {
+ num[0]++;
+ String id =Func.isNull(map.getOrDefault("OID".toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault("OID".toUpperCase(Locale.ROOT), "").toString();
+ String value =Func.isNull(map.getOrDefault(valueField.toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault(valueField.toUpperCase(Locale.ROOT), "").toString();
+ String text =Func.isNull(map.getOrDefault(textField.toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault(textField.toUpperCase(Locale.ROOT), "").toString();
+ String description =Func.isNull(map.getOrDefault("description".toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString();
+ String pid =Func.isNull(map.getOrDefault(parentFieldName.toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault(parentFieldName.toUpperCase(Locale.ROOT), "").toString();
+ CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, text, pid, description);
+ codeSectionValueVOList.add(sectionValueVO);
+ });
+ }
+ }
+ }
+ if(!CollectionUtils.isEmpty(codeSectionValueVOList)){
+ Map<String, CodeSectionValueVO> codeSectionValueVOMap = codeSectionValueVOList.stream().collect(Collectors.toMap(s -> s.getValue(), t -> t, (o1, o2) -> o2));
+ if(!codeSectionValueVOMap.containsKey(sectypeValue)){
+ message="浼犲叆鐨勭紪鐮佽鍒欑爜娈�:銆�"+name+"銆戜负"+CODE_REFER_SEC.getText()+",鍏跺搴旂殑鍊笺��"+sectypeValue+"銆戯紝鍦ㄧ紪鐮佺郴缁熶笉瀛樺湪";
+ errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
+ }
+ }else{
+ message="浼犲叆鐨勭紪鐮佽鍒欑爜娈�:銆�"+name+"銆戜负"+CODE_REFER_SEC.getText()+",鍏跺搴旂殑鍊笺��"+sectypeValue+"銆戯紝鍦ㄧ紪鐮佺郴缁熶笉瀛樺湪";
+ errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
+ }
}
- if(StringUtils.isBlank(sectypeValue)&&!newSecName.equals(secName)){
- message="浼犲叆鐨勫垎绫荤爜娈碉細銆�" + name + " 銆戠殑鍊间笉鍏佽涓虹┖";
+
+ if(StringUtils.isBlank(sectypeValue)&&!name.equals(secName)){
+ message="浼犲叆鐨勭爜娈碉細銆�" + name + " 銆戠殑鍊间笉鍏佽涓虹┖";
errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
}
CodeOrderSecDTO.setSecValue(sectypeValue);
@@ -2475,6 +2672,7 @@
} catch (Throwable e) {
objerrorCode = "1";
e.printStackTrace();
+ log.error("闆嗘垚绯荤粺灞炴�ч厤缃枃浠惰鍙栧け璐ワ細",e);
throw new Throwable("闆嗘垚绯荤粺鏍囪瘑涓猴細銆�" + systemId + "銆戯紝鍒嗙被搴撲负:銆�" + libray + "銆戠殑闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
}
// String path = stringStringMap.get(systemId);
@@ -2545,6 +2743,7 @@
String dataValue = sourceKeyValueMap.get(sourceKey);
if (attrMapConfigMap.containsKey(sourceKey)) {
String targetKey = attrMapConfigMap.get(sourceKey);
+ log.info("xxxxx灞炴�ф槧灏勫��:sourceKey銆�"+sourceKey+"銆戔�斺�斻��+targetKey---銆�"+targetKey+":"+dataValue);
keyValueMap.put(targetKey, StringUtils.isBlank(dataValue)?"":dataValue);
}
});
@@ -2570,7 +2769,8 @@
dataObjectVO.setRowData(rowDataList);
}catch (Throwable e){
objerrorCode="1";
- throw new Throwable("缁勭粐鏁版嵁鏄犲皠鍊煎け璐�");
+ log.error("缁勭粐灞炴�ф槧灏勫�煎け璐ワ細",e);
+ throw new Throwable("缁勭粐灞炴�ф槧灏勫�煎け璐�");
}
}
@@ -2601,6 +2801,7 @@
} catch (Throwable e) {
objerrorCode = "1";
e.printStackTrace();
+ log.error("闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐ワ細",e);
throw new Throwable("闆嗘垚绯荤粺鏍囪瘑涓猴細銆�" + systemId + "銆戯紝鍒嗙被搴撲负:銆�" + libray + "銆戠殑闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
}
// String path = stringStringMap.get(systemId);
@@ -2676,6 +2877,7 @@
String dataValue = sourceKeyValueMap.get(sourceKey);
if (attrMapConfigMap.containsKey(sourceKey)) {
String targetKey = attrMapConfigMap.get(sourceKey);
+ log.info("xxxxx灞炴�ф槧灏勫��:sourceKey銆�"+sourceKey+"銆戔�斺�斻��+targetKey---銆�"+targetKey+":"+dataValue);
keyValueMap.put(targetKey, StringUtils.isBlank(dataValue)?"":dataValue);
}
});
@@ -2701,7 +2903,8 @@
dataObjectVO.setRowData(rowDataList);
}catch (Throwable e){
objerrorCode="1";
- throw new Throwable("缁勭粐鏁版嵁鏄犲皠鍊煎け璐�");
+ log.error("缁勭粐灞炴�ф槧灏勫�煎け璐ワ細",e);
+ throw new Throwable("缁勭粐灞炴�ф槧灏勫�煎け璐�");
}
}
--
Gitblit v1.9.3