From 876f48f1c246bbf5ed1520308956ea22b6546114 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Fri, 6 Sep 2024 10:17:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:(1.2.0-beta1):=201.=20=E8=BF=98=E5=8E=9FMa?= =?UTF-8?q?ster=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/support/handler/WorkflowBatchHandler.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 6146a1539..e0c1aac63 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 @@ -183,12 +183,6 @@ public class WorkflowBatchHandler { operationReason = JobOperationReasonEnum.JOB_OVERLAY.getReason(); } - // 关闭已经触发的任务 - List jobTaskBatches = jobTaskBatchMapper.selectList(new LambdaQueryWrapper() - .in(JobTaskBatch::getTaskBatchStatus, NOT_COMPLETE) - .eq(JobTaskBatch::getWorkflowTaskBatchId, workflowTaskBatchId)); - - WorkflowTaskBatch workflowTaskBatch = new WorkflowTaskBatch(); workflowTaskBatch.setTaskBatchStatus(JobTaskBatchStatusEnum.STOP.getStatus()); workflowTaskBatch.setOperationReason(operationReason); @@ -199,9 +193,15 @@ public class WorkflowBatchHandler { workflowTaskBatchId)); SnailSpringContext.getContext().publishEvent(new WorkflowTaskFailAlarmEvent(workflowTaskBatchId)); + // 关闭已经触发的任务 + List jobTaskBatches = jobTaskBatchMapper.selectList(new LambdaQueryWrapper() + .in(JobTaskBatch::getTaskBatchStatus, NOT_COMPLETE) + .eq(JobTaskBatch::getWorkflowTaskBatchId, workflowTaskBatchId)); + if (CollUtil.isEmpty(jobTaskBatches)) { return; } + List jobs = jobMapper.selectBatchIds(StreamUtils.toSet(jobTaskBatches, JobTaskBatch::getJobId)); Map jobMap = StreamUtils.toIdentityMap(jobs, Job::getId);