From b40cd8c94978d43f9d13ba9ee93a4164b68a8165 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 05 十二月 2023 16:11:51 +0800
Subject: [PATCH] 赋默认值工具类修改，根据多线程流情况修改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
index 9c18cdd..0d4ee95 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
@@ -25,7 +25,7 @@
import com.vci.ubcs.code.enumpack.*;
import com.vci.ubcs.code.mapper.*;
import com.vci.ubcs.code.service.*;
-import com.vci.ubcs.code.util.HttpUtils;
+import com.vci.ubcs.starter.util.HttpUtils;
import com.vci.ubcs.code.util.WsErpClientUtil;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.wrapper.DockingSysIntHeaderWrapper;
@@ -35,6 +35,7 @@
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
+import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
@@ -135,9 +136,9 @@
private IDockingLogeService dockingLogeService;
@Override
- public IPage<DockingSystemConfigVO> page(DockingSystemConfig DockingSystemConfig, Query query) {
+ public IPage<DockingSystemConfigVO> page(Map<String,String>codtionMap, Query query) {
- IPage<DockingSystemConfig> pages = page(Condition.getPage(query), Condition.getQueryWrapper(DockingSystemConfig));
+ IPage<DockingSystemConfig> pages = page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(codtionMap));
List<DockingSystemConfig> dockingSystemConfigList= pages.getRecords();
dockingSystemConfigList.stream().forEach(dockingSystemConfig -> {
dockingSystemConfig.setDataFlowTypeText(SysIntegrationDataFlowTypeEnum.getTextByValue(dockingSystemConfig.getDataFlowType()));
@@ -190,7 +191,7 @@
DockingSysIntParam sysIntParamDO = new DockingSysIntParam();
sysIntParamDTO.setInfoOid(dockingSystemConfigDTO.getOid());
BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntParamDTO, sysIntParamDO);
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(sysIntParamDO, MdmBtmTypeConstant.SYS_INT_PARAMTERY);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(sysIntParamDO, MdmBtmTypeConstant.SYS_INT_PARAMTERY,null);
sysIntParamList.add(sysIntParamDO);
});
}
@@ -201,13 +202,13 @@
DockingSysIntHeader dockingSysIntHeader = new DockingSysIntHeader();
sysIntHeaderDTO.setInfoOid(dockingSystemConfigDTO.getOid());
BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntHeaderDTO, dockingSysIntHeader);
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSysIntHeader,MdmBtmTypeConstant.SYS_INT_HEADER);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSysIntHeader,MdmBtmTypeConstant.SYS_INT_HEADER,null);
sysIntHeaderList.add(dockingSysIntHeader);
});
}
dockingSysIntParamService.saveBatch(sysIntParamList);
dockingSysIntHeaderService.saveBatch(sysIntHeaderList);
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSystemConfig,MdmBtmTypeConstant.SYS_INT_INFO);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSystemConfig,MdmBtmTypeConstant.SYS_INT_INFO,null);
dockingSystemConfigMapper.insert(dockingSystemConfig);
}else{
throw new Throwable("鏍规嵁閫夋嫨鐨勯泦鎴愮郴缁熸湭鏍￠獙鍒扮郴缁熶腑瀛樺湪姝ら泦鎴愮郴缁燂紝璇锋牳瀵癸紒");
@@ -570,7 +571,7 @@
String sendurl = url + "?" + DATA_PARAM_NAME + "=" + sendString;
//鎷兼帴param
for (DockingSysIntParamDTO sysIntParamVO : sysIntParamVOList) {
- sendurl = sendurl + "&" + sysIntParamVO.getParamkey() + "=" + sysIntParamVO.getParamvalue();
+ sendurl = sendurl + "&" + sysIntParamVO.getParamKey() + "=" + sysIntParamVO.getParamValue();
}
paramString = sendurl;
backString = HttpUtils.get(sendurl);
@@ -578,7 +579,7 @@
MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
if(!CollectionUtils.isEmpty(sysIntParamVOList)) {
for (DockingSysIntParamDTO sysIntParamVO : sysIntParamVOList) {
- params.add(sysIntParamVO.getParamkey(), sysIntParamVO.getParamvalue());
+ params.add(sysIntParamVO.getParamKey(), sysIntParamVO.getParamValue());
}
}
params.add(DATA_PARAM_NAME,sendString);
@@ -608,7 +609,7 @@
}else if (type.equals(URLTYPE_WEBSERVICE)) {//webserver璇锋眰
MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
for (DockingSysIntParamDTO sysIntParamVO : sysIntParamVOList) {
- params.add(sysIntParamVO.getParamkey(), sysIntParamVO.getParamvalue());
+ params.add(sysIntParamVO.getParamKey(), sysIntParamVO.getParamValue());
}
paramString = sendString;
MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
@@ -644,7 +645,7 @@
resultNodeObjectDTO.setErroid("1");
resultNodeObjectDTO.setMsg(msg);
resultNodeObjectDTO.setCode(dockingSystemConfigDTO.getClassifyId());
- resultNodeObjectDTO.setOid(dockingSystemConfigDTO.getClassifyOid());
+ resultNodeObjectDTO.setItemid(dockingSystemConfigDTO.getClassifyOid());
resultNodeObjectDTOS.add(resultNodeObjectDTO);
}finally {
boolean isSend = false;
--
Gitblit v1.9.3