diff --git a/web-appconfig-core/src/main/java/com/inspur/edp/web/appconfig/core/constants/GspAppConfigConstants.java b/web-appconfig-core/src/main/java/com/inspur/edp/web/appconfig/core/constants/GspAppConfigConstants.java index f9575a408f0ba7279a895db7f49696713b1e07f3..f8d84109f22cedb04de1baeb4ad10eafa2b6ef21 100644 --- a/web-appconfig-core/src/main/java/com/inspur/edp/web/appconfig/core/constants/GspAppConfigConstants.java +++ b/web-appconfig-core/src/main/java/com/inspur/edp/web/appconfig/core/constants/GspAppConfigConstants.java @@ -11,9 +11,4 @@ public final class GspAppConfigConstants */ public static final String APP_CONFIG_NAME = "app.config.json"; - /** - 内部使用路径分隔符 - */ - public static final String INTERNAL_PATH_SEPARATOR = "/"; - } diff --git a/web-common/src/main/java/com/inspur/edp/web/common/constant/FrontendProjectConstant.java b/web-common/src/main/java/com/inspur/edp/web/common/constant/FrontendProjectConstant.java index 3a0e5582b87882e4fd430e8a03a3ede5c15993bc..f4ed68942b1a5f199af5be9e7974350a938dbafb 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/constant/FrontendProjectConstant.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/constant/FrontendProjectConstant.java @@ -1,7 +1,10 @@ package com.inspur.edp.web.common.constant; -import com.inspur.edp.web.common.io.FileUtility; - +/** + * 前端工程常量定义 + * + * @author guozhiqi + */ public final class FrontendProjectConstant { private FrontendProjectConstant() { } @@ -17,38 +20,11 @@ public final class FrontendProjectConstant { */ public static final String NON_FRONTEND_PROJECT_TYPE = "non-frontend"; - /** - * 路由元数据文件后缀 .pf - */ - public static final String ROUTE_METADATA_SUFFIX = ".pf"; - - /** - * 移动路由元数据文件后缀 .mpf - */ - public static final String MOBILE_ROUTE_METADATA_SUFFIX = ".mpf"; - - ///表单常量 - - /** - * PC表单元数据文件后缀 .frm - */ - public static final String FORM_METADATA_SUFFIX = ".frm"; - - /** - * 移动表单元数据文件后缀 .frm - */ - public static final String MOBILE_FORM_METADATA_SUFFIX = ".mfrm"; - /** * 前端工程PC表单编译目录 */ public static final String FRONTEND_PROJECT_COMPILE_PATH = "src"; - /** - * 前端工程PC表单生成目录 - */ - public static final String PROJECT_GENERATE_PATH = "app"; - /** * 前端工程PC表单生成目录（Babel） */ @@ -61,26 +37,11 @@ public final class FrontendProjectConstant { public static final String PROJECT_GENDER_PATH_FOR_DYNAMIC_FORM = "dynamicform"; - /** - * 前端工程移动表单生成目录 - */ - public static final String PROJECT_MOBILE_GENERATE_PATH = "mobileapp"; - /** * 前端工程构建目录 */ public static final String PROJECT_BUILD_PATH = "dist-rollup"; - /** - * 表单解析目录 - */ - public static final String FORM_RESOLVE_PATH = "webdev"; - - /** - * 移动表单解析目录 - */ - public static final String MOBILE_FORM_RESOLVE_PATH = "mobiledev"; - /** * 命令服务生成目录 */ @@ -96,95 +57,4 @@ public final class FrontendProjectConstant { */ public static final String PROJECT_PUBLISH_PATH = "publish"; - /** - * PC表单部署路径 - */ - public static final String FORM_PUBLISH_PATH = "web"; - - /** - * 移动表单部署路径 - * mobile 简写 - */ - public static final String MOBILE_FORM_PUBLISH_PATH = "mob"; - - /** - * 服务相对当前工程的生成目录 - */ - public static final String SERVICES_RELATIVE_PRODUCT_PATH = FileUtility.combine(FRONTEND_PROJECT_COMPILE_PATH, FORM_RESOLVE_PATH, COMMAND_SERVICES_PRODUCT_PATH); - - /** - * 服务相对当前工程的生成目录 - */ - public static final String SERVICES_RELATIVE_PRODUCT_Dynamic_PATH = FileUtility.combine(FRONTEND_PROJECT_COMPILE_PATH, PROJECT_GENERATE_PATH_FOR_Dynamic, COMMAND_SERVICES_PRODUCT_PATH); - - /** - * 移动服务相对当前工程的生成目录 - */ - public static final String MOBILE_SERVICES_RELATIVE_PRODUCT_PATH = FileUtility.combine(FRONTEND_PROJECT_COMPILE_PATH, MOBILE_FORM_RESOLVE_PATH, COMMAND_SERVICES_PRODUCT_PATH); - - /** - * 待部署工程相对当前工程的生成目录 - */ - public static final String DEPLOYABLE_PROJECT_RELATIVE_PRODUCT_PATH = FileUtility.combine(FRONTEND_PROJECT_COMPILE_PATH, PROJECT_GENERATE_PATH, PROJECT_BUILD_PATH); - - /** - * 待部署工程相对当前工程的生成目录 - */ - public static final String DEPLOYABLE_PROJECT_RELATIVE_PRODUCT_Dynamic_PATH = FileUtility.combine(FRONTEND_PROJECT_COMPILE_PATH, PROJECT_GENERATE_PATH_FOR_Dynamic, "dynamicform"); - - /** - * 移动表单待部署工程相对当前工程的生成目录 - */ - public static final String MOBILE_DEPLOYABLE_PROJECT_RELATIVE_PRODUCT_PATH = FileUtility.combine(FRONTEND_PROJECT_COMPILE_PATH, PROJECT_MOBILE_GENERATE_PATH, PROJECT_BUILD_PATH); - - /** - * PC表单多语资源相对工程的生成目录 - */ - public static final String PC_I18N_RESOURCE_RELATIVE_PRODUCT_PATH = FileUtility.combine(FRONTEND_PROJECT_COMPILE_PATH, FORM_RESOLVE_PATH, I18N_SRESOURCE_PATH); - - /** - * 移动表单多语资源相对工程的生成目录 - */ - public static final String MOBILE_I18N_RESOURCE_RELATIVE_PRODUCT_PATH = FileUtility.combine(FRONTEND_PROJECT_COMPILE_PATH, MOBILE_FORM_RESOLVE_PATH, I18N_SRESOURCE_PATH); - - /** - * PC表单相对工程的部署目录 - */ - public static final String PROJECT_PC_RELATIVE_PUBLISH_PATH = java.nio.file.Paths.get(FRONTEND_PROJECT_COMPILE_PATH).resolve(FORM_PUBLISH_PATH).toString(); - - /** - * 移动表单相对工程的部署目录 - */ - public static final String PROJECT_MOBILE_RELATIVE_PUBLISH_PATH = java.nio.file.Paths.get(FRONTEND_PROJECT_COMPILE_PATH).resolve(MOBILE_FORM_PUBLISH_PATH).toString(); - - /** - * PC表单相对工程的解析目录 - */ - public static final String PROJECT_PC_RELATIVE_RESOLVE_PATH = java.nio.file.Paths.get(FRONTEND_PROJECT_COMPILE_PATH).resolve(FORM_RESOLVE_PATH).toString(); - - /** - * PC 解析表单相对工程的解析目录 - */ - public static final String PROJECT_PC_RELATIVE_RESOLVE_Dynamic_PATH = java.nio.file.Paths.get(FRONTEND_PROJECT_COMPILE_PATH).resolve(PROJECT_GENERATE_PATH_FOR_Dynamic).toString(); - - /** - * 移动表单相对工程的解析目录 - */ - public static final String PROJECT_MOBILE_RELATIVE_RESOLVE_PATH = java.nio.file.Paths.get(FRONTEND_PROJECT_COMPILE_PATH).resolve(MOBILE_FORM_RESOLVE_PATH).toString(); - - /** - * PC表单相对工程的生成目录 - */ - public static final String PROJECT_PC_RELATIVE_GENERATE_PATH = java.nio.file.Paths.get(FRONTEND_PROJECT_COMPILE_PATH).resolve(PROJECT_GENERATE_PATH).toString(); - - /** - * PC表单相对工程的生成目录 - */ - public static final String PROJECT_PC_RELATIVE_GENERATE_Dynamic_PATH = java.nio.file.Paths.get(FRONTEND_PROJECT_COMPILE_PATH).resolve(PROJECT_GENERATE_PATH_FOR_Dynamic).toString(); - - /** - * 移动表单相对工程的生成目录 - */ - public static final String PROJECT_MOBILE_RELATIVE_GENERATE_PATH = java.nio.file.Paths.get(FRONTEND_PROJECT_COMPILE_PATH).resolve(PROJECT_MOBILE_GENERATE_PATH).toString(); - } diff --git a/web-common/src/main/java/com/inspur/edp/web/common/constant/LanguageConstant.java b/web-common/src/main/java/com/inspur/edp/web/common/constant/LanguageConstant.java deleted file mode 100644 index 016d045b667929808b5545fba52620ae51df8bb0..0000000000000000000000000000000000000000 --- a/web-common/src/main/java/com/inspur/edp/web/common/constant/LanguageConstant.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.inspur.edp.web.common.constant; - - -/** - * 语言代码表 - */ -public class LanguageConstant { - private LanguageConstant() { - } - ///语言代码表，参考 ISO 639-1:2002 - - /** - * 中文 - */ - public static final String ZH = "zh"; - - /** - * 英文 - */ - public static final String EN = "en"; -} diff --git a/web-common/src/main/java/com/inspur/edp/web/common/constant/MetadataConstant.java b/web-common/src/main/java/com/inspur/edp/web/common/constant/MetadataConstant.java deleted file mode 100644 index 8c25a0c6a28c3010167030ff0badb0345caa62ec..0000000000000000000000000000000000000000 --- a/web-common/src/main/java/com/inspur/edp/web/common/constant/MetadataConstant.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.inspur.edp.web.common.constant; - -/** - * 元数据 - */ -public class MetadataConstant { - private MetadataConstant() { - } - ///元数据相关常量 - - /** - * 表单元数据类型 - */ - public static final String FORM_METADATA_TYPE = "Form"; - - /** - * 移动表单元数据类型 - */ - public static final String MOBILE_FORM_METADATA_TYPE = "MobileForm"; - -} diff --git a/web-common/src/main/java/com/inspur/edp/web/common/entity/TerminalType.java b/web-common/src/main/java/com/inspur/edp/web/common/entity/TerminalType.java index cddd62cdaea7e0b67a714c17da6b83ed3f7b3ae7..4095e2fc6d6f0754711ed32f5c3cf931f2433b82 100644 --- a/web-common/src/main/java/com/inspur/edp/web/common/entity/TerminalType.java +++ b/web-common/src/main/java/com/inspur/edp/web/common/entity/TerminalType.java @@ -2,15 +2,29 @@ package com.inspur.edp.web.common.entity; import com.inspur.edp.web.common.constant.FrontendProjectConstant; import com.inspur.edp.web.common.io.FileUtility; +import lombok.Data; +import java.util.ArrayList; +import java.util.List; + +/** + * 表单类型 + * 分为PC 表单和移动表单 + * + * @author guozhiqi + */ public enum TerminalType { /** * 个人电脑 */ PC { + /** + * PC 表单对应的文件后缀 .frm + * @return + */ @Override public String getFormMetadataSuffix() { - return FrontendProjectConstant.FORM_METADATA_SUFFIX; + return ".frm"; } @Override @@ -23,6 +37,10 @@ public enum TerminalType { return "app"; } + /** + * pc 表单的webdev文件目录名称 webdev + * @return + */ @Override public String getWebDevPathName() { return "webdev"; @@ -34,23 +52,48 @@ public enum TerminalType { if (isDynamicForm) { resolveBasePath = FileUtility.combineOptional(projectPath, FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH, FrontendProjectConstant.PROJECT_GENERATE_PATH_FOR_Dynamic, FrontendProjectConstant.PROJECT_GENDER_PATH_FOR_DYNAMIC_FORM); } else { - resolveBasePath = FileUtility.combineOptional(projectPath, FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH, FrontendProjectConstant.FORM_RESOLVE_PATH); + resolveBasePath = FileUtility.combineOptional(projectPath, FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH, this.getWebDevPathName()); } return resolveBasePath; } + + /** + * 获取PC 对应的publish 文件目录名称 web + * @return + */ + @Override + public String getPublishPathName() { + return "web"; + } + + @Override + public RouteMetadata getRouteMetadata() { + RouteMetadata routeMetadata = new RouteMetadata(); + routeMetadata.setCode("predefinePageflow"); + routeMetadata.setType("PageFlowMetadata"); + routeMetadata.setFileSuffix(".pf"); + routeMetadata.setFileName(routeMetadata.getCode() + routeMetadata.getFileSuffix()); + return routeMetadata; + } + + @Override + public String getMetadataType() { + return "Form"; + } + }, /** * 移动设备 */ MOBILE { /** - * 获取对应类型的表单元数据的后缀格式 + * 移动表单对应的文件后缀 .mfrm * * @return */ @Override public String getFormMetadataSuffix() { - return FrontendProjectConstant.MOBILE_FORM_METADATA_SUFFIX; + return ".mfrm"; } @Override @@ -58,11 +101,19 @@ public enum TerminalType { return "移动表单"; } + /** + * 移动表单生成位置 mobileapp + * @return + */ @Override public String getAppPathName() { return "mobileapp"; } + /** + * 移动表单对应的webdev目录名称 mobiledev + * @return + */ @Override public String getWebDevPathName() { return "mobiledev"; @@ -70,7 +121,35 @@ public enum TerminalType { @Override public String getResolveBasePath(String projectPath, boolean isDynamicForm) { - return FileUtility.combine(projectPath, FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH, FrontendProjectConstant.MOBILE_FORM_RESOLVE_PATH); + return FileUtility.combine(projectPath, FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH, this.getWebDevPathName()); + } + + /** + * 获取移动表单对应的publish 目录路径名称 mob + * @return + */ + @Override + public String getPublishPathName() { + return "mob"; + } + + @Override + public RouteMetadata getRouteMetadata() { + RouteMetadata routeMetadata = new RouteMetadata(); + routeMetadata.setCode("predefineMobilePageflow"); + routeMetadata.setType("MobilePageFlowMetadata"); + routeMetadata.setFileSuffix(".mpf"); + routeMetadata.setFileName(routeMetadata.getCode() + routeMetadata.getFileSuffix()); + return routeMetadata; + } + + /** + * 获取移动关联的元数据类型 MobileForm + * @return + */ + @Override + public String getMetadataType() { + return "MobileForm"; } }; @@ -83,21 +162,24 @@ public enum TerminalType { /** * 获取表单类型对应的name参数值 + * * @return */ public abstract String getFormName(); /** * 获取对应的app路径名称 + * * @return */ - public abstract String getAppPathName(); + public abstract String getAppPathName(); /** * 获取关联的webdev 目录路径名称 + * * @return */ - public abstract String getWebDevPathName(); + public abstract String getWebDevPathName(); /** * 获取指定类型的resolve 基础路径 @@ -111,5 +193,83 @@ public enum TerminalType { */ public abstract String getResolveBasePath(String projectPath, boolean isDynamicForm); + /** + * 获取对应表单类型的publish 目录名称 + * + * @return + */ + public abstract String getPublishPathName(); + + /** + * 获取对应的页面流定义 + * + * @return + */ + public abstract RouteMetadata getRouteMetadata(); + + /** + * 获取关联得元数据类型 + * + * @return + */ + public abstract String getMetadataType(); + + /** + * 获取表单相对路径，相对于metadata目录 + * 获取PC 相对于metadata的目录路径，类似于 src/webdev/services 或 src/mobiledev/services + * + * @return + */ + public String getServiceRelativePath() { + return FileUtility.combine(FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH, this.getWebDevPathName(), FrontendProjectConstant.COMMAND_SERVICES_PRODUCT_PATH); + } + + /** + * 获取工程目录中待部署脚本的路径，类似于 src/app/dist-rollup 或 src/mobileapp/dist-rollup + * + * @return + */ + public String getDeployableProjectRelativePath() { + return FileUtility.combine(FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH, this.getAppPathName(), FrontendProjectConstant.PROJECT_BUILD_PATH); + } + + /** + * 获取i18n 资源文件在webdev中的部署目录，类似于 src/webdev/i18n 或 src/mobiledev/i18n + * + * @return + */ + public String getWebDevI18nRelativePath() { + return FileUtility.combine(FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH, this.getWebDevPathName(), FrontendProjectConstant.I18N_SRESOURCE_PATH); + } + + /** + * 获取定义的表单类型列表 + * static 定义 不通过具体的枚举值获取 + * + * @return + */ + public static List getAllTypeSuffixList() { + List suffixList = new ArrayList<>(); + TerminalType[] arrTerminalType = TerminalType.values(); + for (TerminalType terminalTypeItem : arrTerminalType) { + suffixList.add(terminalTypeItem.getFormMetadataSuffix()); + } + return suffixList; + } + + /** + * 关联页面流常量定义 + */ + @Data + public static class RouteMetadata { + /** + * 关联页面流code + */ + private String code; + private String fileName; + private String type; + private String fileSuffix; + + } } diff --git a/web-common/src/test/java/com/inspur/edp/web/common/entity/TerminalTypeTest.java b/web-common/src/test/java/com/inspur/edp/web/common/entity/TerminalTypeTest.java new file mode 100644 index 0000000000000000000000000000000000000000..e34b3a4448f42684d131ee3af2cfc7673fd8856b --- /dev/null +++ b/web-common/src/test/java/com/inspur/edp/web/common/entity/TerminalTypeTest.java @@ -0,0 +1,18 @@ +package com.inspur.edp.web.common.entity; + +import org.junit.Test; + +import java.util.List; + +import static org.junit.Assert.*; + +public class TerminalTypeTest { + + @Test + public void getAllTypeSuffixList() { + List terminalTypeSuffixList = TerminalType.getAllTypeSuffixList(); + assertEquals(terminalTypeSuffixList.size(), 2); + assertEquals(terminalTypeSuffixList.contains(TerminalType.PC.getFormMetadataSuffix()), true); + assertEquals(terminalTypeSuffixList.contains(TerminalType.MOBILE.getFormMetadataSuffix()), true); + } +} \ No newline at end of file diff --git a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/JITEngineManager.java b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/JITEngineManager.java index 3efa969d5d7614e0802f5752756dff97c727feec..f5004e1ddf94c5d23890798866f250e8fed9750b 100644 --- a/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/JITEngineManager.java +++ b/web-form-jitengine/src/main/java/com/inspur/edp/web/jitengine/JITEngineManager.java @@ -222,13 +222,13 @@ public class JITEngineManager { switch (terminalType) { case PC: if (isJieXiForm) { - projectFormRelativeResolvePath = FrontendProjectConstant.PROJECT_PC_RELATIVE_RESOLVE_Dynamic_PATH; + projectFormRelativeResolvePath = java.nio.file.Paths.get(FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH).resolve(FrontendProjectConstant.PROJECT_GENERATE_PATH_FOR_Dynamic).toString(); } else { - projectFormRelativeResolvePath = FrontendProjectConstant.PROJECT_PC_RELATIVE_RESOLVE_PATH; + projectFormRelativeResolvePath = java.nio.file.Paths.get(FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH).resolve(TerminalType.PC.getWebDevPathName()).toString(); } break; case MOBILE: - projectFormRelativeResolvePath = FrontendProjectConstant.PROJECT_MOBILE_RELATIVE_RESOLVE_PATH; + projectFormRelativeResolvePath = java.nio.file.Paths.get(FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH).resolve(TerminalType.MOBILE.getWebDevPathName()).toString(); break; default: throw new GSPException("Web_GetProjectFormRelativeResolvePath", "未识别的终端类型，请联系管理员处理。当前终端类型是：" + terminalType); @@ -249,13 +249,13 @@ public class JITEngineManager { switch (terminalType) { case PC: if (isJieXiForm) { - projectFormRelativeGeneratePath = FrontendProjectConstant.PROJECT_PC_RELATIVE_GENERATE_Dynamic_PATH; + projectFormRelativeGeneratePath = java.nio.file.Paths.get(FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH).resolve(FrontendProjectConstant.PROJECT_GENERATE_PATH_FOR_Dynamic).toString(); } else { - projectFormRelativeGeneratePath = FrontendProjectConstant.PROJECT_PC_RELATIVE_GENERATE_PATH; + projectFormRelativeGeneratePath = java.nio.file.Paths.get(FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH).resolve(TerminalType.PC.getAppPathName()).toString(); } break; case MOBILE: - projectFormRelativeGeneratePath = FrontendProjectConstant.PROJECT_MOBILE_RELATIVE_GENERATE_PATH; + projectFormRelativeGeneratePath = java.nio.file.Paths.get(FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH).resolve(TerminalType.MOBILE.getAppPathName()).toString(); break; default: throw new GSPException("Web_GetProjectFormRelativeGeneratePath", "未识别的终端类型，请联系管理员处理。当前终端类型是：" + terminalType); @@ -655,10 +655,10 @@ public class JITEngineManager { String projectBuildPath = ""; switch (terminalType) { case PC: - projectBuildPath = FileUtility.combine(projectPath, FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH, FrontendProjectConstant.PROJECT_GENERATE_PATH); + projectBuildPath = FileUtility.combine(projectPath, FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH, TerminalType.PC.getAppPathName()); break; case MOBILE: - projectBuildPath = FileUtility.combine(projectPath, FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH, FrontendProjectConstant.PROJECT_MOBILE_GENERATE_PATH); + projectBuildPath = FileUtility.combine(projectPath, FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH, TerminalType.MOBILE.getAppPathName()); break; default: throw new GSPException("WEB_GetProjectBuildPath", "暂不支持的终端类型：" + terminalType + "。请联系管理员处理。"); diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/event/FormMetadataSaveEventListener.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/event/FormMetadataSaveEventListener.java index eaa1a3132939a58447ed7f75a8404c1c5590db79..008477d7359f642792f00a58c8562ab79473e069 100644 --- a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/event/FormMetadataSaveEventListener.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/event/FormMetadataSaveEventListener.java @@ -5,7 +5,7 @@ import com.inspur.edp.lcm.metadata.api.entity.MetadataProject; import com.inspur.edp.lcm.metadata.api.service.MetadataProjectService; import com.inspur.edp.lcm.metadata.spi.event.MetadataEventArgs; import com.inspur.edp.lcm.metadata.spi.event.MetadataEventListener; -import com.inspur.edp.web.common.constant.MetadataConstant; +import com.inspur.edp.web.common.entity.TerminalType; import com.inspur.edp.web.common.io.FileUtility; import com.inspur.edp.web.common.logger.WebLogger; import com.inspur.edp.web.common.metadata.MetadataUtility; @@ -39,7 +39,7 @@ public class FormMetadataSaveEventListener implements MetadataEventListener { } - if (MetadataConstant.FORM_METADATA_TYPE.equals(metadataEventArgs.getMetadata().getHeader().getType())) { + if (TerminalType.PC.getMetadataType().equals(metadataEventArgs.getMetadata().getHeader().getType())) { // 同步本地语言包 SyncLocalLanguagePackage(metadataEventArgs.getMetadata()); } @@ -56,7 +56,7 @@ public class FormMetadataSaveEventListener implements MetadataEventListener { return; } - if (MetadataConstant.FORM_METADATA_TYPE.equals(metadataEventArgs.getMetadata().getHeader().getType())) { + if (TerminalType.PC.getMetadataType().equals(metadataEventArgs.getMetadata().getHeader().getType())) { try { // 获取表单元数据的文件名称 String metaDataCode = metadataEventArgs.getMetadata().getHeader().getCode(); @@ -150,7 +150,7 @@ public class FormMetadataSaveEventListener implements MetadataEventListener { } } - if (MetadataConstant.FORM_METADATA_TYPE.equals(metadataEventArgs.getMetadata().getHeader().getType())) { + if (TerminalType.PC.getMetadataType().equals(metadataEventArgs.getMetadata().getHeader().getType())) { try { // 获取表单元数据的文件名称 String metaDataCode = metadataEventArgs.getMetadata().getHeader().getCode(); diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/lic/FormMetadataCreateLicControlListener.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/lic/FormMetadataCreateLicControlListener.java index b96390ad1f7f51dcb4a0d232298e8ddb15ba9a13..d691098daecfda72321c3680579816042e3d2bcf 100644 --- a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/lic/FormMetadataCreateLicControlListener.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/lic/FormMetadataCreateLicControlListener.java @@ -2,7 +2,7 @@ package com.inspur.edp.web.formmetadata.lic; import com.inspur.edp.lcm.metadata.spi.lic.LicControlExtendForIde; import com.inspur.edp.lcm.metadata.spi.lic.MetadataCreateLicControlContext; -import com.inspur.edp.web.common.constant.MetadataConstant; +import com.inspur.edp.web.common.entity.TerminalType; import com.inspur.edp.web.common.utility.StringUtility; import io.iec.edp.caf.commons.utils.SpringBeanUtils; import io.iec.edp.caf.licservice.api.manager.StandardControlFactory; @@ -51,12 +51,12 @@ public class FormMetadataCreateLicControlListener implements LicControlExtendFor this.MODULE_WITH_METADATA_TYPE_LIST = new ArrayList<>(2); ModuleWithMetadataType formModuleType = new ModuleWithMetadataType(); formModuleType.setModuleType("WDP"); - formModuleType.getMetadataTypeList().add(MetadataConstant.FORM_METADATA_TYPE); + formModuleType.getMetadataTypeList().add(TerminalType.PC.getMetadataType()); this.MODULE_WITH_METADATA_TYPE_LIST.add(formModuleType); ModuleWithMetadataType mobileFormModuleType = new ModuleWithMetadataType(); mobileFormModuleType.setModuleType("MDP"); - mobileFormModuleType.getMetadataTypeList().add(MetadataConstant.MOBILE_FORM_METADATA_TYPE); + mobileFormModuleType.getMetadataTypeList().add(TerminalType.MOBILE.getMetadataType()); this.MODULE_WITH_METADATA_TYPE_LIST.add(mobileFormModuleType); } diff --git a/web-form-metadata/src/test/java/com/inspur/edp/web/formmetadata/lic/FormMetadataCreateLicControlListenerTest.java b/web-form-metadata/src/test/java/com/inspur/edp/web/formmetadata/lic/FormMetadataCreateLicControlListenerTest.java index aadd31cc53ee9a724aad8b028f50bf43add5e02f..ec34f08762c615c9213227c35af53990bd66a85f 100644 --- a/web-form-metadata/src/test/java/com/inspur/edp/web/formmetadata/lic/FormMetadataCreateLicControlListenerTest.java +++ b/web-form-metadata/src/test/java/com/inspur/edp/web/formmetadata/lic/FormMetadataCreateLicControlListenerTest.java @@ -1,6 +1,6 @@ package com.inspur.edp.web.formmetadata.lic; -import com.inspur.edp.web.common.constant.MetadataConstant; +import com.inspur.edp.web.common.entity.TerminalType; import org.junit.Test; import java.util.ArrayList; @@ -16,12 +16,12 @@ public class FormMetadataCreateLicControlListenerTest { List MODULE_WITH_METADATA_TYPE_LIST = new ArrayList<>(); ModuleWithMetadataType formModuleType = new ModuleWithMetadataType(); formModuleType.setModuleType("WDP"); - formModuleType.getMetadataTypeList().add(MetadataConstant.FORM_METADATA_TYPE); + formModuleType.getMetadataTypeList().add(TerminalType.PC.getMetadataType()); MODULE_WITH_METADATA_TYPE_LIST.add(formModuleType); ModuleWithMetadataType mobileFormModuleType = new ModuleWithMetadataType(); mobileFormModuleType.setModuleType("MDP"); - mobileFormModuleType.getMetadataTypeList().add(MetadataConstant.MOBILE_FORM_METADATA_TYPE); + mobileFormModuleType.getMetadataTypeList().add(TerminalType.MOBILE.getMetadataType()); MODULE_WITH_METADATA_TYPE_LIST.add(mobileFormModuleType); String metaType = "Form"; diff --git a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/FrontendProjectDeployer.java b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/FrontendProjectDeployer.java index 24efb57666ac674674ddd4018c4601bd1e02cb44..c1871bbc71ae091851685c2d5cce56f1f83b6f26 100644 --- a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/FrontendProjectDeployer.java +++ b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/FrontendProjectDeployer.java @@ -116,10 +116,7 @@ public class FrontendProjectDeployer { * @param terminalType 表单类型，分类PC和移动表单 */ private void deploy(String projectPath, String projectName, TerminalType terminalType, boolean isSingleDynamicForm) { -// this.deployInfo(projectPath, projectName, terminalType, true); -// if (!isSingleDynamicForm && terminalType == TerminalType.PC) { this.deployInfo(projectPath, projectName, terminalType, false); -// } } private void deployInfo(String projectPath, String projectName, TerminalType terminalType, boolean isJieXiForm) { @@ -242,10 +239,10 @@ public class FrontendProjectDeployer { * @param isBabel */ private void copyI18nResource(String projectPath, String targetPath, String projectName, TerminalType terminalType, boolean isBabel) { - String i18nResourceRelavtivePath = FrontendProjectUtility.getI18nResourceRelativeProductPath(terminalType); + String i18nResourceRelavtivePath = terminalType.getWebDevI18nRelativePath(); String sourceI18nResourcePath = java.nio.file.Paths.get(projectPath).resolve(i18nResourceRelavtivePath).toString(); - String formPublishPath = FrontendProjectUtility.getFormPublishPath(terminalType); + String formPublishPath = terminalType.getPublishPathName(); String targetI18nResourcePath = FileUtility.combine(targetPath, formPublishPath, projectName); if (isBabel) { targetI18nResourcePath = FileUtility.combine(targetPath, formPublishPath, projectName + "forbabel"); @@ -264,7 +261,7 @@ public class FrontendProjectDeployer { return; } - String formPublishPath = FrontendProjectUtility.getFormPublishPath(terminalType); + String formPublishPath = terminalType.getPublishPathName(); String destinationPath = FileUtility.combine(destinationBasePath, formPublishPath, projectName); copyProducts(sourcePath, destinationPath); @@ -277,7 +274,7 @@ public class FrontendProjectDeployer { if (StringUtility.isNullOrEmpty(projectName) || StringUtility.isNullOrEmpty(sourcePath) || StringUtility.isNullOrEmpty(destinationBasePath)) { return; } - String destinationPath = FileUtility.combine(destinationBasePath, FrontendProjectConstant.FORM_PUBLISH_PATH, projectName + "forbabel"); + String destinationPath = FileUtility.combine(destinationBasePath, TerminalType.PC.getPublishPathName(), projectName + "forbabel"); copyProducts(sourcePath, destinationPath); } diff --git a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/FrontendProjectExtractor.java b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/FrontendProjectExtractor.java index ec288138c25969c9a899dc3015f3bfbf1fd9f2dc..2a5a000a10d7f0b58526466b0f9d91db026af1d6 100644 --- a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/FrontendProjectExtractor.java +++ b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/FrontendProjectExtractor.java @@ -69,7 +69,7 @@ public class FrontendProjectExtractor implements ExtractAction { projectPath = FileUtility.combine(projectPath, "metadata"); String sourceDynamicFormJs = TerminalType.PC.getResolveBasePath(projectPath, true); if (FileUtility.exists(sourceDynamicFormJs)) { - String formPublishPath = FrontendProjectUtility.getFormPublishPath(terminalType); + String formPublishPath = terminalType.getPublishPathName(); String targetExtractPath = FileUtility.combine(targetExtractBasePath, formPublishPath, projectName); FileUtility.copyFolder(sourceDynamicFormJs, targetExtractPath); } @@ -117,10 +117,10 @@ public class FrontendProjectExtractor implements ExtractAction { } private void copyI18nResource(String projectPath, String targetPath, String projectName, TerminalType terminalType) { - String i18nResourceRelavtivePath = FrontendProjectUtility.getI18nResourceRelativeProductPath(terminalType); + String i18nResourceRelavtivePath = terminalType.getWebDevI18nRelativePath(); String sourceI18nResourcePath = java.nio.file.Paths.get(projectPath).resolve(i18nResourceRelavtivePath).toString(); - String formPublishPath = FrontendProjectUtility.getFormPublishPath(terminalType); + String formPublishPath = terminalType.getPublishPathName(); String targetI18nResourcePath = FileUtility.combine(targetPath, formPublishPath, projectName); if ((new java.io.File(sourceI18nResourcePath)).isDirectory()) { @@ -138,7 +138,7 @@ public class FrontendProjectExtractor implements ExtractAction { if (StringUtility.isNullOrEmpty(projectName) || StringUtility.isNullOrEmpty(sourceExtractPath) || StringUtility.isNullOrEmpty(targetExtractBasePath)) { return; } - String formPublishPath = FrontendProjectUtility.getFormPublishPath(terminalType); + String formPublishPath = terminalType.getPublishPathName(); String targetExtractPath = FileUtility.combine(targetExtractBasePath, formPublishPath, projectName); copyExtract(sourceExtractPath, targetExtractPath); } diff --git a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/FrontendProjectUtility.java b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/FrontendProjectUtility.java index 1a9aa25a12e8959429c6495fb13921e29e166cb7..1ab9d7b5b31f571974033229b956806ee7382a44 100644 --- a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/FrontendProjectUtility.java +++ b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/FrontendProjectUtility.java @@ -43,10 +43,10 @@ public class FrontendProjectUtility { /** * 获取工程包含的表单个数 */ - public static List getAllTypeFormMetadata(String projectPath) { + private static List getAllTypeFormMetadata(String projectPath) { MetadataService metadataProjectService = SpringBeanUtils.getBean(MetadataService.class); // .frm 和 .mfrm 后缀 - return metadataProjectService.getMetadataList(projectPath, new ArrayList<>(Arrays.asList(FrontendProjectConstant.FORM_METADATA_SUFFIX, FrontendProjectConstant.MOBILE_FORM_METADATA_SUFFIX))); + return metadataProjectService.getMetadataList(projectPath, TerminalType.getAllTypeSuffixList()); } /** @@ -67,13 +67,13 @@ public class FrontendProjectUtility { switch (terminalType) { case PC: if (isJieXiForm) { - projectProductPath = FrontendProjectConstant.DEPLOYABLE_PROJECT_RELATIVE_PRODUCT_Dynamic_PATH; + projectProductPath = FileUtility.combine(FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH, FrontendProjectConstant.PROJECT_GENERATE_PATH_FOR_Dynamic, "dynamicform"); } else { - projectProductPath = FrontendProjectConstant.DEPLOYABLE_PROJECT_RELATIVE_PRODUCT_PATH; + projectProductPath = terminalType.getDeployableProjectRelativePath(); } break; case MOBILE: - projectProductPath = FrontendProjectConstant.MOBILE_DEPLOYABLE_PROJECT_RELATIVE_PRODUCT_PATH; + projectProductPath = terminalType.getDeployableProjectRelativePath(); break; default: throw new GSPException("Web_GetProjectRelativeProductPath", "未识别的终端类型，请联系管理员处理。当前终端类型是：" + terminalType); @@ -97,46 +97,6 @@ public class FrontendProjectUtility { return FileUtility.combine(projectPath, FrontendProjectUtility.getProjectRelativeProductPath(terminalType, isJieXiForm), projectName); } - /** - * 获取表单部署目录 - */ - public static String getFormPublishPath(TerminalType terminalType) { - String formPublishPath = ""; - - switch (terminalType) { - case PC: - formPublishPath = FrontendProjectConstant.FORM_PUBLISH_PATH; - break; - case MOBILE: - formPublishPath = FrontendProjectConstant.MOBILE_FORM_PUBLISH_PATH; - break; - default: - throw new GSPException("Web_GetFormPublishPath", "未识别的终端类型，请联系管理员处理。当前终端类型是：" + terminalType); - } - - return formPublishPath; - } - - /** - * 获取待部署工程相对当前工程的生成路径 - */ - public static String getI18nResourceRelativeProductPath(TerminalType terminalType) { - String i18nResourceRelativePath = ""; - - switch (terminalType) { - case PC: - i18nResourceRelativePath = FrontendProjectConstant.PC_I18N_RESOURCE_RELATIVE_PRODUCT_PATH; - break; - case MOBILE: - i18nResourceRelativePath = FrontendProjectConstant.MOBILE_I18N_RESOURCE_RELATIVE_PRODUCT_PATH; - break; - default: - throw new GSPException("Web_GetI18nResourceRelativeProductPath", "未识别的终端类型，请联系管理员处理。当前终端类型是：" + terminalType); - } - - return i18nResourceRelativePath; - } - /** * 获取表单使用服务的相对生成路径 @@ -146,14 +106,14 @@ public class FrontendProjectUtility { switch (terminalType) { case PC: if (isJieXiForm) { - serviceRelativeProductPath = FrontendProjectConstant.SERVICES_RELATIVE_PRODUCT_Dynamic_PATH; + serviceRelativeProductPath = FileUtility.combine(FrontendProjectConstant.FRONTEND_PROJECT_COMPILE_PATH, FrontendProjectConstant.PROJECT_GENERATE_PATH_FOR_Dynamic, FrontendProjectConstant.COMMAND_SERVICES_PRODUCT_PATH); } else { - serviceRelativeProductPath = FrontendProjectConstant.SERVICES_RELATIVE_PRODUCT_PATH; + serviceRelativeProductPath = terminalType.getServiceRelativePath(); } break; case MOBILE: // 待生成service文件夹路径 - serviceRelativeProductPath = FrontendProjectConstant.MOBILE_SERVICES_RELATIVE_PRODUCT_PATH; + serviceRelativeProductPath = terminalType.getServiceRelativePath(); break; default: throw new GSPException("Web_GetServiceRelativeProductPath", "未识别的终端类型，请联系管理员处理。当前终端类型是：" + terminalType); diff --git a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/debuguri/FormMetadataDebugUriWithMobile.java b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/debuguri/FormMetadataDebugUriWithMobile.java index 99bb58bb509ea89008a65e9056779b9b67dffef0..a2655b977cda9cf2cc664c4644497b88e6e762ae 100644 --- a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/debuguri/FormMetadataDebugUriWithMobile.java +++ b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/debuguri/FormMetadataDebugUriWithMobile.java @@ -41,7 +41,7 @@ public class FormMetadataDebugUriWithMobile extends AbstractFormMetadataDebugUri // RefCommonService refCommonService = SpringBeanUtils.getBean(RefCommonService.class); // GspMetadata metadata = refCommonService.getRefMetadata(formMetadataId); // 进行元数据的调用借口获取方式调整 - GspMetadata metadata=MetadataUtility.getInstance().getMetadataWithEnvironment(formMetadataId, ExecuteEnvironment.Design,false); + GspMetadata metadata = MetadataUtility.getInstance().getMetadataWithEnvironment(formMetadataId, ExecuteEnvironment.Design, false); FormMetadataContent formMetadataContent = (FormMetadataContent) metadata.getContent(); FormDOM formDom = FormMetadataContentService.getInstance().getFormContent(formMetadataContent); HashMap component = null; @@ -73,7 +73,7 @@ public class FormMetadataDebugUriWithMobile extends AbstractFormMetadataDebugUri String projectName = GspProjectUtil.getProjectName(metadataProject.getProjectPath()); - String formPublishPath = FrontendProjectUtility.getFormPublishPath(TerminalType.MOBILE); + String formPublishPath = TerminalType.MOBILE.getPublishPathName(); return "/" + gspProject.getSuDeploymentPath().toLowerCase() + "/" + formPublishPath + "/" + projectName + "/" + "index.html" + "#" + "/" + formRouteUri + "/" + defaultPageUri; } diff --git a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/debuguri/FormMetadataDebugUriWithPC.java b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/debuguri/FormMetadataDebugUriWithPC.java index 531dd3b7247cc2424e961b367ba6fb579f1102c8..98adf73714d6c6522142e7b308efd4f4de02993f 100644 --- a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/debuguri/FormMetadataDebugUriWithPC.java +++ b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/debuguri/FormMetadataDebugUriWithPC.java @@ -32,7 +32,7 @@ public class FormMetadataDebugUriWithPC extends AbstractFormMetadataDebugUri { String projectName = GspProjectUtil.getProjectName(metadataProject.getProjectPath()); - return deploymentPath + "/" + FrontendProjectConstant.FORM_PUBLISH_PATH + "/" + projectName + "/" + "index.html" + "#" + routeUri; + return deploymentPath + "/" + TerminalType.PC.getPublishPathName() + "/" + projectName + "/" + "index.html" + "#" + routeUri; } diff --git a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/generate/FrontendProjectGenerate.java b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/generate/FrontendProjectGenerate.java index 1ecf3f0b2d0340417f00d9b633fdd9e5e9d5da1a..f1bfb91997b821c385a9e1bcf9a657b5aef5c1d7 100644 --- a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/generate/FrontendProjectGenerate.java +++ b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/generate/FrontendProjectGenerate.java @@ -94,7 +94,7 @@ public class FrontendProjectGenerate { // 生成后动作 String babelProjectName = GspProjectUtil.getProjectName(projectPath) + "forbabel"; String targetServiceProductPath = projectPath + "/src" + "/" + FrontendProjectConstant.PROJECT_GENERATE_PATH_FOR_BABEL + "/projects" + "/" + babelProjectName + "/src/app"; - String sourceServiceProductPath = java.nio.file.Paths.get(projectPath).resolve(FrontendProjectConstant.SERVICES_RELATIVE_PRODUCT_PATH).toString(); + String sourceServiceProductPath = java.nio.file.Paths.get(projectPath).resolve(TerminalType.PC.getServiceRelativePath()).toString(); boolean isPathExists = FileUtility.exists(sourceServiceProductPath); if (isPathExists) { FileUtility.copyFolder(sourceServiceProductPath, targetServiceProductPath); diff --git a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/listener/PageFlowMetadataEventListener.java b/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/listener/PageFlowMetadataEventListener.java index 8b24fc6dc327e8a3c8f6048d0f86019b406607d9..37f08d0d94b632095ef9824afce517cdb0af2c5d 100644 --- a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/listener/PageFlowMetadataEventListener.java +++ b/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/listener/PageFlowMetadataEventListener.java @@ -4,7 +4,7 @@ import com.inspur.edp.lcm.metadata.spi.event.MetadataCreateEventListener; import com.inspur.edp.lcm.metadata.spi.event.MetadataEventArgs; import com.inspur.edp.lcm.metadata.spi.event.MetadataEventListener; import com.inspur.edp.web.appconfig.core.service.GspAppConfigService; -import com.inspur.edp.web.common.constant.MetadataConstant; +import com.inspur.edp.web.common.entity.TerminalType; import com.inspur.edp.web.common.utility.StringUtility; import com.inspur.edp.web.pageflow.metadata.entity.PageFlowMetadataEntity; import com.inspur.edp.web.pageflow.metadata.service.PageFlowMetadataUpdateService; @@ -56,8 +56,8 @@ public class PageFlowMetadataEventListener implements MetadataEventListener, Met return; } - if (MetadataConstant.FORM_METADATA_TYPE.equals(metadataEventArgs.getMetadata().getHeader().getType()) - || MetadataConstant.MOBILE_FORM_METADATA_TYPE.equals(metadataEventArgs.getMetadata().getHeader().getType())) { + if (TerminalType.PC.getMetadataType().equals(metadataEventArgs.getMetadata().getHeader().getType()) + || TerminalType.MOBILE.getMetadataType().equals(metadataEventArgs.getMetadata().getHeader().getType())) { PageFlowMetadataUpdateService.getInstance().updatePageFlowMetadata(metadataEventArgs); } } diff --git a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/service/PageFlowMetadataUpdateService.java b/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/service/PageFlowMetadataUpdateService.java index b4ca1b8b937972e27ddb56695b5c7c74b496d778..06e2d977ae566d635806cad4fe655362460d7dfc 100644 --- a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/service/PageFlowMetadataUpdateService.java +++ b/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/service/PageFlowMetadataUpdateService.java @@ -9,9 +9,7 @@ import com.inspur.edp.lcm.metadata.api.service.MetadataService; import com.inspur.edp.lcm.metadata.spi.event.MetadataEventArgs; import com.inspur.edp.web.appconfig.api.entity.GspAppConfig; import com.inspur.edp.web.appconfig.core.service.GspAppConfigService; -import com.inspur.edp.web.common.GSPException; import com.inspur.edp.web.common.GspProjectUtil; -import com.inspur.edp.web.common.constant.MetadataConstant; import com.inspur.edp.web.common.entity.TerminalType; import com.inspur.edp.web.common.io.FileUtility; import com.inspur.edp.web.common.metadata.MetadataUtility; @@ -48,7 +46,7 @@ public class PageFlowMetadataUpdateService { * @param metadataEventArgs */ public void updatePageFlowMetadata(MetadataEventArgs metadataEventArgs) { - if (!metadataEventArgs.getMetadata().getHeader().getType().equals(MetadataConstant.FORM_METADATA_TYPE) && !metadataEventArgs.getMetadata().getHeader().getType().equals(MetadataConstant.MOBILE_FORM_METADATA_TYPE)) { + if (!metadataEventArgs.getMetadata().getHeader().getType().equals(TerminalType.PC.getMetadataType()) && !metadataEventArgs.getMetadata().getHeader().getType().equals(TerminalType.MOBILE.getMetadataType())) { return; } @@ -83,7 +81,7 @@ public class PageFlowMetadataUpdateService { public void syncPageFlowMetadataAfterFormDeleted(MetadataEventArgs metadataEventArgs) { log.debug("Debug_PageFlowMetadataDeleteEventListener_SyncPageFlowMetadata: Sync PageFlow Metadata When Having Deleted Form metadatas."); // 监听表单元数据删除。当删除表单元数据，同步页面流元数据 - if (!MetadataConstant.FORM_METADATA_TYPE.equals(metadataEventArgs.getMetadata().getHeader().getType())) { + if (!TerminalType.PC.getMetadataType().equals(metadataEventArgs.getMetadata().getHeader().getType())) { return; } @@ -175,12 +173,12 @@ public class PageFlowMetadataUpdateService { String pageFlowMetadataId = ""; String pageFlowMetadataName = ""; TerminalType terminalType = TerminalType.PC; - if (MetadataConstant.FORM_METADATA_TYPE.equals(metadataEventArgs.getMetadata().getHeader().getType())) { + if (TerminalType.PC.getMetadataType().equals(metadataEventArgs.getMetadata().getHeader().getType())) { pageFlowMetadataId = appConfigInfo.getPageFlowMetadataID(); pageFlowMetadataName = appConfigInfo.getPageFlowMetadataFileName(); terminalType = TerminalType.PC; } - if (MetadataConstant.MOBILE_FORM_METADATA_TYPE.equals(metadataEventArgs.getMetadata().getHeader().getType())) { + if (TerminalType.MOBILE.getMetadataType().equals(metadataEventArgs.getMetadata().getHeader().getType())) { pageFlowMetadataId = appConfigInfo.getMobilePageFlowMetadataID(); pageFlowMetadataName = appConfigInfo.getMobilePageFlowMetadataFileName(); terminalType = TerminalType.MOBILE; @@ -254,9 +252,9 @@ public class PageFlowMetadataUpdateService { } private void saveRouteMetadataContent(MetadataEventArgs metadataEventArgs, PageFlowMetadataEntity pageFlowMetadataEntity, GspAppConfig appConfigInfo) { - if (MetadataConstant.FORM_METADATA_TYPE.equals(metadataEventArgs.getMetadata().getHeader().getType())) { + if (TerminalType.PC.getMetadataType().equals(metadataEventArgs.getMetadata().getHeader().getType())) { RouteMetataService.saveRouteMetadataContent(pageFlowMetadataEntity, appConfigInfo.getPageFlowMetadataID(), metadataEventArgs.getMetadata().getRelativePath()); - } else if (MetadataConstant.MOBILE_FORM_METADATA_TYPE.equals(metadataEventArgs.getMetadata().getHeader().getType())) { + } else if (TerminalType.MOBILE.getMetadataType().equals(metadataEventArgs.getMetadata().getHeader().getType())) { RouteMetataService.saveRouteMetadataContent(pageFlowMetadataEntity, appConfigInfo.getMobilePageFlowMetadataID(), metadataEventArgs.getMetadata().getRelativePath()); } } @@ -340,7 +338,6 @@ public class PageFlowMetadataUpdateService { updateRouteMetadataHeader(routeMetadata.getHeader(), terminalType); - String relativePath = ""; String routeMetadataBaseDirectory = "/route"; routeMetadata.setRelativePath(projectPath + routeMetadataBaseDirectory); @@ -376,21 +373,9 @@ public class PageFlowMetadataUpdateService { } private void updateRouteMetadataHeader(MetadataHeader routeMetadataHeader, TerminalType terminalType) { - String routeMetadataCode = ""; - switch (terminalType) { - case PC: - routeMetadataCode = "predefinePageflow"; - routeMetadataHeader.setFileName(routeMetadataCode + ".pf"); - routeMetadataHeader.setType("PageFlowMetadata"); - break; - case MOBILE: - routeMetadataCode = "predefineMobilePageflow"; - routeMetadataHeader.setFileName(routeMetadataCode + ".mpf"); - routeMetadataHeader.setType("MobilePageFlowMetadata"); - break; - default: - throw new GSPException("Web_UpdateRouteMetadataHeader", "未识别的终端类型，请联系管理员处理。当前终端类型是：" + terminalType); - } + String routeMetadataCode = terminalType.getRouteMetadata().getCode(); + routeMetadataHeader.setFileName(terminalType.getRouteMetadata().getFileName()); + routeMetadataHeader.setType(terminalType.getRouteMetadata().getType()); routeMetadataHeader.setCode(routeMetadataCode); routeMetadataHeader.setName(routeMetadataCode);