From 30265975a1ae28f335e2d74df9b0ce0d03cc8535 Mon Sep 17 00:00:00 2001 From: liuyuxin01 Date: Fri, 6 Jun 2025 15:12:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/context/PublishServiceContext.java | 9 ++++++++ .../lcm/metadata/core/PackageCoreService.java | 22 ++----------------- 2 files changed, 11 insertions(+), 20 deletions(-) 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 c5f7d9f..9c95d05 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-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 d1c66e7..8b44a33 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()); } } -- Gitee From dcb34e6bafaa1ca59b007d049716eaf9cb9bb00d Mon Sep 17 00:00:00 2001 From: liuyuxin01 Date: Thu, 19 Jun 2025 13:55:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=AF=E6=8C=81vue=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BB=A5=E5=8F=8A=E5=A4=9A=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E5=B7=A5=E7=A8=8Bvue=E8=A1=A8=E5=8D=95=E8=BF=90?= =?UTF-8?q?=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/entity/MetadataIndexItemDto.java | 1 + .../lcm/metadata/api/param/GspWebParam.java | 2 ++ .../core/ProjectExtendCoreService.java | 2 +- .../lcm/metadata/webapi/task/PublishTask.java | 18 ++++++++++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) 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 a4da056..52db33f 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 cd13f33..4e6a34b 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/ProjectExtendCoreService.java b/metadata-service-dev-core/src/main/java/com/inspur/edp/lcm/metadata/core/ProjectExtendCoreService.java index 9e9c69d..c6a636d 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 0c6f858..0eb7ac7 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); + + } + } } -- Gitee