From b53b003ec276dd7c4b484fbd9729709b188a9c67 Mon Sep 17 00:00:00 2001 From: hanll02 Date: Thu, 27 Jun 2024 15:53:08 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81pom=E5=BC=95=E7=94=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=202=E3=80=81=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 77 ++++++++++++++++++- view-object-manager/pom.xml | 19 +---- .../JavaMappedCdpActionGenerator.java | 7 +- .../vmmanager/util/I18nResourceUtil.java | 3 +- 4 files changed, 84 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index 3bc1238..207e6d6 100644 --- a/pom.xml +++ b/pom.xml @@ -48,6 +48,19 @@ 0.1.40 0.1.36 0.1.15 + 1.0.0-rc.1 + 0.1.4 + 0.1.0 + 0.1.4 + 0.2.0 + 0.3.34 + 0.3.23 + 0.1.23 + 0.1.3 + 0.1.0 + 0.1.7 + 0.3.4 + 0.1.0 @@ -114,17 +127,77 @@ com.inspur.edp metadata-rtcustomization-api - 0.1.36 + ${metadata.rtcustomization.version} com.inspur.edp metadata-deploy-api ${metadata.deploy.version} + + io.iec.edp + caf-caching + ${caf-caching.version} + + + com.inspur.edp + common-model + ${common-model.version} + + + com.inspur.edp + common-entity-variable-generator + ${common-variable-generator.version} + + + com.inspur.edp + lcm-logging-service + ${lcm-logging-service.version} + + + com.inspur.edp + bef-component + ${bef-component.version} + + + com.inspur.edp + task-api + ${task-api.version} + + + com.inspur.edp + wf-runtime-api + ${wf-runtime-api.version} + + + com.inspur.edp + metadata-rtcustomization-server-api + ${metadata-rtcustomization-server-api.version} + com.inspur.edp metadata-businesstype-api - 0.1.3 + ${metadata-businesstype-api.version} + + + io.iec.edp + caf-rpc-api + ${caf-rpc-api.version} + + + com.inspur.edp + lcm-fs-api + ${lcm-fs-api.version} + + + com.inspur.edp + caf-cef-dt-spi + ${caf-cef-dt-spi.version} + + + com.inspur.edp + metadata-service-dev-spi + ${metadata-service-dev-spi.version} diff --git a/view-object-manager/pom.xml b/view-object-manager/pom.xml index 869931a..2587a1f 100644 --- a/view-object-manager/pom.xml +++ b/view-object-manager/pom.xml @@ -66,13 +66,11 @@ com.inspur.edp - lcm-metadata-spi - 0.1.40-SNAPSHOT + metadata-service-dev-spi com.inspur.edp metadata-rtcustomization-api - 0.1.36 com.inspur.edp @@ -86,7 +84,6 @@ com.inspur.edp bef-component - 0.2.0 io.iec.edp @@ -106,40 +103,31 @@ com.inspur.edp metadata-businesstype-api - 0.1.2 - compile io.iec.edp caf-rpc-api - 0.3.4 + com.inspur.edp common-entity-variable-generator - 0.1.0 io.iec.edp caf-caching - 1.0.0-rc.1 com.inspur.edp lcm-fs-api - 0.1.0 - compile com.inspur.edp caf-cef-dt-spi - 0.1.7 com.inspur.edp metadata-rtcustomization-server-api - 0.1.23 - compile com.inspur.edp @@ -159,12 +147,10 @@ com.inspur.edp task-api - 0.3.34 com.inspur.edp wf-runtime-api - 0.3.23 com.inspur.edp @@ -174,7 +160,6 @@ com.inspur.edp common-model - 0.1.4 diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaMappedCdpActionGenerator.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaMappedCdpActionGenerator.java index 8a5d84c..3632b97 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaMappedCdpActionGenerator.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaMappedCdpActionGenerator.java @@ -5,6 +5,7 @@ import com.inspur.edp.formserver.viewmodel.GspViewModel; import com.inspur.edp.formserver.viewmodel.action.ActionParamInfo; import com.inspur.edp.formserver.viewmodel.action.MappedCdpAction; import com.inspur.edp.formserver.vmmanager.util.I18nResourceUtil; +import com.inspur.edp.lcm.metadata.api.entity.MetadataHeader; public class JavaMappedCdpActionGenerator extends JavaBaseActionGenerator { private MappedCdpAction action; @@ -109,9 +110,11 @@ public class JavaMappedCdpActionGenerator extends JavaBaseActionGenerator { public String update(String originContent) { String genFile = this.generateCommon(); String compName = this.getCompName(); + //获取元数据Header信息 + MetadataHeader metadataHeader=this.metadata.getHeader(); //获取前缀信息，在IDE控制台输当前修改的元数据动作信息 - String prefix= I18nResourceUtil.getMessage("GSP_VIEWMANAGER_MESSAGE_0001",this.metadata.getHeader().getCode(), - this.metadata.getHeader().getCode(),this.VMAction.getCode(),this.VMAction.getName()); + String prefix= I18nResourceUtil.getMessage("GSP_VIEWMANAGER_MESSAGE_0001",metadataHeader.getCode(), + metadataHeader.getName(),this.VMAction.getCode(),this.VMAction.getName()); return ComponentCodeUpdater.codeUpdate(originContent, genFile,compName,prefix); } diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/util/I18nResourceUtil.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/util/I18nResourceUtil.java index e2fd32c..58c0342 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/util/I18nResourceUtil.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/util/I18nResourceUtil.java @@ -2,6 +2,7 @@ package com.inspur.edp.formserver.vmmanager.util; import io.iec.edp.caf.boot.context.CAFContext; import io.iec.edp.caf.commons.utils.SpringBeanUtils; +import io.iec.edp.caf.commons.utils.StringUtils; import io.iec.edp.caf.i18n.api.ResourceLocalizer; import java.text.MessageFormat; @@ -36,7 +37,7 @@ public class I18nResourceUtil { private static String getMessage(String msgCode) { // 从国际化资源文件中获取对应编码的消息 String messageFormat = resourceLocalizer.getString(msgCode, I18N_RESOURCE_FIle, SU, CAFContext.current.getLanguage()); - if (messageFormat==null ||"".equals(messageFormat)) { + if (StringUtils.isEmpty(messageFormat)) { messageFormat = msgCode; } return messageFormat; -- Gitee