From 69d168f4a806079f766d5be3aa1fcc9d7afeea4b Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Sat, 17 May 2025 01:10:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=BC=95=E6=93=8E=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81=EF=BC=88=E6=9C=AA=E5=AE=8C=E6=88=90?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/engine/dispatcher/impl/SerialDispatcher.java | 8 ++++++-- .../ci/process/process/dataObject/stage/PipStage.java | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/SerialDispatcher.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/SerialDispatcher.java index d4d559be..e958c0c8 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/SerialDispatcher.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/SerialDispatcher.java @@ -14,12 +14,14 @@ public class SerialDispatcher implements BaseDispatcher { private SecondStageRunContext stageRunContext; private List taskList; private CountDownLatch latch; + private String triggerModel; public SerialDispatcher(SecondStageRunContext stageRunContext, CountDownLatch latch) { this.stageRunContext = stageRunContext; PipBaseElement contextDef = stageRunContext.getContextDef(); - if (contextDef instanceof PipStage) { - this.taskList = ((PipStage)contextDef).getTaskValues(); + if (contextDef instanceof PipStage secondStage) { + this.triggerModel = secondStage.getTriggerMode(); + this.taskList = secondStage.getTaskValues(); } this.latch = latch; } @@ -34,6 +36,8 @@ public class SerialDispatcher implements BaseDispatcher { @Override public void run() { try { + // TODO 检测触发方式如果需要手动触发,挂起当前stage,等待父级执行相应操作 + // TODO 看看需要内存入库还是忽略掉当前执行,进行入库(countDown放行) dispatch(); latch.countDown(); } catch (Exception e) { diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/stage/PipStage.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/stage/PipStage.java index a93b2981..ad3117d4 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/stage/PipStage.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/stage/PipStage.java @@ -30,6 +30,10 @@ public class PipStage extends PipBaseElement { //@ApiProperty(name = "code",desc="是否是源码") private Boolean code = false; + /** + * 触发方式 0-手动触发/1-自动触发 + * */ + private String triggerMode; //@ApiProperty(name = "taskValues",desc="阶段任务") @TableField(exist = false)