From 4494a005613728c9dc22d018bca42ef5d3ebcf69 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期二, 14 一月 2025 20:41:47 +0800
Subject: [PATCH] 产品型号集成，类型转换，人员组织加日志，申请接口引用码段值校验
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 248 ++++++++++++++++++++++++++----------------------
1 files changed, 134 insertions(+), 114 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 60636f9..53fa337 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,8 @@
private IDockingLogeService dockingLogeService;
@Override
- public IPage<DockingSystemConfigVO> page(DockingSystemConfig DockingSystemConfig, Query query) {
-
- IPage<DockingSystemConfig> pages = page(Condition.getPage(query), Condition.getQueryWrapper(DockingSystemConfig));
+ public IPage<DockingSystemConfigVO> page(Map<String,String>codtionMap, Query query) {
+ 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()));
@@ -151,7 +151,7 @@
// dockingSystemConfig.setSourceSysName("");
//dockingSystemConfig.setTargetSysName("");
});
- return DockingSystemConfigWrapper.build().pageVO(pages);
+ return DockingSystemConfigWrapper.build().pageVO(pages);
}
/**
@@ -161,51 +161,58 @@
*/
@Transactional(rollbackFor = Exception.class)
@Override
- public boolean addSave(DockingSystemConfigDTO dockingSystemConfigDTO) {
+ public boolean addSave(DockingSystemConfigDTO dockingSystemConfigDTO) throws Throwable {
log.info(" 澧炲姞绯荤粺闆嗘垚鐨勬帴鍙ｇ鐞嗕俊鎭�:"+dockingSystemConfigDTO.toString());
VciBaseUtil.alertNotNull(dockingSystemConfigDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
checkColumnNotNull(dockingSystemConfigDTO);
- String sourcesystemoid = dockingSystemConfigDTO.getSourceSystemOid();
- DockingSystem dockingSystem = dockingSystemMapper.selectById(sourcesystemoid);
- dockingSystemConfigDTO.setSysBaseOid(sourcesystemoid);
- dockingSystemConfigDTO.setSysBaseId(dockingSystem.getId());
- dockingSystemConfigDTO.setSysBaseName(dockingSystem.getName());
- dockingSystemConfigDTO.setUsedFlag("true");//璁剧疆榛樿鍚敤鐘舵��
-
- //灏咲TO杞崲涓篋O
- DockingSystemConfig dockingSystemConfig = new DockingSystemConfig();
- revisionModelUtil.copyFromDTOIgnore(dockingSystemConfigDTO,dockingSystemConfig);
-
-
- List<DockingSysIntParamDTO> sysIntParamDTOList= dockingSystemConfigDTO.getSysIntParamDTOS();
- List<DockingSysIntParam> sysIntParamList=new ArrayList<>();
- if(!CollectionUtils.isEmpty(sysIntParamDTOList)) {
- sysIntParamDTOList.stream().forEach(sysIntParamDTO -> {
- DockingSysIntParam sysIntParamDO = new DockingSysIntParam();
- sysIntParamDTO.setInfoOid(dockingSystemConfigDTO.getOid());
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntParamDTO, sysIntParamDO);
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(sysIntParamDO, MdmBtmTypeConstant.SYS_INT_PARAMTERY);
- sysIntParamList.add(sysIntParamDO);
- });
+ String systemOid ="";
+ if(dockingSystemConfigDTO.getDataFlowType().equals(SysIntegrationDataFlowTypeEnum.PUSH.getValue())) {
+ systemOid = dockingSystemConfigDTO.getTargetSystemOid();
+ }else{
+ systemOid = dockingSystemConfigDTO.getSourceSystemOid();
}
- List<DockingSysIntHeaderDTO> sysIntHeaderDTOs= dockingSystemConfigDTO.getSysIntHeaderDTOS();
- List<DockingSysIntHeader> sysIntHeaderList = new ArrayList<>();
- if(!CollectionUtils.isEmpty(sysIntHeaderDTOs)) {
- sysIntHeaderDTOs.stream().forEach(sysIntHeaderDTO -> {
- DockingSysIntHeader dockingSysIntHeader = new DockingSysIntHeader();
- sysIntHeaderDTO.setInfoOid(dockingSystemConfigDTO.getOid());
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntHeaderDTO, dockingSysIntHeader);
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSysIntHeader,MdmBtmTypeConstant.SYS_INT_HEADER);
- sysIntHeaderList.add(dockingSysIntHeader);
- });
- }
- dockingSysIntParamService.saveBatch(sysIntParamList);
- dockingSysIntHeaderService.saveBatch(sysIntHeaderList);
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSystemConfig,MdmBtmTypeConstant.SYS_INT_INFO);
- dockingSystemConfigMapper.insert(dockingSystemConfig);
+ DockingSystem dockingSystem = dockingSystemMapper.selectById(systemOid);
+ if(dockingSystem!=null) {
+ dockingSystemConfigDTO.setSysBaseOid(systemOid);
+ dockingSystemConfigDTO.setSysBaseId(dockingSystem.getId());
+ dockingSystemConfigDTO.setSysBaseName(dockingSystem.getName());
+ dockingSystemConfigDTO.setUsedFlag("true");//璁剧疆榛樿鍚敤鐘舵��
+ //灏咲TO杞崲涓篋O
+ DockingSystemConfig dockingSystemConfig = new DockingSystemConfig();
+ revisionModelUtil.copyFromDTOIgnore(dockingSystemConfigDTO,dockingSystemConfig);
+
+
+ List<DockingSysIntParamDTO> sysIntParamDTOList= dockingSystemConfigDTO.getSysIntParamDTOS();
+ List<DockingSysIntParam> sysIntParamList=new ArrayList<>();
+ if(!CollectionUtils.isEmpty(sysIntParamDTOList)) {
+ sysIntParamDTOList.stream().forEach(sysIntParamDTO -> {
+ DockingSysIntParam sysIntParamDO = new DockingSysIntParam();
+ sysIntParamDTO.setInfoOid(dockingSystemConfigDTO.getOid());
+ BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntParamDTO, sysIntParamDO);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(sysIntParamDO, MdmBtmTypeConstant.SYS_INT_PARAMTERY);
+ sysIntParamList.add(sysIntParamDO);
+ });
+ }
+ List<DockingSysIntHeaderDTO> sysIntHeaderDTOs= dockingSystemConfigDTO.getSysIntHeaderDTOS();
+ List<DockingSysIntHeader> sysIntHeaderList = new ArrayList<>();
+ if(!CollectionUtils.isEmpty(sysIntHeaderDTOs)) {
+ sysIntHeaderDTOs.stream().forEach(sysIntHeaderDTO -> {
+ DockingSysIntHeader dockingSysIntHeader = new DockingSysIntHeader();
+ sysIntHeaderDTO.setInfoOid(dockingSystemConfigDTO.getOid());
+ BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntHeaderDTO, dockingSysIntHeader);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSysIntHeader,MdmBtmTypeConstant.SYS_INT_HEADER);
+ sysIntHeaderList.add(dockingSysIntHeader);
+ });
+ }
+ dockingSysIntParamService.saveBatch(sysIntParamList);
+ dockingSysIntHeaderService.saveBatch(sysIntHeaderList);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSystemConfig,MdmBtmTypeConstant.SYS_INT_INFO);
+ dockingSystemConfigMapper.insert(dockingSystemConfig);
+ }else{
+ throw new Throwable("鏍规嵁閫夋嫨鐨勯泦鎴愮郴缁熸湭鏍￠獙鍒扮郴缁熶腑瀛樺湪姝ら泦鎴愮郴缁燂紝璇锋牳瀵癸紒");
+ }
return true;
-
}
/**
@@ -215,76 +222,85 @@
*/
@Transactional(rollbackFor = Exception.class)
@Override
- public boolean editSave(DockingSystemConfigDTO dockingSystemConfigDTO) {
+ public boolean editSave(DockingSystemConfigDTO dockingSystemConfigDTO) throws Throwable {
VciBaseUtil.alertNotNull(dockingSystemConfigDTO,"鏁版嵁瀵硅薄",dockingSystemConfigDTO.getOid(),"绯荤粺闆嗘垚鍩虹淇℃伅涓婚敭");
- String sourcesystemoid = dockingSystemConfigDTO.getSourceSystemOid();//.getSourcesystemoid();
- DockingSystem dockingSystem = dockingSystemMapper.selectById(sourcesystemoid);
- dockingSystemConfigDTO.setSysBaseOid(sourcesystemoid);
- dockingSystemConfigDTO.setSysBaseId(dockingSystem.getId());
- dockingSystemConfigDTO.setBtmname(dockingSystem.getName());
- //灏咲TO杞崲涓篋O
- DockingSystemConfig dockingSystemConfig = dockingSystemConfigMapper.selectById(dockingSystemConfigDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(dockingSystemConfigDTO,dockingSystemConfig);
- String sysInfoOid=dockingSystemConfigDTO.getOid();
- List<DockingSysIntParamDTO> dockingSysIntParamDTOS= dockingSystemConfigDTO.getSysIntParamDTOS();
- List<DockingSysIntParam> dockingSysIntParamList=new ArrayList<>();
- if(!CollectionUtils.isEmpty(dockingSysIntParamDTOS)) {
- dockingSysIntParamDTOS.stream().forEach(dockingSysIntParamDTO -> {
- DockingSysIntParam dockingSysIntParam = new DockingSysIntParam();
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingSysIntParamDTO, dockingSysIntParam);
- dockingSysIntParamList.add(dockingSysIntParam);
- });
+ String systemOid ="";
+ if(dockingSystemConfigDTO.getDataFlowType().equals(SysIntegrationDataFlowTypeEnum.PUSH.getValue())) {
+ systemOid = dockingSystemConfigDTO.getTargetSystemOid();
+ }else{
+ systemOid = dockingSystemConfigDTO.getSourceSystemOid();
}
- List<DockingSysIntHeaderDTO> dockingSysIntHeaderDTOS= dockingSystemConfigDTO.getSysIntHeaderDTOS();
- List<DockingSysIntHeader> dockingSysIntHeaderList = new ArrayList<>();
- if(!CollectionUtils.isEmpty(dockingSysIntHeaderDTOS)) {
- dockingSysIntHeaderDTOS.stream().forEach(dockingSysIntHeaderDTO -> {
- DockingSysIntHeader dockingSysIntHeader = new DockingSysIntHeader();
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingSysIntHeaderDTO, dockingSysIntHeader);
- dockingSysIntHeaderList.add(dockingSysIntHeader);
- });
- }
+ DockingSystem dockingSystem = dockingSystemMapper.selectById(systemOid);
+ if(dockingSystem!=null) {
+ dockingSystemConfigDTO.setSysBaseOid(dockingSystem.getOid());
+ dockingSystemConfigDTO.setSysBaseId(dockingSystem.getId());
+ dockingSystemConfigDTO.setSysBaseName(dockingSystem.getName());
+ //灏咲TO杞崲涓篋O
+ DockingSystemConfig dockingSystemConfig = dockingSystemConfigMapper.selectById(dockingSystemConfigDTO.getOid());
+ revisionModelUtil.copyFromDTOIgnore(dockingSystemConfigDTO, dockingSystemConfig);
+ String sysInfoOid = dockingSystemConfigDTO.getOid();
+ List<DockingSysIntParamDTO> dockingSysIntParamDTOS = dockingSystemConfigDTO.getSysIntParamDTOS();
+ List<DockingSysIntParam> dockingSysIntParamList = new ArrayList<>();
+ if (!CollectionUtils.isEmpty(dockingSysIntParamDTOS)) {
+ dockingSysIntParamDTOS.stream().forEach(dockingSysIntParamDTO -> {
+ DockingSysIntParam dockingSysIntParam = new DockingSysIntParam();
+ BeanUtilForVCI.copyPropertiesIgnoreCase(dockingSysIntParamDTO, dockingSysIntParam);
+ dockingSysIntParamList.add(dockingSysIntParam);
+ });
+ }
+ List<DockingSysIntHeaderDTO> dockingSysIntHeaderDTOS = dockingSystemConfigDTO.getSysIntHeaderDTOS();
+ List<DockingSysIntHeader> dockingSysIntHeaderList = new ArrayList<>();
+ if (!CollectionUtils.isEmpty(dockingSysIntHeaderDTOS)) {
+ dockingSysIntHeaderDTOS.stream().forEach(dockingSysIntHeaderDTO -> {
+ DockingSysIntHeader dockingSysIntHeader = new DockingSysIntHeader();
+ BeanUtilForVCI.copyPropertiesIgnoreCase(dockingSysIntHeaderDTO, dockingSysIntHeader);
+ dockingSysIntHeaderList.add(dockingSysIntHeader);
+ });
+ }
- //鎵归噺澶勭悊淇濆瓨header瀵硅薄
- if(!CollectionUtils.isEmpty(dockingSysIntHeaderList)) {
- List<String> idList=new ArrayList<>();
- List<DockingSysIntHeader> headers_old =this.dockingSysIntHeaderService.list(Wrappers.<DockingSysIntHeader>query().lambda().eq(DockingSysIntHeader::getInfoOid,sysInfoOid));;
- for (DockingSysIntHeader sysIntHeader:headers_old){
- sysIntHeader.setUsedFlag(FLAG_FAIL);
- idList.add(sysIntHeader.getOid());
- }
- if(idList.size()!=0){
- boolean res=dockingSysIntHeaderService.removeBatchByIds(idList);
- }
- //鍐嶆柊澧瀐eaders
- for(DockingSysIntHeader sysIntHeader:dockingSysIntHeaderList){
- sysIntHeader.setUsedFlag(FLAG_TRUE);
- sysIntHeader.setInfoOid(dockingSystemConfig.getOid());
+ //鎵归噺澶勭悊淇濆瓨header瀵硅薄
+ if (!CollectionUtils.isEmpty(dockingSysIntHeaderList)) {
+ List<String> idList = new ArrayList<>();
+ List<DockingSysIntHeader> headers_old = this.dockingSysIntHeaderService.list(Wrappers.<DockingSysIntHeader>query().lambda().eq(DockingSysIntHeader::getInfoOid, sysInfoOid));
+ ;
+ for (DockingSysIntHeader sysIntHeader : headers_old) {
+ sysIntHeader.setUsedFlag(FLAG_FAIL);
+ idList.add(sysIntHeader.getOid());
+ }
+ if (idList.size() != 0) {
+ boolean res = dockingSysIntHeaderService.removeBatchByIds(idList);
+ }
+ //鍐嶆柊澧瀐eaders
+ for (DockingSysIntHeader sysIntHeader : dockingSysIntHeaderList) {
+ sysIntHeader.setUsedFlag(FLAG_TRUE);
+ sysIntHeader.setInfoOid(dockingSystemConfig.getOid());
+ }
+ boolean res = dockingSysIntHeaderService.saveBatch(dockingSysIntHeaderList);
}
- boolean res= dockingSysIntHeaderService.saveBatch(dockingSysIntHeaderList);
+ //鎵归噺澶勭悊淇濆瓨Param瀵硅薄
+ if (!CollectionUtils.isEmpty(dockingSysIntParamList)) {
+ //鍏堝垹闄arams_old
+ List<String> idList = new ArrayList<>();
+ List<DockingSysIntParam> params_old = this.dockingSysIntParamService.list(Wrappers.<DockingSysIntParam>query().lambda().eq(DockingSysIntParam::getInfoOid, sysInfoOid));
+ for (DockingSysIntParam sysIntParamDO : params_old) {
+ sysIntParamDO.setUsedFlag(FLAG_FAIL);
+ idList.add(sysIntParamDO.getOid());
+ }
+ if (idList.size() != 0) {
+ boolean res = dockingSysIntParamService.removeBatchByIds(idList);
+ }
+ //鍐嶆柊澧瀙arams
+ for (DockingSysIntParam sysIntParamDOi : dockingSysIntParamList) {
+ sysIntParamDOi.setUsedFlag(FLAG_TRUE);
+ sysIntParamDOi.setInfoOid(dockingSystemConfig.getOid());
+ }
+ dockingSysIntParamService.saveBatch(dockingSysIntParamList);
+ }
+ this.dockingSystemConfigMapper.updateById(dockingSystemConfig);
+ }else{
+ throw new Throwable("鏍规嵁閫夋嫨鐨勯泦鎴愮郴缁熸湭鏍￠獙鍒扮郴缁熶腑瀛樺湪姝ら泦鎴愮郴缁燂紝璇锋牳瀵癸紒");
}
- //鎵归噺澶勭悊淇濆瓨Param瀵硅薄
- if(!CollectionUtils.isEmpty(dockingSysIntParamList)) {
- //鍏堝垹闄arams_old
- List<String> idList=new ArrayList<>();
- List<DockingSysIntParam> params_old =this.dockingSysIntParamService.list(Wrappers.<DockingSysIntParam>query().lambda().eq(DockingSysIntParam::getInfoOid,sysInfoOid));
- for (DockingSysIntParam sysIntParamDO:params_old){
- sysIntParamDO.setUsedFlag(FLAG_FAIL);
- idList.add(sysIntParamDO.getOid());
- }
- if(idList.size()!=0){
- boolean res= dockingSysIntParamService.removeBatchByIds(idList);
- }
- //鍐嶆柊澧瀙arams
- for(DockingSysIntParam sysIntParamDOi:dockingSysIntParamList){
- sysIntParamDOi.setUsedFlag(FLAG_TRUE);
- sysIntParamDOi.setInfoOid(dockingSystemConfig.getOid());
- }
- dockingSysIntParamService.saveBatch(dockingSysIntParamList);
- }
- this.dockingSystemConfigMapper.updateById(dockingSystemConfig);
- //return changeoDckingSystemEntityVOs(dockingSystemConfig,dockingSysIntHeaderList,dockingSysIntParamList);
return true;
}
/***
@@ -360,7 +376,10 @@
@Override
public boolean deleteDataById(String oids) {
- return false;
+ VciBaseUtil.alertNotNull(oids, "鏁版嵁涓婚敭涓虹┖");
+ List<String> oidList=VciBaseUtil.str2List(oids);
+ int i=dockingSystemConfigMapper.deleteBatchIds(oidList);
+ return i>0?true:false;
}
/**
@@ -525,7 +544,7 @@
* @param dockingSystemConfigDTO
* @throws Throwable
*/
- private void callInterface(String sendString , DockingSystemConfigDTO dockingSystemConfigDTO) throws Throwable{
+ private void callInterface(String sendString , DockingSystemConfigDTO dockingSystemConfigDTO) throws Throwable{
String paramString = "";
String backString = "";
@@ -551,7 +570,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);
@@ -559,7 +578,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);
@@ -589,7 +608,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<>();
@@ -625,7 +644,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;
@@ -651,6 +670,7 @@
dockingLog.setClassifyName(dockingSystemConfigDTO.getClassifyName());
dockingLog.setId(dockingSystemConfigDTO.getId());
dockingLog.setUniqueCode("");
+ dockingLog.setCreateTime(new Date());
dockingLog.setInterfaceStatus(isSend?"true":"false");
dockingLog.setParamString(paramString);
dockingLog.setType(DATA_LOGE_OUT);
--
Gitblit v1.9.3