xiejun
2023-08-25 3bf00deb7fef95521faf778f0e6e9c75215a1329
统一接口配置保存bug修复
已修改2个文件
76 ■■■■ 文件已修改
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java 74 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
@@ -31,7 +31,7 @@
     * @param dockingSystemConfigDTO 系统集成的系统信息数据传输对象
     * @return 执行结果,success为true表示成功,msg是失败的提示信息,obj是添加完成后的显示对象
     */
     boolean addSave(DockingSystemConfigDTO dockingSystemConfigDTO);
     boolean addSave(DockingSystemConfigDTO dockingSystemConfigDTO) throws Throwable;
    /**
     * 修改 系统集成的接口管理信息
     * @param dockingSystemConfigDTO 系统集成的系统信息数据传输对象
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");//设置默认启用状态
        //将DTO转换为DO
        DockingSystemConfig dockingSystemConfig = new DockingSystemConfig();
        revisionModelUtil.copyFromDTOIgnore(dockingSystemConfigDTO,dockingSystemConfig);
            //将DTO转换为DO
            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;
    }
    /**