From 3bf00deb7fef95521faf778f0e6e9c75215a1329 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 25 八月 2023 10:42:45 +0800
Subject: [PATCH] 统一接口配置保存bug修复
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 74 +++++++++++++++++++------------------
2 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
index 1cee607..6882ada 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
@@ -31,7 +31,7 @@
* @param dockingSystemConfigDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞�
* @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
*/
- boolean addSave(DockingSystemConfigDTO dockingSystemConfigDTO);
+ boolean addSave(DockingSystemConfigDTO dockingSystemConfigDTO) throws Throwable;
/**
* 淇敼 绯荤粺闆嗘垚鐨勬帴鍙ｇ鐞嗕俊鎭�
* @param dockingSystemConfigDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞�
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 c4ace0a..a256faf 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
@@ -161,56 +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 systemOid ="";
- if(dockingSystemConfigDTO.getDataFlowType().equals(SysIntegrationDataFlowTypeEnum.ACCEPT.getValue())) {
+ if(dockingSystemConfigDTO.getDataFlowType().equals(SysIntegrationDataFlowTypeEnum.PUSH.getValue())) {
systemOid = dockingSystemConfigDTO.getTargetSystemOid();
}else{
systemOid = dockingSystemConfigDTO.getSourceSystemOid();
}
DockingSystem dockingSystem = dockingSystemMapper.selectById(systemOid);
- dockingSystemConfigDTO.setSysBaseOid(systemOid);
- dockingSystemConfigDTO.setSysBaseId(dockingSystem.getId());
- dockingSystemConfigDTO.setSysBaseName(dockingSystem.getName());
- dockingSystemConfigDTO.setUsedFlag("true");//璁剧疆榛樿鍚敤鐘舵��
+ 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);
+ //灏咲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<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("鏍规嵁閫夋嫨鐨勯泦鎴愮郴缁熸湭鏍￠獙鍒扮郴缁熶腑瀛樺湪姝ら泦鎴愮郴缁燂紝璇锋牳瀵癸紒");
}
- 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);
-
return true;
-
}
/**
--
Gitblit v1.9.3