Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
@@ -16,7 +16,7 @@ * @date 2023-05-26 */ @FeignClient( value = "ubcs-code" value = "ubcs-applyjtcodeservice" ) public interface IMdmInterJtClient { String API_PREFIX = "/mdmInterService"; Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java
@@ -148,12 +148,12 @@ /** * 来源系统名称 */ private String sourceSysName; private String sourceSystemName; /** * 来源系统标识 */ private String sourceSysId; private String sourceSystemId; /** * 来源系统主键显示文本 @@ -168,12 +168,12 @@ /** * 目标系统名称 */ private String targetSysName; private String targetSystemName; /** * 目标系统标识 */ private String targetSysId; private String targetSystemId; /** * 目标系统主键显示文本 @@ -284,12 +284,12 @@ ", returnType='" + returnType + '\'' + ", returnTypeText='" + returnTypeText + '\'' + ", sourceSystemOid='" + sourceSystemOid + '\'' + ", sourceSysName='" + sourceSysName + '\'' + ", sourceSysId='" + sourceSysId + '\'' + ", sourceSystemName='" + sourceSystemName + '\'' + ", sourceSystemId='" + sourceSystemId + '\'' + ", sourceSystemOidName='" + sourceSystemOidName + '\'' + ", targetSystemOid='" + targetSystemOid + '\'' + ", targetSysName='" + targetSysName + '\'' + ", targetSysId='" + targetSysId + '\'' + ", targetSystemName='" + targetSystemName + '\'' + ", targetSystemId='" + targetSystemId + '\'' + ", targetSystemOidName='" + targetSystemOidName + '\'' + ", classPath='" + classPath + '\'' + ", dataFlowType='" + dataFlowType + '\'' + @@ -306,7 +306,7 @@ ", classifyName='" + classifyName + '\'' + ", sysIntParamDTOS=" + sysIntParamDTOS + ", sysIntHeaderDTOS=" + sysIntHeaderDTOS + ", isGroupCodeFlag=" + isGroupCodeFlag + ", isGroupCodeFlag='" + isGroupCodeFlag + '\'' + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingData.java
@@ -13,7 +13,7 @@ * 待集成数据 */ @Data @TableName(CodeTableNameConstant.PL_CODE_DOCKINGPADATA) @TableName(CodeTableNameConstant.PL_CODE_DOCKINGDATA) @ApiModel(value = "DockingData", description = "待集成数据") @EqualsAndHashCode(callSuper = true) public class DockingData extends BaseModel { Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
@@ -192,13 +192,15 @@ * 来源系统名称 */ @ApiModelProperty(value = "来源系统名称") private String sourceSysName; @TableField(value = "SOURCESYSNAME") private String sourceSystemName; /** * 来源系统标识 */ @ApiModelProperty(value = "来源系统标识") private String sourceSysId; @TableField(value = "SOURCESYSID") private String sourceSystemId; /** * 来源系统主键显示文本 @@ -217,13 +219,15 @@ * 目标系统名称 */ @ApiModelProperty(value = "目标系统名称") private String targetSysName; @TableField(value = "TARGETSYSNAME") private String targetSystemName; /** * 目标系统标识 */ @ApiModelProperty(value = "目标系统标识") private String targetSysId; @TableField(value = "TARGETSYSID") private String targetSystemId; /** * 目标系统主键显示文本 @@ -348,12 +352,12 @@ ", returnType='" + returnType + '\'' + ", returnTypeText='" + returnTypeText + '\'' + ", sourceSystemOid='" + sourceSystemOid + '\'' + ", sourceSysName='" + sourceSysName + '\'' + ", sourceSysId='" + sourceSysId + '\'' + ", sourceSystemName='" + sourceSystemName + '\'' + ", sourceSystemId='" + sourceSystemId + '\'' + ", sourceSystemOidName='" + sourceSystemOidName + '\'' + ", targetSystemOid='" + targetSystemOid + '\'' + ", targetSysName='" + targetSysName + '\'' + ", targetSysId='" + targetSysId + '\'' + ", targetSystemName='" + targetSystemName + '\'' + ", targetSystemId='" + targetSystemId + '\'' + ", targetSystemOidName='" + targetSystemOidName + '\'' + ", classPath='" + classPath + '\'' + ", dataFlowType='" + dataFlowType + '\'' + @@ -368,7 +372,7 @@ ", pushTypeText='" + pushTypeText + '\'' + ", classifyId='" + classifyId + '\'' + ", classifyName='" + classifyName + '\'' + ", isGroupCodeFlag=" + isGroupCodeFlag + ", isGroupCodeFlag='" + isGroupCodeFlag + '\'' + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingTask.java
@@ -93,7 +93,7 @@ * 发送类型显示文本 */ @ApiModelProperty(value = "发送类型显示文本") @TableField(exist = true) @TableField(exist = false) private String sendTypeText; /** @@ -107,7 +107,7 @@ * 是否发送成功显示文本 */ @ApiModelProperty(value = "是否发送成功显示文本") @TableField(exist = true) @TableField(exist = false) private String sendFlagText;
@@ -142,12 +142,12 @@ /** * 来源系统名称 */ private String sourceSysName; private String sourceSystemName; /** * 来源系统标识 */ private String sourceSysId; private String sourceSystemId; /** * 来源系统主键显示文本 @@ -162,12 +162,12 @@ /** * 目标系统名称 */ private String targetSysName; private String targetSystemName; /** * 目标系统标识 */ private String targetSysId; private String targetSystemId; /** * 目标系统主键显示文本 @@ -445,21 +445,6 @@ this.sourceSystemOid = sourceSystemOid; } public String getSourceSysName() { return sourceSysName; } public void setSourceSysName(String sourceSysName) { this.sourceSysName = sourceSysName; } public String getSourceSysId() { return sourceSysId; } public void setSourceSysId(String sourceSysId) { this.sourceSysId = sourceSysId; } public String getSourceSystemOidName() { return sourceSystemOidName; @@ -477,20 +462,36 @@ this.targetSystemOid = targetSystemOid; } public String getTargetSysName() { return targetSysName; public String getSourceSystemName() { return sourceSystemName; } public void setTargetSysName(String targetSysName) { this.targetSysName = targetSysName; public void setSourceSystemName(String sourceSystemName) { this.sourceSystemName = sourceSystemName; } public String getTargetSysId() { return targetSysId; public String getSourceSystemId() { return sourceSystemId; } public void setTargetSysId(String targetSysId) { this.targetSysId = targetSysId; public void setSourceSystemId(String sourceSystemId) { this.sourceSystemId = sourceSystemId; } public String getTargetSystemName() { return targetSystemName; } public void setTargetSystemName(String targetSystemName) { this.targetSystemName = targetSystemName; } public String getTargetSystemId() { return targetSystemId; } public void setTargetSystemId(String targetSystemId) { this.targetSystemId = targetSystemId; } public String getTargetSystemOidName() { @@ -656,12 +657,12 @@ ", returnType='" + returnType + '\'' + ", returnTypeText='" + returnTypeText + '\'' + ", sourceSystemOid='" + sourceSystemOid + '\'' + ", sourceSysName='" + sourceSysName + '\'' + ", sourceSysId='" + sourceSysId + '\'' + ", sourceSystemName='" + sourceSystemName + '\'' + ", sourceSystemId='" + sourceSystemId + '\'' + ", sourceSystemOidName='" + sourceSystemOidName + '\'' + ", targetSystemOid='" + targetSystemOid + '\'' + ", targetSysName='" + targetSysName + '\'' + ", targetSysId='" + targetSysId + '\'' + ", targetSystemName='" + targetSystemName + '\'' + ", targetSystemId='" + targetSystemId + '\'' + ", targetSystemOidName='" + targetSystemOidName + '\'' + ", classPath='" + classPath + '\'' + ", dataFlowType='" + dataFlowType + '\'' + @@ -676,7 +677,7 @@ ", pushTypeText='" + pushTypeText + '\'' + ", classifyId='" + classifyId + '\'' + ", classifyName='" + classifyName + '\'' + ", isGroupCodeFlag=" + isGroupCodeFlag + ", isGroupCodeFlag='" + isGroupCodeFlag + '\'' + ", sysIntParamVOs=" + sysIntParamVOs + ", sysIntHeaderVOs=" + sysIntHeaderVOs + '}'; Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/constant/CodeTableNameConstant.java
@@ -134,7 +134,7 @@ /*** * 待集成数据 */ public static final String PL_CODE_DOCKINGPADATA = "PL_CODE_DOCKINGPADATA"; public static final String PL_CODE_DOCKINGDATA = "PL_CODE_DOCKINGDATA"; /*** * 定时分发任务对象 */ Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -126,7 +126,7 @@ boolean res = dockingSystemConfigService.addSave(systemConfigDTO); return R.success("保存成功!"); }catch (Throwable e){ return R.fail("保存失败!"); return R.fail("保存失败!"+e.getMessage()); } }
@@ -37,7 +37,7 @@ * @param dockingSystemConfigDTO 系统集成的系统信息数据传输对象 * @return 执行结果，success为true表示成功，msg是失败的提示信息，obj是添加完成后的显示对象 */ boolean editSave(DockingSystemConfigDTO dockingSystemConfigDTO); boolean editSave(DockingSystemConfigDTO dockingSystemConfigDTO) throws Throwable; /*** * 更新接口配置信息状态 @@ -49,7 +49,7 @@ /*** * 手动同步接口，只有推送的才会 * @param dockingSystemConfig * @param dockingSystemConfigDTO * @return * @throws VciBaseException */ Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemService.java
@@ -4,7 +4,6 @@ import com.vci.ubcs.code.dto.DockingSystemDTO; import com.vci.ubcs.code.entity.DockingSystem; import com.vci.ubcs.code.vo.pagemodel.DockingSystemVO; import org.springblade.core.tool.api.R; /*** * 系统接口管理-集成系统服务 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -21,6 +21,7 @@ import com.vci.ubcs.code.dto.datapush.result.ResultNodeDataDTO; import com.vci.ubcs.code.dto.datapush.result.ResultNodeObjectDTO; import com.vci.ubcs.code.entity.*; import com.vci.ubcs.code.enumpack.SysIntegrationDataFlowTypeEnum; import com.vci.ubcs.code.service.*; import com.vci.ubcs.code.util.HttpUtils; import com.vci.ubcs.code.util.WsErpClientUtil; @@ -158,7 +159,7 @@ List<DockingSystemConfig> dockingSystemConfigList = dockingSystemConfigService.list( Wrappers.<DockingSystemConfig>query().lambda().eq(DockingSystemConfig::getUsedFlag,"true") .eq(DockingSystemConfig::getPushType,type==2?"2":"1"));//2是代表分类推送，1是代表数据推送 .eq(DockingSystemConfig::getPushType,type==2?"2":"1").eq(DockingSystemConfig::getDataFlowType, SysIntegrationDataFlowTypeEnum.PUSH.getValue()));//2是代表分类推送，1是代表数据推送 if(CollectionUtils.isEmpty(dockingSystemConfigList)){ String title=type==2?"分类推送":"数据推送"; @@ -331,6 +332,7 @@ String classifyoid = dockingTask.getClassifyOid(); //查询要推送的数据 String btmoid = dockingTask.getBtmOid();//数据btmid String code=dockingTask.getId();; //表示是主数据 CodeClassifyTemplateVO codeClassifyTemplateVO = mdmEngineServiceI.getUsedTemplateByClassifyOid(classifyoid); R<List<Map<String, String>>> r = mdmEngineServiceI.getDataByOid(btmoid, codeClassifyTemplateVO.getOid()); @@ -356,12 +358,18 @@ nodeProDTOS.add(nodeProDTO); } }); //查询推送接口参数 DockingSystemConfig dockingSystemConfig = dockingSystemConfigService.getById(systeminfooid); boolean isGroupCodeFlage= dockingSystemConfig.getIsGroupCodeFlag().equals("true")?true:false; if(isGroupCodeFlage){ code=data.getOrDefault("groupcode",""); } String[] classCodeLeves = dockingTask.getClassifyId().split(","); NodeJosnDTO nodeJosnDTO = new NodeJosnDTO(); NodedataDTO nodeDataDTO = new NodedataDTO(); NodeObjectDTO nodeObjectDTO = new NodeObjectDTO(); nodeObjectDTO.setCode(dockingTask.getId());//设置编码 nodeObjectDTO.setCode(code);//设置编码 nodeObjectDTO.setClassCode(classCodeLeves[0]); nodeObjectDTO.setStatus(data.get("lcstatus")); nodeObjectDTO.setLibrary(classCodeLeves[classCodeLeves.length - 1]); @@ -370,8 +378,7 @@ nodeObjectDTOS.add(nodeObjectDTO); nodeDataDTO.setObject(nodeObjectDTOS); nodeJosnDTO.setData(nodeDataDTO); //查询推送接口参数 DockingSystemConfig dockingSystemConfig = dockingSystemConfigService.getById(systeminfooid); String paramType = dockingSystemConfig.getParamType();//xml/json if (paramType.equals(DATATYPE_JSON)) { Object object = JSONObject.toJSON(nodeJosnDTO); 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()); //将DTO转换为DO 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()); //将DTO转换为DO 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); } //再新增headers 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); } //再新增headers 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)) { //先删除params_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); } //再新增params 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)) { //先删除params_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); } //再新增params 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; } /*** Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemServiceImpl.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.vci.ubcs.code.dto.DockingSystemDTO; import com.vci.ubcs.code.entity.CodeRule; import com.vci.ubcs.code.entity.DockingSystem; import com.vci.ubcs.code.entity.DockingSystemConfig; import com.vci.ubcs.code.mapper.DockingSystemConfigMapper; @@ -18,7 +17,6 @@ import com.vci.ubcs.starter.util.MdmBtmTypeConstant; import com.vci.ubcs.starter.web.util.VciBaseUtil; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -213,7 +213,8 @@ String operation=""; if(CODE_CHECKCONFIG) { //校验是否配置 DockingSystemConfig dockingSystemConfig= checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue(),codeClassifyVO.getOid()); DockingSystemConfig dockingSystemConfig=null; dockingSystemConfig=checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue(),codeClassifyVO.getOid()); if(dockingSystemConfig==null){ errorid[0] ="101"; throw new Throwable("系统标识为【"+ finalSystemId +"】，集成分类为【"+codeClassifyVO.getName()+"】以上分类，"+sysIntegrationPushTypeEnum.ACCPET_APPCODE.getText()+"接口配置已停用或者未配置，请联系编码管理员！"); @@ -1677,7 +1678,6 @@ */ private DockingSystemConfig checkIspass(String systemId,String type,String operationType,String classOid){ log.info("systemId："+systemId+",type:"+SysIntegrationDataFlowTypeEnum.getTextByValue(type)+",operationType:"+sysIntegrationPushTypeEnum.getTextByValue(operationType)+",classOid:"+classOid); DockingSystemConfig dockingSystemConfig=null; CodeClassifyVO codeClassifyVO= classifyService.getObjectByOid(classOid); classOid=codeClassifyVO.getOid(); //根据类型去查询需要集成的分类或者数据 @@ -1687,16 +1687,16 @@ queryWrapper.eq(DockingSystemConfig::getDataFlowType,type); queryWrapper.eq(DockingSystemConfig::getPushType,operationType); if(StringUtils.isNotBlank(classOid)){ queryWrapper.in(DockingSystemConfig::getClassifyId,classOid); queryWrapper.in(DockingSystemConfig::getClassifyOid,classOid); } List<DockingSystemConfig> dockingSystemConfigList= dockingSystemConfigList=dockingSystemConfigService.list(queryWrapper); if(!CollectionUtils.isEmpty(dockingSystemConfigList)){ dockingSystemConfig=dockingSystemConfigList.get(0); return dockingSystemConfigList.get(0); }else{ if(StringUtils.isNotBlank(codeClassifyVO.getParentCodeClassifyOid())) { checkIspass(systemId, type, operationType, codeClassifyVO.getParentCodeClassifyOid()); return checkIspass(systemId, type, operationType, codeClassifyVO.getParentCodeClassifyOid()); } } return dockingSystemConfig; return dockingSystemConfigList.get(0); } } Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingDataMapper.xml
@@ -6,7 +6,7 @@ <result column="OID" property="oid"/> <result column="REVISIONOID" property="revisionOid"/> <result column="NAMEOID" property="nameOid"/> <result column="BTMNAME" property="btmName"/> <result column="BTMNAME" property="btmname"/> <result column="LASTR" property="lastR"/> <result column="FIRSTR" property="firstR"/> <result column="LASTV" property="lastV"/> @@ -17,7 +17,7 @@ <result column="LASTMODIFYTIME" property="lastModifyTime"/> <result column="REVISIONRULE" property="revisionRule"/> <result column="VERSIONRULE" property="versionRule"/> <result column="REVISIONSEQ" property="revisionSeg"/> <result column="REVISIONSEQ" property="revisionSeq"/> <result column="REVISIONVALUE" property="revisionValue"/> <result column="VERSIONSEQ" property="versionSeq"/> <result column="VERSIONVALUE" property="versionValue"/> Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingSystemConfigMapper.xml
@@ -45,11 +45,11 @@ <result column="RETURNTYPE" property="returnType"/> <result column="REQUESTURL" property="requestUrl"/> <result column="SOURCESYSTEMOID" property="sourceSystemOid"/> <result column="SOURCESYSNAME" property="sourceSysName"/> <result column="SOURCESYSID" property="sourceSysId"/> <result column="SOURCESYSNAME" property="sourceSystemName"/> <result column="SOURCESYSID" property="sourceSystemId"/> <result column="TARGETSYSTEMOID" property="targetSystemOid"/> <result column="TARGETSYSNAME" property="targetSysName"/> <result column="TARGETSYSID" property="targetSysId"/> <result column="TARGETSYSNAME" property="targetSystemName"/> <result column="TARGETSYSID" property="targetSystemId"/> <result column="CLASSPATH" property="classPath"/> <result column="DATAFLOWTYPE" property="dataFlowType"/>
