fix: workflow instance execute

flowerfine · Mar 30, 2024 · 18ddc1c · 18ddc1c
1 parent a15ff2f
commit 18ddc1c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/...sliew/scaleph/workflow/listener/taskinstance/WorkflowTaskInstanceDeployEventListener.java b/...sliew/scaleph/workflow/listener/taskinstance/WorkflowTaskInstanceDeployEventListener.java
@@ -19,16 +19,13 @@
 package cn.sliew.scaleph.workflow.listener.taskinstance;
 
 import cn.sliew.scaleph.workflow.service.WorkflowTaskInstanceService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.RandomUtils;
 import org.redisson.api.annotation.RInject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.io.Serializable;
 import java.util.concurrent.CompletableFuture;
 
-@Slf4j
 @Component
 public class WorkflowTaskInstanceDeployEventListener extends AbstractWorkflowTaskInstanceEventListener {
 
@@ -62,9 +59,6 @@ public DeployRunner(WorkflowTaskInstanceEventDTO event) {
         public void run() {
             workflowTaskInstanceService.updateTaskId(event.getWorkflowTaskInstanceId(), taskId);
             workflowTaskInstanceService.updateState(event.getWorkflowTaskInstanceId(), event.getState(), event.getNextState(), null);
-            if (RandomUtils.nextInt(0, 100) > 80) {
-                throw new RuntimeException("任务执行失败");
-            }
         }
     }
 }
diff --git a/...sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceDeployEventListener.java b/...sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceDeployEventListener.java
@@ -85,7 +85,7 @@ public void run() {
             for (WorkflowTaskDefinitionDTO workflowTaskDefinitionDTO : workflowTaskDefinitionDTOS) {
                 workflowTaskInstanceDTOS.add(workflowTaskInstanceService.deploy(workflowTaskDefinitionDTO.getId(), event.getWorkflowInstanceId()));
             }
-            // todo 循环检测 workflowTaskInstanceDTOS 状态，判断是否成功或失败
+            // todo 循环检测 workflowTaskInstanceDTOS 状态或接收 workflowTaskInstance 事件，判断是否成功或失败
         }
     }
 }
diff --git a/...api/src/main/java/cn/sliew/scaleph/workflow/service/impl/WorkflowInstanceServiceImpl.java b/...api/src/main/java/cn/sliew/scaleph/workflow/service/impl/WorkflowInstanceServiceImpl.java
@@ -33,6 +33,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 import static cn.sliew.milky.common.check.Ensures.checkState;
@@ -75,12 +76,23 @@ public void updateState(Long id, WorkflowInstanceState state, WorkflowInstanceSt
 
     @Override
     public void updateSuccess(Long id) {
-
+        WorkflowInstance record = new WorkflowInstance();
+        record.setId(id);
+        record.setState(WorkflowInstanceState.SUCCESS);
+        record.setEndTime(new Date());
+        workflowInstanceMapper.updateById(record);
     }
 
     @Override
     public void updateFailure(Long id, Throwable throwable) {
-
+        WorkflowInstance record = new WorkflowInstance();
+        record.setId(id);
+        record.setState(WorkflowInstanceState.FAILURE);
+        record.setEndTime(new Date());
+        if (throwable != null) {
+            record.setMessage(throwable.getMessage());
+        }
+        workflowInstanceMapper.updateById(record);
     }
 
     @Override

diff --git a/tools/docker/mysql/init.d/scaleph-workflow-mysql.sql b/tools/docker/mysql/init.d/scaleph-workflow-mysql.sql
@@ -69,7 +69,7 @@ CREATE TABLE `workflow_instance`
 (
     `id`                     BIGINT       NOT NULL AUTO_INCREMENT,
     `workflow_definition_id` BIGINT       NOT NULL,
-    `task_id`                VARCHAR(128) NOT NULL,
+    `task_id`                VARCHAR(128),
     `state`                  VARCHAR(4)   NOT NULL,
     `start_time`             DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP,
     `end_time`               DATETIME,
@@ -125,7 +125,7 @@ CREATE TABLE `workflow_task_instance`
     `id`                          BIGINT       NOT NULL AUTO_INCREMENT,
     `workflow_task_definition_id` BIGINT       NOT NULL,
     `workflow_instance_id`        BIGINT       NOT NULL,
-    `task_id`                     VARCHAR(128) NOT NULL,
+    `task_id`                     VARCHAR(128),
     `stage`                       VARCHAR(4)   NOT NULL,
     `start_time`                  DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP,
     `end_time`                    DATETIME,