GTsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:(1.2.0-beta1): 修复工作流中因任务阻塞状态而无法手动停止

Browse Source
This commit is contained in:
srzou 2024-09-05 22:34:33 +08:00
parent 6ecdfe65eb
commit 680e3fe976
1 changed files with 3 additions and 3 deletions

6
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java
View File

@ -188,9 +188,6 @@ public class WorkflowBatchHandler {
.in(JobTaskBatch::getTaskBatchStatus, NOT_COMPLETE) .in(JobTaskBatch::getTaskBatchStatus, NOT_COMPLETE)
.eq(JobTaskBatch::getWorkflowTaskBatchId, workflowTaskBatchId)); .eq(JobTaskBatch::getWorkflowTaskBatchId, workflowTaskBatchId));
if (CollUtil.isEmpty(jobTaskBatches)) {
return;
}
WorkflowTaskBatch workflowTaskBatch = new WorkflowTaskBatch(); WorkflowTaskBatch workflowTaskBatch = new WorkflowTaskBatch();
workflowTaskBatch.setTaskBatchStatus(JobTaskBatchStatusEnum.STOP.getStatus()); workflowTaskBatch.setTaskBatchStatus(JobTaskBatchStatusEnum.STOP.getStatus());
@ -202,6 +199,9 @@ public class WorkflowBatchHandler {
workflowTaskBatchId)); workflowTaskBatchId));
SnailSpringContext.getContext().publishEvent(new WorkflowTaskFailAlarmEvent(workflowTaskBatchId)); SnailSpringContext.getContext().publishEvent(new WorkflowTaskFailAlarmEvent(workflowTaskBatchId));
if (CollUtil.isEmpty(jobTaskBatches)) {
return;
}
List<Job> jobs = jobMapper.selectBatchIds(StreamUtils.toSet(jobTaskBatches, JobTaskBatch::getJobId)); List<Job> jobs = jobMapper.selectBatchIds(StreamUtils.toSet(jobTaskBatches, JobTaskBatch::getJobId));
Map<Long, Job> jobMap = StreamUtils.toIdentityMap(jobs, Job::getId); Map<Long, Job> jobMap = StreamUtils.toIdentityMap(jobs, Job::getId);