diff --git a/metadata-service-dev-api/src/main/java/com/inspur/edp/lcm/metadata/api/context/PublishServiceContext.java b/metadata-service-dev-api/src/main/java/com/inspur/edp/lcm/metadata/api/context/PublishServiceContext.java index c5f7d9fc417855f198bac7dd91f4d51113078bf2..9c95d05856416f77c642c88d113ffaa1edaa4633 100644 --- a/metadata-service-dev-api/src/main/java/com/inspur/edp/lcm/metadata/api/context/PublishServiceContext.java +++ b/metadata-service-dev-api/src/main/java/com/inspur/edp/lcm/metadata/api/context/PublishServiceContext.java @@ -18,9 +18,18 @@ package com.inspur.edp.lcm.metadata.api.context; import com.inspur.edp.lcm.metadata.api.param.GspWebParam; import lombok.Data; +import org.springframework.util.StringUtils; @Data public class PublishServiceContext { // web参数 private GspWebParam webParam; + + /** + * 是否是表单运行,用于区分和一键发布的区别 + * @return + */ + public boolean isFormRunning() { + return webParam != null && StringUtils.hasText(webParam.getRunFormMetadataId()); + } } diff --git a/metadata-service-dev-api/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataIndexItemDto.java b/metadata-service-dev-api/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataIndexItemDto.java index a4da0567ab5c85d02202dd49510dade9db49d204..52db33f59639ce41bd14912d8a65df330a8615b7 100644 --- a/metadata-service-dev-api/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataIndexItemDto.java +++ b/metadata-service-dev-api/src/main/java/com/inspur/edp/lcm/metadata/api/entity/MetadataIndexItemDto.java @@ -52,6 +52,7 @@ public class MetadataIndexItemDto extends MetadataDto { this.setIsTranslating(metadata4Ref.getMetadata().getHeader().isTranslating()); this.setFileName(metadata4Ref.getMetadata().getHeader().getFileName()); this.setRelativePath(metadata4Ref.getMetadata().getRelativePath()); + this.setProperties(metadata4Ref.getMetadata().getProperties()); if (Objects.nonNull(metadata4Ref.getPackageHeader())) { this.setMdPkgName(metadata4Ref.getPackageHeader().getName()); if (!Objects.isNull(metadata4Ref.getPackageHeader().getProcessMode())) { diff --git a/metadata-service-dev-api/src/main/java/com/inspur/edp/lcm/metadata/api/param/GspWebParam.java b/metadata-service-dev-api/src/main/java/com/inspur/edp/lcm/metadata/api/param/GspWebParam.java index cd13f3340cf32a38992fe9c8c0c2d43e836a1714..4e6a34bd4461beeb4c15468e0f7279c62c768617 100644 --- a/metadata-service-dev-api/src/main/java/com/inspur/edp/lcm/metadata/api/param/GspWebParam.java +++ b/metadata-service-dev-api/src/main/java/com/inspur/edp/lcm/metadata/api/param/GspWebParam.java @@ -27,4 +27,6 @@ public class GspWebParam { // 运行表单元数据ID private String runFormMetadataId; + // 运行表单元数据文件所在路径 + private String runFormMetadataPath; } diff --git a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/PackageCoreService.java b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/PackageCoreService.java index d1c66e7970d6f50a39a8ca87690333c9cd514099..8b44a33eac88d76743a8d0e0d29bfba1ba751e1e 100644 --- a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/PackageCoreService.java +++ b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/PackageCoreService.java @@ -285,26 +285,8 @@ public class PackageCoreService { return ; } } - try { - // 防止其他的日志输出比这个晚。 - Thread.sleep(3000); - } catch (InterruptedException e) { - IdeLogUtils.setStageStatus(IdeLogUtils.Fail); - } - if (!errorMsgs.isEmpty()) { - String log = (LcmMetadataDevLog.getInstance().getString(LogCodes.LOG_METADATA_DEV_0009)); - if(Objects.nonNull(ideLogService)){ - ideLogService.pushLog(log, CAFContext.current.getUserId()); - } - for (String msg : errorMsgs) { - if(Objects.nonNull(ideLogService)){ - ideLogService.pushLog("[ERROR]" + msg, CAFContext.current.getUserId()); - } - } - } else { - if(Objects.nonNull(ideLogService)){ - ideLogService.pushLog(LcmMetadataDevLog.getInstance().getString(LogCodes.LOG_METADATA_DEV_0010), CAFContext.current.getUserId()); - } + if(Objects.nonNull(ideLogService)){ + ideLogService.pushLog(LcmMetadataDevLog.getInstance().getString(LogCodes.LOG_METADATA_DEV_0010), CAFContext.current.getUserId()); } } diff --git a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/ProjectExtendCoreService.java b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/ProjectExtendCoreService.java index 9e9c69d963bfdf598dd7058344492c532b9b1b0d..c6a636d7081aa724c022c193fb34b5af4194fdaf 100644 --- a/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/ProjectExtendCoreService.java +++ b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/ProjectExtendCoreService.java @@ -364,7 +364,7 @@ public class ProjectExtendCoreService { log.info("Compiling: " + projPath); String projectMetadataPath = Paths.get(projPath).resolve(Utils.getMetadataProjPath()).toString(); MetadataCompilerContext metadataCompilerContext = new MetadataCompilerContext(); - metadataCompilerContext.setProjectPath(projectMetadataPath); + metadataCompilerContext.setProjectPath(ManagerUtils.handlePath(projectMetadataPath)); // 上一个工程执行进度 int lastProcess = IdeLogUtils.calcProcess(projPaths.size(), count - 1, StageEnum.EXTEND_COMPILE); // 当前工程执行进度 diff --git a/metadata-service-dev-webapi/src/main/java/com/inspur/edp/lcm/metadata/webapi/task/PublishTask.java b/metadata-service-dev-webapi/src/main/java/com/inspur/edp/lcm/metadata/webapi/task/PublishTask.java index 0c6f8586ed9ff0b4b6172e3b2f580e9497f4dba0..0eb7ac798d8af2b7ab1aa89c15ac30df2af6eaf7 100644 --- a/metadata-service-dev-webapi/src/main/java/com/inspur/edp/lcm/metadata/webapi/task/PublishTask.java +++ b/metadata-service-dev-webapi/src/main/java/com/inspur/edp/lcm/metadata/webapi/task/PublishTask.java @@ -28,6 +28,7 @@ import com.inspur.edp.lcm.metadata.common.Utils; import com.inspur.edp.lcm.metadata.core.MetadataProjectCoreService; import com.inspur.edp.lcm.metadata.core.entity.MdprojInfoDto; import com.inspur.edp.lcm.metadata.core.thread.BoGraphThreadLocalHolder; +import com.inspur.edp.lcm.metadata.devcommon.ManagerUtils; import com.inspur.edp.lcm.metadata.inner.api.data.PublishStatus; import com.inspur.edp.lcm.metadata.inner.api.enm.StageEnum; import com.inspur.edp.lcm.metadata.inner.api.utils.IdeLogUtils; @@ -77,6 +78,7 @@ public class PublishTask implements Runnable { public void run() { try { CAFContext.current.getService().setCurrentThreadPoolSession(session); + preProcessContext(publishServiceContext); PublishServiceContextHolder.setCurrentContext(publishServiceContext); BoGraphThreadLocalHolder.init(); IdeLogUtils.setRequestId(requestId); @@ -156,4 +158,20 @@ public class PublishTask implements Runnable { PublishStatus.success(100, StageEnum.DEPLOY.getCode()) ); } + + /** + * 预处理发布服务上下文 + * @param publishServiceContext + */ + private void preProcessContext(PublishServiceContext publishServiceContext) { + if(publishServiceContext == null){ + return; + } + //vue表单运行场景,格式化表单元数据路径 + if(publishServiceContext.isFormRunning()){ + String absolutePath = ManagerUtils.getAbsolutePath(publishServiceContext.getWebParam().getRunFormMetadataPath()); + publishServiceContext.getWebParam().setRunFormMetadataPath(absolutePath); + + } + } }