diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/JobOperationReasonEnum.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/JobOperationReasonEnum.java index ac66835a..976e61ac 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/JobOperationReasonEnum.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/JobOperationReasonEnum.java @@ -84,7 +84,7 @@ public enum JobOperationReasonEnum { /** * 手动调用 */ - MANUAL_CALL(15, "Manual call"), + MANUAL_TRIGGER(15, "Manual call"), /** * 由工作流中被调用 */ diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/enums/JobTaskExecutorSceneEnum.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/enums/JobTaskExecutorSceneEnum.java index 2dc3305d..8c1fcf96 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/enums/JobTaskExecutorSceneEnum.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/enums/JobTaskExecutorSceneEnum.java @@ -14,10 +14,26 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum JobTaskExecutorSceneEnum { + /** + * 自动触发任务 + */ AUTO_JOB(1, SyetemTaskTypeEnum.JOB), + /** + * 手动触发任务 + */ MANUAL_JOB(2, SyetemTaskTypeEnum.JOB), + /** + * 自动触发工作流 + */ AUTO_WORKFLOW(3, SyetemTaskTypeEnum.WORKFLOW), + /** + * 手动触发工作流 + */ MANUAL_WORKFLOW(4, SyetemTaskTypeEnum.WORKFLOW), + /** + * 工作流触发工作流 + */ + WORKFLOW_WORKFLOW(5, SyetemTaskTypeEnum.WORKFLOW), ; private final Integer type; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/dto/WorkflowNodeTaskExecuteDTO.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/dto/WorkflowNodeTaskExecuteDTO.java index db0c8894..06de3494 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/dto/WorkflowNodeTaskExecuteDTO.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/dto/WorkflowNodeTaskExecuteDTO.java @@ -19,6 +19,9 @@ public class WorkflowNodeTaskExecuteDTO { */ private Integer taskExecutorScene; + /** + * 前一个节点 id + */ private Long parentId; /** diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/dto/WorkflowTaskPrepareDTO.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/dto/WorkflowTaskPrepareDTO.java index de9fa8eb..2ef62c0a 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/dto/WorkflowTaskPrepareDTO.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/dto/WorkflowTaskPrepareDTO.java @@ -1,5 +1,6 @@ package com.aizuda.snailjob.server.job.task.dto; +import com.aizuda.snailjob.server.job.task.support.executor.workflow.WorkflowExecutorContext; import lombok.Data; /** @@ -15,7 +16,7 @@ public class WorkflowTaskPrepareDTO { private Long workflowId; /** - * 执行策略 1、auto 2、manual 3、workflow + * 执行策略 1、auto 2、manual 3、auto_workflow 4、manual_workflow */ private Integer taskExecutorScene; @@ -64,6 +65,11 @@ public class WorkflowTaskPrepareDTO { */ private long nextTriggerAt; + /** + * 操作原因 + */ + private Integer operationReason; + /** * 任务执行时间 */ @@ -78,4 +84,9 @@ public class WorkflowTaskPrepareDTO { * 工作流上下文 */ private String wfContext; + + /** + * 父工作流上下文 + */ + private WorkflowExecutorContext parentWfContext; } diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/WorkflowExecutorActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/WorkflowExecutorActor.java index 2fb88fbe..3d4c251b 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/WorkflowExecutorActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/WorkflowExecutorActor.java @@ -93,7 +93,7 @@ public class WorkflowExecutorActor extends AbstractActor { private void doExecutor(WorkflowNodeTaskExecuteDTO taskExecute) { WorkflowTaskBatch workflowTaskBatch = workflowTaskBatchMapper.selectById(taskExecute.getWorkflowTaskBatchId()); - Assert.notNull(workflowTaskBatch, () -> new SnailJobServerException("Task does not exist")); + Assert.notNull(workflowTaskBatch, () -> new SnailJobServerException("Task does not exist,WorkflowTaskBatchId:"+taskExecute.getWorkflowTaskBatchId())); if (SystemConstants.ROOT.equals(taskExecute.getParentId()) && JobTaskBatchStatusEnum.WAITING.getStatus() == workflowTaskBatch.getTaskBatchStatus()) { diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/workflow/WorkflowWorkflowExecutor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/workflow/WorkflowWorkflowExecutor.java index 80a09c05..be32b6d3 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/workflow/WorkflowWorkflowExecutor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/workflow/WorkflowWorkflowExecutor.java @@ -1,14 +1,29 @@ package com.aizuda.snailjob.server.job.task.support.executor.workflow; +import cn.hutool.core.lang.Assert; import com.aizuda.snailjob.common.core.constant.SystemConstants; import com.aizuda.snailjob.common.core.enums.JobOperationReasonEnum; import com.aizuda.snailjob.common.core.enums.JobTaskBatchStatusEnum; import com.aizuda.snailjob.common.core.enums.JobTaskStatusEnum; import com.aizuda.snailjob.common.core.enums.WorkflowNodeTypeEnum; +import com.aizuda.snailjob.common.core.util.JsonUtil; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.server.common.dto.JobLogMetaDTO; +import com.aizuda.snailjob.server.common.dto.WorkflowConfig; +import com.aizuda.snailjob.server.common.enums.JobTaskExecutorSceneEnum; +import com.aizuda.snailjob.server.common.exception.SnailJobServerException; +import com.aizuda.snailjob.server.common.util.DateUtils; +import com.aizuda.snailjob.server.job.task.dto.WorkflowTaskPrepareDTO; +import com.aizuda.snailjob.server.job.task.support.WorkflowPrePareHandler; +import com.aizuda.snailjob.server.job.task.support.WorkflowTaskConverter; +import com.aizuda.snailjob.server.job.task.support.handler.JobTaskBatchHandler; +import com.aizuda.snailjob.server.job.task.support.handler.WorkflowBatchHandler; +import com.aizuda.snailjob.template.datasource.persistence.mapper.JobMapper; +import com.aizuda.snailjob.template.datasource.persistence.mapper.JobTaskBatchMapper; +import com.aizuda.snailjob.template.datasource.persistence.mapper.WorkflowMapper; import com.aizuda.snailjob.template.datasource.persistence.po.JobTask; import com.aizuda.snailjob.template.datasource.persistence.po.JobTaskBatch; +import com.aizuda.snailjob.template.datasource.persistence.po.Workflow; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -18,6 +33,13 @@ import static com.aizuda.snailjob.common.core.enums.JobOperationReasonEnum.WORKF @RequiredArgsConstructor public class WorkflowWorkflowExecutor extends AbstractWorkflowExecutor { + private final JobTaskBatchMapper jobTaskBatchMapper; + private final WorkflowBatchHandler workflowBatchHandler; + private final JobTaskBatchHandler jobTaskBatchHandler; + private final JobMapper jobMapper; + private final WorkflowMapper workflowMapper; + private final WorkflowPrePareHandler terminalWorkflowPrepareHandler; + @Override public WorkflowNodeTypeEnum getWorkflowNodeType() { return WorkflowNodeTypeEnum.WORKFLOW; @@ -30,6 +52,15 @@ public class WorkflowWorkflowExecutor extends AbstractWorkflowExecutor { @Override protected void afterExecute(WorkflowExecutorContext context) { + + } + + @Override + protected void beforeExecute(WorkflowExecutorContext context) { + context.setTaskBatchStatus(JobTaskBatchStatusEnum.SUCCESS.getStatus()); + context.setOperationReason(JobOperationReasonEnum.NONE.getReason()); + context.setJobTaskStatus(JobTaskStatusEnum.SUCCESS.getStatus()); + JobTaskBatch jobTaskBatch = generateJobTaskBatch(context); JobTask jobTask = generateJobTask(context, jobTaskBatch); @@ -53,15 +84,21 @@ public class WorkflowWorkflowExecutor extends AbstractWorkflowExecutor { } } - @Override - protected void beforeExecute(WorkflowExecutorContext context) { - } - @Override protected void doExecute(WorkflowExecutorContext context) { - context.setTaskBatchStatus(JobTaskBatchStatusEnum.SUCCESS.getStatus()); - context.setOperationReason(JobOperationReasonEnum.NONE.getReason()); - context.setJobTaskStatus(JobTaskStatusEnum.SUCCESS.getStatus()); + WorkflowConfig nodeInfo = JsonUtil.parseObject(context.getNodeInfo(), WorkflowConfig.class); + Workflow workflow = workflowMapper.selectById(nodeInfo.getId()); + Assert.notNull(workflow, () -> new SnailJobServerException("workflow can not be null.")); + + WorkflowTaskPrepareDTO prepareDTO = WorkflowTaskConverter.INSTANCE.toWorkflowTaskPrepareDTO(workflow); + // 下次触发时间：设置now表示立即执行 + prepareDTO.setNextTriggerAt(DateUtils.toNowMilli()); + // 执行策略：工作流触发工作流 + prepareDTO.setTaskExecutorScene(JobTaskExecutorSceneEnum.WORKFLOW_WORKFLOW.getType()); + // 操作原因：工作流调用 + prepareDTO.setOperationReason(JobOperationReasonEnum.WORKFLOW_CALLED.getReason()); + prepareDTO.setParentWfContext(context); + terminalWorkflowPrepareHandler.handler(prepareDTO); } } diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/WorkflowBatchGenerator.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/WorkflowBatchGenerator.java index b7e83b37..b394d232 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/WorkflowBatchGenerator.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/WorkflowBatchGenerator.java @@ -2,6 +2,7 @@ package com.aizuda.snailjob.server.job.task.support.generator.batch; import cn.hutool.core.lang.Assert; import com.aizuda.snailjob.common.core.enums.JobTaskBatchStatusEnum; +import com.aizuda.snailjob.common.core.util.JsonUtil; import com.aizuda.snailjob.server.common.exception.SnailJobServerException; import com.aizuda.snailjob.server.common.util.DateUtils; import com.aizuda.snailjob.server.job.task.dto.WorkflowTimerTaskDTO; @@ -28,6 +29,10 @@ import java.util.Optional; public class WorkflowBatchGenerator { private final WorkflowTaskBatchMapper workflowTaskBatchMapper; + /** + * 生成工作流批次，插入数据库 + * 开始执行工作流 + */ public void generateJobTaskBatch(WorkflowTaskBatchGeneratorContext context) { // 生成任务批次 @@ -35,6 +40,7 @@ public class WorkflowBatchGenerator { workflowTaskBatch.setTaskBatchStatus(Optional.ofNullable(context.getTaskBatchStatus()).orElse(JobTaskBatchStatusEnum.WAITING.getStatus())); workflowTaskBatch.setOperationReason(context.getOperationReason()); workflowTaskBatch.setWfContext(context.getWfContext()); + workflowTaskBatch.setExtAttrs(JsonUtil.toJsonString(context.getParentWorkflowContext())); Assert.isTrue(1 == workflowTaskBatchMapper.insert(workflowTaskBatch), () -> new SnailJobServerException("Adding new scheduling task failed. [{}]", context.getWorkflowId())); diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/WorkflowTaskBatchGeneratorContext.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/WorkflowTaskBatchGeneratorContext.java index e896f934..7b6f169e 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/WorkflowTaskBatchGeneratorContext.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/WorkflowTaskBatchGeneratorContext.java @@ -1,5 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.generator.batch; +import com.aizuda.snailjob.server.job.task.support.executor.workflow.WorkflowExecutorContext; import lombok.Data; /** @@ -38,7 +39,7 @@ public class WorkflowTaskBatchGeneratorContext { private Integer taskBatchStatus; /** - * 执行策略 1、auto 2、manual 3、workflow + * 执行策略 1、auto 2、manual 3、auto_workflow 4、manual_workflow */ private Integer taskExecutorScene; @@ -52,5 +53,9 @@ public class WorkflowTaskBatchGeneratorContext { */ private String wfContext; + /** + * 父工作流执行上下文 + */ + private WorkflowExecutorContext parentWorkflowContext; } diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java index 109b5d05..b66fb311 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java @@ -99,6 +99,9 @@ public class WorkflowBatchHandler { return isNeedProcess; } + /** + * 工作流执行完成 + */ public boolean complete(Long workflowTaskBatchId) { return complete(workflowTaskBatchId, null); } @@ -186,7 +189,7 @@ public class WorkflowBatchHandler { WorkflowTaskBatch jobTaskBatch = new WorkflowTaskBatch(); jobTaskBatch.setId(workflowTaskBatchId); jobTaskBatch.setTaskBatchStatus(taskStatus); - jobTaskBatch.setOperationReason(operationReason); +// jobTaskBatch.setOperationReason(operationReason); workflowTaskBatchMapper.updateById(jobTaskBatch); } diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/prepare/job/TerminalJobPrepareHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/prepare/job/TerminalJobPrepareHandler.java index d25dbb71..6dc91c91 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/prepare/job/TerminalJobPrepareHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/prepare/job/TerminalJobPrepareHandler.java @@ -15,7 +15,7 @@ import java.util.Objects; import static com.aizuda.snailjob.common.core.enums.JobTaskBatchStatusEnum.COMPLETED; /** - * 处理处于已完成 {@link JobTaskBatchStatusEnum::COMPLETED} 状态的任务 + * 处理处于已完成 {@link JobTaskBatchStatusEnum::COMPLETED} 完成状态的任务 * * @author opensnail * @date 2023-10-02 10:16:28 diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/prepare/workflow/RunningWorkflowPrepareHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/prepare/workflow/RunningWorkflowPrepareHandler.java index edb663f4..c98010ee 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/prepare/workflow/RunningWorkflowPrepareHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/prepare/workflow/RunningWorkflowPrepareHandler.java @@ -32,6 +32,9 @@ public class RunningWorkflowPrepareHandler extends AbstractWorkflowPrePareHandle private final WorkflowBatchHandler workflowBatchHandler; + /** + * 运行中的任务处理 + */ @Override public boolean matches(Integer status) { return Objects.nonNull(status) && JobTaskBatchStatusEnum.RUNNING.getStatus() == status; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/prepare/workflow/WaitWorkflowPrepareHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/prepare/workflow/WaitWorkflowPrepareHandler.java index 68b7615e..4e8a1c46 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/prepare/workflow/WaitWorkflowPrepareHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/prepare/workflow/WaitWorkflowPrepareHandler.java @@ -14,7 +14,7 @@ import java.time.Duration; import java.util.Objects; /** - * 处理处于{@link JobTaskBatchStatusEnum::WAIT}状态的任务 + * 处理处于{@link JobTaskBatchStatusEnum::WAITING}待处理 状态的任务 * * @author xiaowoniu * @date 2023-10-05 18:29:22 diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/WorkflowTimerTask.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/WorkflowTimerTask.java index f651ff56..ff841622 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/WorkflowTimerTask.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/WorkflowTimerTask.java @@ -33,7 +33,7 @@ public class WorkflowTimerTask implements TimerTask { WorkflowNodeTaskExecuteDTO taskExecuteDTO = new WorkflowNodeTaskExecuteDTO(); taskExecuteDTO.setWorkflowTaskBatchId(workflowTimerTaskDTO.getWorkflowTaskBatchId()); - taskExecuteDTO.setTaskExecutorScene(workflowTimerTaskDTO.getTaskExecutorScene()); + taskExecuteDTO.setTaskExecutorScene(workflowTimerTaskDTO.getTaskExecutorScene());//执行策略 taskExecuteDTO.setParentId(SystemConstants.ROOT); ActorRef actorRef = ActorGenerator.workflowTaskExecutorActor(); actorRef.tell(taskExecuteDTO, actorRef); diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java index a7a6aba3..736ebc86 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.lang.Pair; import cn.hutool.core.util.HashUtil; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.constant.SystemConstants; +import com.aizuda.snailjob.common.core.enums.JobOperationReasonEnum; import com.aizuda.snailjob.common.core.enums.StatusEnum; import com.aizuda.snailjob.common.core.expression.ExpressionEngine; import com.aizuda.snailjob.common.core.expression.ExpressionFactory; @@ -293,6 +294,8 @@ public class WorkflowServiceImpl implements WorkflowService { // 设置now表示立即执行 prepareDTO.setNextTriggerAt(DateUtils.toNowMilli()); prepareDTO.setTaskExecutorScene(JobTaskExecutorSceneEnum.MANUAL_WORKFLOW.getType()); + // 操作原因：手动触发 + prepareDTO.setOperationReason(JobOperationReasonEnum.MANUAL_TRIGGER.getReason()); String tmpWfContext = triggerVO.getTmpWfContext(); if (StrUtil.isNotBlank(tmpWfContext) && !JsonUtil.isEmptyJson(tmpWfContext)){ prepareDTO.setWfContext(tmpWfContext);