From 2ee762713f93c6259bb7f1c2f357572d0923ea33 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 25 八月 2023 23:08:18 +0800 Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 100 +++++++++++++++++++++++++++----------------------- 1 files changed, 54 insertions(+), 46 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 de2d4c3..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 @@ -9,7 +9,7 @@ import com.thoughtworks.xstream.io.xml.DomDriver; import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO; import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant; -import com.vci.ubcs.code.constant.MdmBtmTypeConstant; + import com.vci.ubcs.code.dto.DockingSysIntHeaderDTO; import com.vci.ubcs.code.dto.DockingSystemConfigDTO; import com.vci.ubcs.code.dto.DockingSysIntParamDTO; @@ -34,6 +34,7 @@ import com.vci.ubcs.starter.exception.VciBaseException; 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.web.constant.QueryOptionConstant; import com.vci.ubcs.starter.web.pagemodel.PageHelper; import com.vci.ubcs.starter.web.util.BeanUtilForVCI; @@ -95,11 +96,11 @@ */ @Autowired(required = false) private DockingSystemMapper dockingSystemMapper; - /*** - * 浠诲姟鐢熸垚鏈嶅姟 - */ - @Autowired( required = false) - private IDockingTaskService dockingTaskService; +// /*** +// * 浠诲姟鐢熸垚鏈嶅姟 +// */ +// @Resource +// private IDockingTaskService dockingTaskService; /** @@ -160,51 +161,58 @@ */ @Transactional(rollbackFor = Exception.class) @Override - public boolean addSave(DockingSystemConfigDTO dockingSystemConfigDTO) { + public boolean addSave(DockingSystemConfigDTO dockingSystemConfigDTO) throws Throwable { log.info(" 澧炲姞绯荤粺闆嗘垚鐨勬帴鍙g鐞嗕俊鎭�:"+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; - } /** @@ -450,7 +458,7 @@ dockingTaskDO_insert.add(dockingTaskDO); }); } - dockingTaskService.saveBatch(dockingTaskDO_insert); +// dockingTaskService.saveBatch(dockingTaskDO_insert); }catch (Throwable e){ msg="鏁版嵁鎺ㄩ�佸埌瀹氭椂浠诲姟澶辫触!"; log.error("鏁版嵁鎺ㄩ�佸埌瀹氭椂浠诲姟澶辫触!"+e); -- Gitblit v1.9.3