From 968e2429e3d3fe7b0dfe098f24a8eafe36c00331 Mon Sep 17 00:00:00 2001 From: guozhiqi Date: Tue, 25 Apr 2023 19:45:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=85=83=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 - .../edp/web/common/utility/StringUtility.java | 13 ++ .../CommandServiceAnalysis.java | 2 +- .../metadataanalysis/CommandsAnalysis.java | 7 +- .../metadataanalysis/EapiAnalysis.java | 3 +- .../metadataanalysis/FormAnalysis.java | 2 +- .../StateMachineAnalysis.java | 7 +- .../CommandServiceAnalysis.java | 2 +- .../api/FormMetadataWebService.java | 13 ++ ...ormRelateMetadataInDesignParameterDto.java | 85 ++++++++++++ .../FormRelateMetadataInDesignResultDto.java | 42 ++++++ .../api/dto/RelateMetadataTypeDto.java | 8 ++ .../api/dto/RelateMetadataTypeEnum.java | 33 +++++ .../config/FormMetadataConfiguration.java | 6 + .../metadatamanager/BaseMetaDataManager.java | 3 +- .../CommandExtendProperty.java | 2 +- .../CommandServiceManager.java | 2 +- .../CommandsMetadataManager.java | 6 +- .../ComponentMetadataManager.java | 2 +- .../metadatamanager/EapiMetadataManager.java | 2 +- .../metadatamanager/FormMetadataManager.java | 3 +- .../StateMachineMetadataManager.java | 7 +- .../app/AppMetadataManager.java | 4 +- .../service/FormRelateMetadataService.java | 131 ++++++++++++++++++ .../FormMetadataWebServiceImpl.java | 52 ++++++- .../FormMetadataWebServiceImplTest.java | 14 ++ .../operation/EapiMetadataOperation.java | 2 +- .../FormMetadataContentOperation.java | 2 +- .../StateMachineMetadataOperation.java | 2 +- 29 files changed, 422 insertions(+), 37 deletions(-) create mode 100644 web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/dto/FormRelateMetadataInDesignParameterDto.java create mode 100644 web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/dto/FormRelateMetadataInDesignResultDto.java create mode 100644 web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/dto/RelateMetadataTypeDto.java create mode 100644 web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/dto/RelateMetadataTypeEnum.java rename {web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine => web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata}/metadatamanager/BaseMetaDataManager.java (98%) rename {web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine => web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata}/metadatamanager/CommandExtendProperty.java (94%) rename {web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine => web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata}/metadatamanager/CommandServiceManager.java (98%) rename {web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine => web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata}/metadatamanager/CommandsMetadataManager.java (89%) rename {web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine => web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata}/metadatamanager/ComponentMetadataManager.java (97%) rename {web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine => web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata}/metadatamanager/EapiMetadataManager.java (97%) rename {web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine => web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata}/metadatamanager/FormMetadataManager.java (96%) rename {web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine => web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata}/metadatamanager/StateMachineMetadataManager.java (88%) rename {web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine => web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata}/metadatamanager/app/AppMetadataManager.java (88%) create mode 100644 web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/service/FormRelateMetadataService.java create mode 100644 web-form-metadata/src/test/java/com/inspur/edp/web/formmetadata/webservice/FormMetadataWebServiceImplTest.java diff --git a/pom.xml b/pom.xml index f58dd384..29221eba 100644 --- a/pom.xml +++ b/pom.xml @@ -42,8 +42,6 @@ runtime-scriptcache-api jitengine-web-api jitengine-web-core - web-approval-format-api - web-approval-format-core web-npmpackage-core web-npmpackage-api web-npmpackage-patch diff --git a/web-common/src/main/java/com/inspur/edp/web/common/utility/StringUtility.java b/web-common/src/main/java/com/inspur/edp/web/common/utility/StringUtility.java index 74bd4eaa..33aea67c 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/utility/StringUtility.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/utility/StringUtility.java @@ -228,6 +228,19 @@ public class StringUtility { return source; } + /** + * 使用默认值 + * @param source + * @param defaultValue + * @return + */ + public static String getOrDefault(Object source, String defaultValue) { + if (source==null) { + return isNullOrEmpty(defaultValue) ? "" : defaultValue; + } + return source.toString(); + } + /** * 将null 转换成空字符串 * diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/CommandServiceAnalysis.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/CommandServiceAnalysis.java index e794a44b..deab9bd1 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/CommandServiceAnalysis.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/CommandServiceAnalysis.java @@ -24,8 +24,8 @@ import com.inspur.edp.web.common.logger.WebLogger; import com.inspur.edp.web.common.utility.CommandLineUtility; import com.inspur.edp.web.common.utility.StringUtility; import com.inspur.edp.web.formmetadata.metadata.formdom.FormDOM; +import com.inspur.edp.web.formmetadata.metadatamanager.CommandServiceManager; import com.inspur.edp.web.frontendproject.entity.resolver.ResolveFormMetadataItem; -import com.inspur.edp.web.jitengine.metadatamanager.CommandServiceManager; import org.apache.commons.io.FilenameUtils; import java.util.HashMap; diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/CommandsAnalysis.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/CommandsAnalysis.java index 69a361d4..3a047977 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/CommandsAnalysis.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/CommandsAnalysis.java @@ -26,8 +26,8 @@ import com.inspur.edp.web.common.metadata.MetadataTypeEnum; import com.inspur.edp.web.common.serialize.SerializeUtility; import com.inspur.edp.web.common.utility.StringUtility; import com.inspur.edp.web.formmetadata.metadata.formdom.FormDOM; -import com.inspur.edp.web.jitengine.metadatamanager.CommandsMetadataManager; -import com.inspur.edp.web.jitengine.metadatamanager.ComponentMetadataManager; +import com.inspur.edp.web.formmetadata.metadatamanager.CommandsMetadataManager; +import com.inspur.edp.web.formmetadata.metadatamanager.ComponentMetadataManager; import java.util.*; @@ -73,7 +73,8 @@ public class CommandsAnalysis { sbCommands.append(","); } cmdId = c.get("id").toString(); - metadata = cmdManager.getWebCommands(cmdId, c.getOrDefault("code", "").toString(), c.getOrDefault("name", "").toString(), c.getOrDefault("nameSpace", "").toString()); + GspMetadata commandMetadata = cmdManager.getWebCommands(cmdId, c.getOrDefault("code", "").toString(), c.getOrDefault("name", "").toString(), c.getOrDefault("nameSpace", "").toString()); + metadata = (WebCommandsMetadata) commandMetadata.getContent(); analysisComponentMetadata(metadata, cmpList, null, componentMetadataManager, projectCmpList); try { diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/EapiAnalysis.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/EapiAnalysis.java index d8571bdb..52813bc3 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/EapiAnalysis.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/EapiAnalysis.java @@ -19,10 +19,9 @@ package com.inspur.edp.web.jitengine.metadataanalysis; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.inspur.edp.lcm.metadata.api.IMetadataContent; import com.inspur.edp.web.common.environment.ExecuteEnvironment; -import com.inspur.edp.web.common.io.FileUtility; import com.inspur.edp.web.common.utility.StringUtility; import com.inspur.edp.web.formmetadata.metadata.formdom.FormDOM; -import com.inspur.edp.web.jitengine.metadatamanager.EapiMetadataManager; +import com.inspur.edp.web.formmetadata.metadatamanager.EapiMetadataManager; import java.util.HashMap; import java.util.List; diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/FormAnalysis.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/FormAnalysis.java index 09433cda..35bd0576 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/FormAnalysis.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/FormAnalysis.java @@ -21,7 +21,7 @@ import com.inspur.edp.web.common.io.FileUtility; import com.inspur.edp.web.common.serialize.SerializeUtility; import com.inspur.edp.web.common.utility.StringUtility; import com.inspur.edp.web.formmetadata.metadata.formdom.FormDOM; -import com.inspur.edp.web.jitengine.metadatamanager.FormMetadataManager; +import com.inspur.edp.web.formmetadata.metadatamanager.FormMetadataManager; import com.inspur.edp.web.jitengine.metadatamodel.app.form.AnalysisExternalComponentResult; import java.util.HashMap; diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/StateMachineAnalysis.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/StateMachineAnalysis.java index efe64943..0e475e5c 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/StateMachineAnalysis.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataanalysis/StateMachineAnalysis.java @@ -17,9 +17,10 @@ package com.inspur.edp.web.jitengine.metadataanalysis; import com.inspur.edp.lcm.metadata.api.IMetadataContent; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.formmetadata.metadata.formdom.FormDOM; -import com.inspur.edp.web.jitengine.metadatamanager.StateMachineMetadataManager; +import com.inspur.edp.web.formmetadata.metadatamanager.StateMachineMetadataManager; import java.util.HashMap; @@ -44,8 +45,8 @@ public class StateMachineAnalysis { stateMachines.append(","); } String uri = o.get("uri").toString(); - Object obj = smManager.getStateMachine(uri, o.getOrDefault("code", "").toString(), o.getOrDefault("name", "").toString(), o.getOrDefault("nameSpace", "").toString()); - String sm_json = smManager.serialize((IMetadataContent) obj); + GspMetadata obj = smManager.getStateMachine(uri, o.getOrDefault("code", "").toString(), o.getOrDefault("name", "").toString(), o.getOrDefault("nameSpace", "").toString()); + String sm_json = smManager.serialize(obj.getContent()); String idStr = o.get("id").toString(); stateMachines.append("\"").append(idStr).append("\":"); stateMachines.append(sm_json); diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataparser/commandservice/CommandServiceAnalysis.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataparser/commandservice/CommandServiceAnalysis.java index eb0c0482..28490da9 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataparser/commandservice/CommandServiceAnalysis.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadataparser/commandservice/CommandServiceAnalysis.java @@ -20,7 +20,7 @@ import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.common.io.FileUtility; import com.inspur.edp.web.common.utility.StringUtility; import com.inspur.edp.web.formmetadata.metadata.formdom.FormDOM; -import com.inspur.edp.web.jitengine.metadatamanager.CommandServiceManager; +import com.inspur.edp.web.formmetadata.metadatamanager.CommandServiceManager; import java.util.HashMap; diff --git a/web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/FormMetadataWebService.java b/web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/FormMetadataWebService.java index ff0a7e53..526bd34d 100644 --- a/web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/FormMetadataWebService.java +++ b/web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/FormMetadataWebService.java @@ -17,6 +17,8 @@ package com.inspur.edp.web.formmetadata.api; import com.inspur.edp.web.common.entity.ResultMessage; +import com.inspur.edp.web.formmetadata.api.dto.FormRelateMetadataInDesignParameterDto; +import com.inspur.edp.web.formmetadata.api.dto.FormRelateMetadataInDesignResultDto; import com.inspur.edp.web.formmetadata.api.entity.FormSuInfoEntity; import com.inspur.edp.web.formmetadata.api.entity.ReplicateFormRequestBody; import com.inspur.edp.web.formmetadata.api.entity.SuInfoWithBizobjIdEntity; @@ -96,4 +98,15 @@ public interface FormMetadataWebService { @Path("get-suinfo-with-bizobjid") @POST FormSuInfoEntity getSuInfoWithBizobjId(@RequestBody SuInfoWithBizobjIdEntity bizobjIdEntity); + + + /** + * 获取表单关联的元数据参数信息系 + * + * @param parameter + * @return + */ + @Path("get-form-relate-metadata") + @POST + List getFormRelateMetadata(@RequestBody FormRelateMetadataInDesignParameterDto parameter); } diff --git a/web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/dto/FormRelateMetadataInDesignParameterDto.java b/web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/dto/FormRelateMetadataInDesignParameterDto.java new file mode 100644 index 00000000..a07e3dc3 --- /dev/null +++ b/web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/dto/FormRelateMetadataInDesignParameterDto.java @@ -0,0 +1,85 @@ +package com.inspur.edp.web.formmetadata.api.dto; + +import com.inspur.edp.web.common.environment.ExecuteEnvironment; + +import java.util.ArrayList; +import java.util.List; + +/** + * 获取表单及其关联元数据请求参数 + * 该接口适用于设计时使用元数据文件名称及路径获取 + * + * @author guozhiqi + */ +public class FormRelateMetadataInDesignParameterDto { + /** + * 表单元数据文件名称 + */ + private String formMetadataFileName; + /** + * 表单元数据所属工程路径 + */ + private String formMetadataPath; + + /** + * 运行时传递元数据ID + * 设计时传递元数据文件路径 + */ + private String formMetadataId; + + /** + * 执行环境 + * 获取设计时元数据还是运行时元数据 + */ + private ExecuteEnvironment environment = ExecuteEnvironment.Design; + + /** + * 待获取的关联元数据类型 + * 此参数为空 那么获取表单、状态机、命令元数据三类 + * 当前不使用该参数，因为解析表单当前需要获取这三类元数据 + */ + private List relateMetadataTypeList; + + public String getFormMetadataFileName() { + return formMetadataFileName; + } + + public void setFormMetadataFileName(String formMetadataFileName) { + this.formMetadataFileName = formMetadataFileName; + } + + public String getFormMetadataPath() { + return formMetadataPath; + } + + public void setFormMetadataPath(String formMetadataPath) { + this.formMetadataPath = formMetadataPath; + } + + public List getRelateMetadataTypeList() { + if (this.relateMetadataTypeList == null) { + this.relateMetadataTypeList = new ArrayList<>(); + } + return relateMetadataTypeList; + } + + public void setRelateMetadataTypeList(List relateMetadataTypeList) { + this.relateMetadataTypeList = relateMetadataTypeList; + } + + public String getFormMetadataId() { + return formMetadataId; + } + + public void setFormMetadataId(String formMetadataId) { + this.formMetadataId = formMetadataId; + } + + public ExecuteEnvironment getEnvironment() { + return environment; + } + + public void setEnvironment(ExecuteEnvironment environment) { + this.environment = environment; + } +} \ No newline at end of file diff --git a/web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/dto/FormRelateMetadataInDesignResultDto.java b/web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/dto/FormRelateMetadataInDesignResultDto.java new file mode 100644 index 00000000..24d30f2f --- /dev/null +++ b/web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/dto/FormRelateMetadataInDesignResultDto.java @@ -0,0 +1,42 @@ +package com.inspur.edp.web.formmetadata.api.dto; + +import com.inspur.edp.lcm.metadata.api.IMetadataContent; + +/** + * 表单关联元数据设计时获取返回结果 + * + * @author guozhiqi + */ +public class FormRelateMetadataInDesignResultDto { + public FormRelateMetadataInDesignResultDto(RelateMetadataTypeEnum relateMetadataType, + String metadataName, String metadataId, + IMetadataContent metadataContent) { + this.metadataType = relateMetadataType; + this.metadataContent = metadataContent; + this.metadataName = metadataName; + this.metadataId = metadataId; + } + + private String metadataName; + private String metadataId; + // 元数据类型 + private RelateMetadataTypeEnum metadataType; + // 元数据内容 + private IMetadataContent metadataContent; + + public String getMetadataName() { + return metadataName; + } + + public String getMetadataId() { + return metadataId; + } + + public RelateMetadataTypeEnum getMetadataType() { + return metadataType; + } + + public IMetadataContent getMetadataContent() { + return metadataContent; + } +} \ No newline at end of file diff --git a/web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/dto/RelateMetadataTypeDto.java b/web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/dto/RelateMetadataTypeDto.java new file mode 100644 index 00000000..a7859496 --- /dev/null +++ b/web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/dto/RelateMetadataTypeDto.java @@ -0,0 +1,8 @@ +/** + * 待获取的关联元数据类型 + * 增加此参数的目的是为了限定关联元数据获取范围 + * @author guozhiqi + */ +public class RelateMetadataTypeDto { + +} \ No newline at end of file diff --git a/web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/dto/RelateMetadataTypeEnum.java b/web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/dto/RelateMetadataTypeEnum.java new file mode 100644 index 00000000..e5c27d74 --- /dev/null +++ b/web-form-metadata-api/src/main/java/com/inspur/edp/web/formmetadata/api/dto/RelateMetadataTypeEnum.java @@ -0,0 +1,33 @@ +package com.inspur.edp.web.formmetadata.api.dto; + +/** + * 关联元数据类型 + * @author guozhiqi + */ +public enum RelateMetadataTypeEnum { + Form { + @Override + public String getName() { + return "Form"; + } + }, + StateMachine { + @Override + public String getName() { + return "StateMachine"; + } + }, + Command { + @Override + public String getName() { + return "Command"; + } + }; + + /** + * 获取关联类型对应的固定名称定义 + * + * @return + */ + public abstract String getName(); +} \ No newline at end of file diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/config/FormMetadataConfiguration.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/config/FormMetadataConfiguration.java index 0c5a8169..5ba5c2e8 100644 --- a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/config/FormMetadataConfiguration.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/config/FormMetadataConfiguration.java @@ -20,6 +20,7 @@ import com.inspur.edp.web.formmetadata.api.FormMetadataCommonService; import com.inspur.edp.web.formmetadata.lic.FormMetadataCreateLicControlListener; import com.inspur.edp.web.formmetadata.service.FormMetadataCommonServiceImpl; import com.inspur.edp.web.formmetadata.service.FormMetadataRTService; +import com.inspur.edp.web.formmetadata.service.FormRelateMetadataService; import com.inspur.edp.web.formmetadata.webservice.FormMetadataWebServiceImpl; import io.iec.edp.caf.rest.RESTEndpoint; import org.springframework.context.annotation.Bean; @@ -46,4 +47,9 @@ public class FormMetadataConfiguration { public FormMetadataCreateLicControlListener getFormMetadataCreateLicControlListener() { return new FormMetadataCreateLicControlListener(); } + + @Bean + public FormRelateMetadataService getFormRelateMetadataService() { + return new FormRelateMetadataService(); + } } diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/BaseMetaDataManager.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/BaseMetaDataManager.java similarity index 98% rename from web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/BaseMetaDataManager.java rename to web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/BaseMetaDataManager.java index 5e379db2..f262c718 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/BaseMetaDataManager.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/BaseMetaDataManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.inspur.edp.web.jitengine.metadatamanager; +package com.inspur.edp.web.formmetadata.metadatamanager; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.inspur.edp.lcm.metadata.api.IMetadataContent; @@ -27,7 +27,6 @@ import com.inspur.edp.web.common.metadata.MetadataTypeEnum; import com.inspur.edp.web.common.metadata.MetadataUtility; import com.inspur.edp.web.common.serialize.SerializeUtility; -import javax.validation.constraints.Null; import java.util.function.Supplier; /** diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandExtendProperty.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/CommandExtendProperty.java similarity index 94% rename from web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandExtendProperty.java rename to web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/CommandExtendProperty.java index 7d862768..49d89c09 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandExtendProperty.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/CommandExtendProperty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.inspur.edp.web.jitengine.metadatamanager; +package com.inspur.edp.web.formmetadata.metadatamanager; /** * 命令扩展 diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandServiceManager.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/CommandServiceManager.java similarity index 98% rename from web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandServiceManager.java rename to web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/CommandServiceManager.java index b69e78e3..3c4dd2be 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandServiceManager.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/CommandServiceManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.inspur.edp.web.jitengine.metadatamanager; +package com.inspur.edp.web.formmetadata.metadatamanager; import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import com.inspur.edp.web.common.environment.ExecuteEnvironment; diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandsMetadataManager.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/CommandsMetadataManager.java similarity index 89% rename from web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandsMetadataManager.java rename to web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/CommandsMetadataManager.java index ae280ae4..0544600c 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/CommandsMetadataManager.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/CommandsMetadataManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.inspur.edp.web.jitengine.metadatamanager; +package com.inspur.edp.web.formmetadata.metadatamanager; import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import com.inspur.edp.web.command.component.metadata.WebCommandsMetadata; @@ -32,7 +32,7 @@ public class CommandsMetadataManager extends BaseMetaDataManager { super(executeEnvironment, isUpdradeTool); } - public WebCommandsMetadata getWebCommands(String id, String code, String name, String nameSpace) { + public GspMetadata getWebCommands(String id, String code, String name, String nameSpace) { GspMetadata webCommandMetadata = getMetadata(() -> { MetadataGetterParameter.GetterMetadataInfo getterMetadataInfo = new MetadataGetterParameter.GetterMetadataInfo(); getterMetadataInfo.setId(id); @@ -45,6 +45,6 @@ public class CommandsMetadataManager extends BaseMetaDataManager { if (webCommandMetadata == null) { throw new RuntimeException("load webCommand metadata is null,the commandId is " + id); } - return (WebCommandsMetadata) webCommandMetadata.getContent(); + return webCommandMetadata ; } } diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/ComponentMetadataManager.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/ComponentMetadataManager.java similarity index 97% rename from web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/ComponentMetadataManager.java rename to web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/ComponentMetadataManager.java index 6548a316..55e73bcf 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/ComponentMetadataManager.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/ComponentMetadataManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.inspur.edp.web.jitengine.metadatamanager; +package com.inspur.edp.web.formmetadata.metadatamanager; import com.inspur.edp.cdp.web.component.metadata.define.WebComponentMetadata; import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/EapiMetadataManager.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/EapiMetadataManager.java similarity index 97% rename from web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/EapiMetadataManager.java rename to web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/EapiMetadataManager.java index c9cebf1d..30ff7e22 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/EapiMetadataManager.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/EapiMetadataManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.inspur.edp.web.jitengine.metadatamanager; +package com.inspur.edp.web.formmetadata.metadatamanager; import com.inspur.edp.lcm.metadata.api.IMetadataContent; import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/FormMetadataManager.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/FormMetadataManager.java similarity index 96% rename from web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/FormMetadataManager.java rename to web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/FormMetadataManager.java index 25703455..9027ef0a 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/FormMetadataManager.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/FormMetadataManager.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package com.inspur.edp.web.jitengine.metadatamanager; +package com.inspur.edp.web.formmetadata.metadatamanager; import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; -import com.inspur.edp.lcm.metadata.api.entity.MetadataHeader; import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.common.metadata.MetadataGetterParameter; import com.inspur.edp.web.common.metadata.MetadataTypeEnum; diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/StateMachineMetadataManager.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/StateMachineMetadataManager.java similarity index 88% rename from web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/StateMachineMetadataManager.java rename to web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/StateMachineMetadataManager.java index 1dd78ef1..4e26ffbd 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/StateMachineMetadataManager.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/StateMachineMetadataManager.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package com.inspur.edp.web.jitengine.metadatamanager; +package com.inspur.edp.web.formmetadata.metadatamanager; +import com.inspur.edp.lcm.metadata.api.IMetadataContent; import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.common.metadata.MetadataGetterParameter; @@ -26,7 +27,7 @@ public class StateMachineMetadataManager extends BaseMetaDataManager { super(executeEnvironment, isUpdradeTool); } - public Object getStateMachine(String id, String code, String name, String nameSpace) { + public GspMetadata getStateMachine(String id, String code, String name, String nameSpace) { GspMetadata stateMachineMetaData = getMetadata(() -> { MetadataGetterParameter.GetterMetadataInfo getterMetadataInfo = new MetadataGetterParameter.GetterMetadataInfo(); getterMetadataInfo.setId(id); @@ -39,6 +40,6 @@ public class StateMachineMetadataManager extends BaseMetaDataManager { if (stateMachineMetaData == null) { throw new RuntimeException("load statemachine metadata is null,the metaDataId is " + id); } - return stateMachineMetaData.getContent(); + return stateMachineMetaData; } } diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/app/AppMetadataManager.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/app/AppMetadataManager.java similarity index 88% rename from web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/app/AppMetadataManager.java rename to web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/app/AppMetadataManager.java index d9e5dfbc..9ad1c583 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/metadatamanager/app/AppMetadataManager.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/metadatamanager/app/AppMetadataManager.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.inspur.edp.web.jitengine.metadatamanager.app; +package com.inspur.edp.web.formmetadata.metadatamanager.app; import com.inspur.edp.web.common.environment.ExecuteEnvironment; -import com.inspur.edp.web.jitengine.metadatamanager.BaseMetaDataManager; +import com.inspur.edp.web.formmetadata.metadatamanager.BaseMetaDataManager; /** * appmetadataManager diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/service/FormRelateMetadataService.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/service/FormRelateMetadataService.java new file mode 100644 index 00000000..358637ae --- /dev/null +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/service/FormRelateMetadataService.java @@ -0,0 +1,131 @@ +package com.inspur.edp.web.formmetadata.service; + +import com.inspur.edp.lcm.metadata.api.IMetadataContent; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; +import com.inspur.edp.web.common.customexception.WebCustomException; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; +import com.inspur.edp.web.common.metadata.MetadataGetterParameter; +import com.inspur.edp.web.common.metadata.MetadataTypeEnum; +import com.inspur.edp.web.common.metadata.MetadataUtility; +import com.inspur.edp.web.common.utility.StringUtility; +import com.inspur.edp.web.formmetadata.api.dto.FormRelateMetadataInDesignParameterDto; +import com.inspur.edp.web.formmetadata.api.dto.FormRelateMetadataInDesignResultDto; +import com.inspur.edp.web.formmetadata.api.dto.RelateMetadataTypeEnum; +import com.inspur.edp.web.formmetadata.metadata.FormMetadataContent; +import com.inspur.edp.web.formmetadata.metadata.FormMetadataContentService; +import com.inspur.edp.web.formmetadata.metadata.formdom.FormDOM; +import com.inspur.edp.web.formmetadata.metadatamanager.CommandsMetadataManager; +import com.inspur.edp.web.formmetadata.metadatamanager.StateMachineMetadataManager; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +/** + * 表单关联元数据获取服务 + * + * @author guozhiqi + */ +public class FormRelateMetadataService { + /** + * 获取表单元数据及其关联元数据 + * + * @param parameter + */ + public List getFormRelateMetadata(FormRelateMetadataInDesignParameterDto parameter) { + // 定义返回值列表结构 + List formRelateMetadataInDesignResultList = new ArrayList<>(); + + GspMetadata formMetadata = getFormMetadata(parameter); + + + FormMetadataContent formMetadataContent = (FormMetadataContent) formMetadata.getContent(); + FormDOM formDOM = FormMetadataContentService.getInstance().getFormContent(formMetadataContent); + + FormRelateMetadataInDesignResultDto formMetadataResultDto = new FormRelateMetadataInDesignResultDto(RelateMetadataTypeEnum.Form, formMetadata.getHeader().getName(), formMetadata.getHeader().getId(), formMetadata.getContent()); + formRelateMetadataInDesignResultList.add(formMetadataResultDto); + + // 获取关联的状态机元数据 + List> stateMachineList = formDOM.getModule().getStateMachines(); + if (stateMachineList != null && stateMachineList.size() > 0) { + stateMachineList.forEach(sm -> { + String smUri = StringUtility.getOrDefault(sm.getOrDefault("uri", ""), ""); + if (StringUtility.isNotNullOrEmpty(smUri)) { + + StateMachineMetadataManager stateMachineMetadataManager = new StateMachineMetadataManager(parameter.getEnvironment(), false); + GspMetadata stateMachineMetadata = stateMachineMetadataManager.getStateMachine(smUri, StringUtility.getOrDefault(sm.get("code"), ""), StringUtility.getOrDefault(sm.get("name"), ""), StringUtility.getOrDefault(sm.get("nameSpace"), "")); + + FormRelateMetadataInDesignResultDto stateMachineMetadataResultDto = new FormRelateMetadataInDesignResultDto(RelateMetadataTypeEnum.StateMachine, stateMachineMetadata.getHeader().getName(), + stateMachineMetadata.getHeader().getId(), stateMachineMetadata.getContent()); + formRelateMetadataInDesignResultList.add(stateMachineMetadataResultDto); + } + }); + } + + // 获取关联的命令元数据 + List> webCmdList = formDOM.getModule().getWebcmds(); + if (webCmdList != null && webCmdList.size() > 0) { + webCmdList.forEach(t -> { + String webCmdId = StringUtility.getOrDefault(t.get("id"), ""); + if (StringUtility.isNotNullOrEmpty(webCmdId)) { + CommandsMetadataManager commandsMetadataManager = new CommandsMetadataManager(parameter.getEnvironment(), false); + GspMetadata webCmdMetadata = commandsMetadataManager.getWebCommands(webCmdId, StringUtility.getOrDefault(t.get("code"), ""), StringUtility.getOrDefault(t.get("name"), ""), StringUtility.getOrDefault(t.get("nameSpace"), "")); + + FormRelateMetadataInDesignResultDto stateMachineMetadataResultDto = new FormRelateMetadataInDesignResultDto(RelateMetadataTypeEnum.Command, webCmdMetadata.getHeader().getName(), + webCmdMetadata.getHeader().getId(), webCmdMetadata.getContent()); + formRelateMetadataInDesignResultList.add(stateMachineMetadataResultDto); + } + }); + } + + return formRelateMetadataInDesignResultList; + } + + /** + * 获取命令元数据信息 + * + * @param formMetadata + * @param webCmdId + * @param webCmdPath + * @param executeEnvironment + * @return + */ + private GspMetadata getWebCmdMetadata(GspMetadata formMetadata, String webCmdId, String webCmdPath, ExecuteEnvironment executeEnvironment) { + GspMetadata webCmdMetadata; + if (executeEnvironment.equals(ExecuteEnvironment.Design)) { + if (StringUtility.isNullOrEmpty(webCmdPath)) { + webCmdPath = formMetadata.getRelativePath(); + } + MetadataGetterParameter metadataGetterParameter = MetadataGetterParameter.getNewInstance(webCmdId, webCmdPath, MetadataTypeEnum.Command); + metadataGetterParameter.setSourceMetadata(formMetadata, MetadataTypeEnum.Frm); + webCmdMetadata = MetadataUtility.getInstance().getMetadataWithDesign(metadataGetterParameter); + } else { + webCmdMetadata = MetadataUtility.getInstance().getMetadataInRuntime(webCmdId); + } + + return webCmdMetadata; + } + + /** + * 获取状态机元数据信息 + * + * @param formMetadata + * @param smUri + * @param executeEnvironment + * @return + */ + private GspMetadata getStateMachineMetadata(String smUri, String code, String name, String nameSpace, ExecuteEnvironment executeEnvironment) { + StateMachineMetadataManager stateMachineMetadataManager = new StateMachineMetadataManager(executeEnvironment, false); + return null; + } + + private GspMetadata getFormMetadata(FormRelateMetadataInDesignParameterDto parameter) { + GspMetadata formMetadata; + if (parameter.getEnvironment().equals(ExecuteEnvironment.Design)) { + formMetadata = MetadataUtility.getInstance().getMetadataWithDesign(parameter.getFormMetadataFileName(), parameter.getFormMetadataPath()); + } else { + formMetadata = MetadataUtility.getInstance().getMetadataInRuntime(parameter.getFormMetadataId()); + } + return formMetadata; + } +} diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/webservice/FormMetadataWebServiceImpl.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/webservice/FormMetadataWebServiceImpl.java index 065a6c4b..2f49b1c6 100644 --- a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/webservice/FormMetadataWebServiceImpl.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/webservice/FormMetadataWebServiceImpl.java @@ -16,17 +16,33 @@ package com.inspur.edp.web.formmetadata.webservice; +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; +import com.inspur.edp.web.common.customexception.WebCustomException; import com.inspur.edp.web.common.entity.ResultCode; import com.inspur.edp.web.common.entity.ResultMessage; +import com.inspur.edp.web.common.environment.ExecuteEnvironment; +import com.inspur.edp.web.common.metadata.MetadataGetterParameter; +import com.inspur.edp.web.common.metadata.MetadataTypeEnum; +import com.inspur.edp.web.common.metadata.MetadataUtility; +import com.inspur.edp.web.common.utility.StringUtility; import com.inspur.edp.web.formmetadata.api.FormMetadataCommonService; import com.inspur.edp.web.formmetadata.api.FormMetadataWebService; +import com.inspur.edp.web.formmetadata.api.dto.FormRelateMetadataInDesignParameterDto; +import com.inspur.edp.web.formmetadata.api.dto.FormRelateMetadataInDesignResultDto; +import com.inspur.edp.web.formmetadata.api.dto.RelateMetadataTypeEnum; import com.inspur.edp.web.formmetadata.api.entity.FormSuInfoEntity; import com.inspur.edp.web.formmetadata.api.entity.ReplicateFormRequestBody; import com.inspur.edp.web.formmetadata.api.entity.SuInfoWithBizobjIdEntity; import com.inspur.edp.web.formmetadata.manager.FormMetadataManager; +import com.inspur.edp.web.formmetadata.metadata.FormMetadataContent; +import com.inspur.edp.web.formmetadata.metadata.FormMetadataContentService; +import com.inspur.edp.web.formmetadata.metadata.formdom.FormDOM; +import com.inspur.edp.web.formmetadata.service.FormRelateMetadataService; import io.iec.edp.caf.commons.utils.SpringBeanUtils; import io.iec.edp.caf.i18n.framework.api.language.EcpLanguage; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; /** @@ -98,11 +114,7 @@ public class FormMetadataWebServiceImpl implements FormMetadataWebService { */ @Override public ResultMessage replicateForm(ReplicateFormRequestBody replicateFormRequestBody) { - ResultMessage resultMessage = FormMetadataManager.getNewInstance().replicateForm(replicateFormRequestBody.getSourceMetadataId(), - replicateFormRequestBody.getSourceMetadataRelativePath(), - replicateFormRequestBody.getTargetMetadataCode(), - replicateFormRequestBody.getTargetMetadataName(), - replicateFormRequestBody.getTargetProjectName()); + ResultMessage resultMessage = FormMetadataManager.getNewInstance().replicateForm(replicateFormRequestBody.getSourceMetadataId(), replicateFormRequestBody.getSourceMetadataRelativePath(), replicateFormRequestBody.getTargetMetadataCode(), replicateFormRequestBody.getTargetMetadataName(), replicateFormRequestBody.getTargetProjectName()); return resultMessage; } @@ -111,5 +123,35 @@ public class FormMetadataWebServiceImpl implements FormMetadataWebService { FormMetadataCommonService formMetadataCommonService = SpringBeanUtils.getBean(FormMetadataCommonService.class); return formMetadataCommonService.getSuInfoWithBizobjId(bizobjIdEntity.getBizObjId()); } + + /** + * 获取表单关联元数据信息 + * 设计时元数据文件名称及路径参数不能为空 + * 运行时元数据id不能为空 + * + * @param parameter + * @return + */ + @Override + public List getFormRelateMetadata(FormRelateMetadataInDesignParameterDto parameter) { + if (parameter == null) { + throw new WebCustomException("获取表单关联元数据，参数不能为空"); + } + + if (parameter.getEnvironment().equals(ExecuteEnvironment.Design)) { + if (StringUtility.isNullOrEmpty(parameter.getFormMetadataFileName()) || StringUtility.isNullOrEmpty(parameter.getFormMetadataPath())) { + throw new WebCustomException("设计时获取元数据，元数据文件名称及路径不能为空"); + } + } + + if (parameter.getEnvironment().equals(ExecuteEnvironment.Runtime)) { + if (StringUtility.isNullOrEmpty(parameter.getFormMetadataId())) { + throw new WebCustomException("运行时获取元数据，元数据id参数不能为空"); + } + } + + FormRelateMetadataService formRelateMetadataService = SpringBeanUtils.getBean(FormRelateMetadataService.class); + return formRelateMetadataService.getFormRelateMetadata(parameter); + } } diff --git a/web-form-metadata/src/test/java/com/inspur/edp/web/formmetadata/webservice/FormMetadataWebServiceImplTest.java b/web-form-metadata/src/test/java/com/inspur/edp/web/formmetadata/webservice/FormMetadataWebServiceImplTest.java new file mode 100644 index 00000000..f5ddcdfb --- /dev/null +++ b/web-form-metadata/src/test/java/com/inspur/edp/web/formmetadata/webservice/FormMetadataWebServiceImplTest.java @@ -0,0 +1,14 @@ +package com.inspur.edp.web.formmetadata.webservice; + +import org.junit.jupiter.api.Test; + +import java.util.HashMap; + +class FormMetadataWebServiceImplTest { + + @Test + public void testHashMap(){ + HashMaphashMap=new HashMap<>(); + System.out.println(hashMap.get("ffff")); + } +} \ No newline at end of file diff --git a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/zerocode/operation/EapiMetadataOperation.java b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/zerocode/operation/EapiMetadataOperation.java index 6a1182ed..cefd117c 100644 --- a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/zerocode/operation/EapiMetadataOperation.java +++ b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/zerocode/operation/EapiMetadataOperation.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.inspur.edp.lcm.metadata.api.IMetadataContent; import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.formmetadata.metadata.formdom.FormDOM; -import com.inspur.edp.web.jitengine.metadatamanager.EapiMetadataManager; +import com.inspur.edp.web.formmetadata.metadatamanager.EapiMetadataManager; import com.inspur.edp.web.jitruntimebuild.api.entity.JitMetadataTypeEnum; import com.inspur.edp.web.frontendproject.zerocode.ZeroCodeFormParameter; import com.inspur.edp.web.frontendproject.zerocode.ZeroCodeFormRefMetadataParameter; diff --git a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/zerocode/operation/FormMetadataContentOperation.java b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/zerocode/operation/FormMetadataContentOperation.java index dabd842f..801fced1 100644 --- a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/zerocode/operation/FormMetadataContentOperation.java +++ b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/zerocode/operation/FormMetadataContentOperation.java @@ -22,8 +22,8 @@ import com.inspur.edp.web.common.io.FileUtility; import com.inspur.edp.web.common.serialize.SerializeUtility; import com.inspur.edp.web.formmetadata.metadata.FormMetadataContent; import com.inspur.edp.web.formmetadata.metadata.formdom.FormDOM; +import com.inspur.edp.web.formmetadata.metadatamanager.FormMetadataManager; import com.inspur.edp.web.frontendproject.zerocode.ZeroCodeFormFormatParameter; -import com.inspur.edp.web.jitengine.metadatamanager.FormMetadataManager; import com.inspur.edp.web.pageflow.metadata.entity.AdaptedPage; import com.inspur.edp.web.frontendproject.zerocode.ZeroCodeFormParameter; diff --git a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/zerocode/operation/StateMachineMetadataOperation.java b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/zerocode/operation/StateMachineMetadataOperation.java index b73e3abd..dcffa3cb 100644 --- a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/zerocode/operation/StateMachineMetadataOperation.java +++ b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/zerocode/operation/StateMachineMetadataOperation.java @@ -19,7 +19,7 @@ package com.inspur.edp.web.frontendproject.zerocode.operation; import com.inspur.edp.lcm.metadata.api.IMetadataContent; import com.inspur.edp.web.common.environment.ExecuteEnvironment; import com.inspur.edp.web.formmetadata.metadata.formdom.FormDOM; -import com.inspur.edp.web.jitengine.metadatamanager.StateMachineMetadataManager; +import com.inspur.edp.web.formmetadata.metadatamanager.StateMachineMetadataManager; import com.inspur.edp.web.jitruntimebuild.api.entity.JitMetadataTypeEnum; import com.inspur.edp.web.frontendproject.zerocode.ZeroCodeFormParameter; import com.inspur.edp.web.frontendproject.zerocode.ZeroCodeFormRefMetadataParameter; -- Gitee