diff --git a/pom.xml b/pom.xml index 9f9c5a81466e899797afe0398751be763725165f..3bc1238b3137cc100622d25b4ffca170a076c843 100644 --- a/pom.xml +++ b/pom.xml @@ -121,6 +121,11 @@ metadata-deploy-api ${metadata.deploy.version} + + com.inspur.edp + metadata-businesstype-api + 0.1.3 + diff --git a/view-object-webapi/pom.xml b/view-object-webapi/pom.xml index b59cac768f4cea105abe5fce0c3d0e82f463416b..b790e2ac3b3216edc0f79e4f034f66d129faf187 100644 --- a/view-object-webapi/pom.xml +++ b/view-object-webapi/pom.xml @@ -61,8 +61,6 @@ com.inspur.edp metadata-businesstype-api - 0.1.2 - compile com.inspur.edp diff --git a/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/core/buildformformat/VoBuildFormFormatConfig.java b/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/core/buildformformat/VoBuildFormFormatConfig.java index e03c870a59eab3f2a30ddf3cfc26d4375c2e53db..74d1b878eef09b724da0a1dea68b66a178845643 100644 --- a/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/core/buildformformat/VoBuildFormFormatConfig.java +++ b/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/core/buildformformat/VoBuildFormFormatConfig.java @@ -2,13 +2,14 @@ package com.inspur.edp.formserver.viewmodel.core.buildformformat; import com.inspur.edp.formserver.vmapi.formconfig.VoBuildFormFormatService; import com.inspur.edp.lcm.metadata.api.service.MetadataService; +import com.inspur.edp.metadata.businesstype.api.MdBizTypeMappingService; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration("com.inspur.edp.formserver.viewmodel.core.buildformformat.VoBuildFormFormatConfig") public class VoBuildFormFormatConfig { @Bean("com.inspur.edp.formserver.vmmanager.config.VMManagerConfig.BuildFormFormat()") - public VoBuildFormFormatService getBuildFormFormat(MetadataService metadataService) { - return new VoBuildFormFormatServiceImpl(metadataService); + public VoBuildFormFormatService getBuildFormFormat(MetadataService metadataService, MdBizTypeMappingService mdBizTypeMappingService) { + return new VoBuildFormFormatServiceImpl(metadataService, mdBizTypeMappingService); } } diff --git a/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/core/buildformformat/VoBuildFormFormatServiceImpl.java b/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/core/buildformformat/VoBuildFormFormatServiceImpl.java index 54846ac6f509068f704043fd4e6fc7191d55b146..3d785086c613567818685456af463b33947e8ad7 100644 --- a/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/core/buildformformat/VoBuildFormFormatServiceImpl.java +++ b/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/core/buildformformat/VoBuildFormFormatServiceImpl.java @@ -10,12 +10,17 @@ import com.inspur.edp.formserver.viewmodel.formentity.*; import com.inspur.edp.formserver.vmapi.formconfig.VoBuildFormFormatService; import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import com.inspur.edp.lcm.metadata.api.service.MetadataService; +import com.inspur.edp.metadata.businesstype.api.MdBizTypeMappingService; import com.inspur.edp.wf.bizprocess.entity.*; import com.inspur.edp.wf.bizprocess.service.FormFormatRpcService; +import com.inspur.lcm.metadata.logging.LoggerDisruptorQueue; +import io.iec.edp.caf.boot.context.CAFContext; import io.iec.edp.caf.commons.exception.ExceptionLevel; import io.iec.edp.caf.commons.utils.SpringBeanUtils; import io.iec.edp.caf.rpc.client.RpcClassHolder; import lombok.NonNull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; @@ -26,8 +31,13 @@ public class VoBuildFormFormatServiceImpl implements VoBuildFormFormatService { private final MetadataService metadataService; - public VoBuildFormFormatServiceImpl(MetadataService metadataService) { + private final MdBizTypeMappingService mdBizTypeMappingService; + + private static final Logger logger = LoggerFactory.getLogger(VoBuildFormFormatServiceImpl.class); + + public VoBuildFormFormatServiceImpl(MetadataService metadataService, MdBizTypeMappingService mdBizTypeMappingService) { this.metadataService = metadataService; + this.mdBizTypeMappingService = mdBizTypeMappingService; } /** @@ -47,7 +57,14 @@ public class VoBuildFormFormatServiceImpl implements VoBuildFormFormatService { String formId = voFormModel.getId(); format.setId(formId); format.setCode(voFormModel.getCode()); - format.setBizCategory(bizCategory); + List bizTypeIds = mdBizTypeMappingService.getBizTypeIdsByBoId(bizCategory); + if(bizTypeIds == null || bizTypeIds.isEmpty()){ + LoggerDisruptorQueue.publishEvent("[ERROR] 当前表单未获取到对应的业务对象,无法推送表单格式至流程设计", CAFContext.current.getUserId()); + logger.warn("bizTypeId is null"); + return; + } + String bizTypeId = bizTypeIds.get(0); + format.setBizCategory(bizTypeId); format.setName(voFormModel.getName()); format.setFormatType(voFormModel.getFormatType()); if (voFormModel.getUrl() == null || voFormModel.getUrl().isEmpty()) { diff --git a/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/webapi/ViewModelController.java b/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/webapi/ViewModelController.java index abcce24fc87cd3408cab57df2b002762280aee1f..7d95eab1fa22cf895baa2b593fcd89a0ce9b85c8 100644 --- a/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/webapi/ViewModelController.java +++ b/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/webapi/ViewModelController.java @@ -613,12 +613,12 @@ public class ViewModelController { variable.setID(UUID.randomUUID().toString()); variable.setCode("bffSysFormConfigId"); variable.setLabelID("bffSysFormConfigId"); - if (currentLanguage.equals("zh-CHS")){ - variable.setName("表单流程配置"); + if (currentLanguage.equals("zh-CHT")){ + variable.setName("表單流程配置"); } else if (currentLanguage.equals("en")) { variable.setName("Form Process Configuration"); }else { - variable.setName("表單流程配置"); + variable.setName("表单流程配置"); } variable.setMDataType(GspElementDataType.forValue(0)); variable.setLength(36);