From a36a5865814b86d999b6f865e5c36a47c92acaeb Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 30 八月 2023 17:20:00 +0800 Subject: [PATCH] 文件服务修改 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 90 +++++++++++++++++++++++++-------------------- 1 files changed, 50 insertions(+), 40 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..21c60ed 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,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; - } /** @@ -360,7 +367,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; } /** -- Gitblit v1.9.3