From db5ed49b5473b63bf08c4e0c7ffa752ed35a3a95 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 30 八月 2023 18:46:02 +0800
Subject: [PATCH] 关于接口配置管理模块更改/统一接口涉及集团码申请功能需求bug修复
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 137 ++++++++++++++++++++++++---------------------
1 files changed, 73 insertions(+), 64 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 21c60ed..9c18cdd 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
@@ -222,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;
}
/***
--
Gitblit v1.9.3