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

Pre Merge pull request !83 from Srzou/1.2.0-beta1

Browse Source
This commit is contained in:
Srzou 2024-08-27 07:25:58 +00:00 committed by Gitee
commit 60fd79cb86
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,6 +183,15 @@ public class WorkflowBatchHandler {
operationReason = JobOperationReasonEnum.JOB_OVERLAY.getReason(); operationReason = JobOperationReasonEnum.JOB_OVERLAY.getReason();
} }
// 关闭已经触发的任务
List<JobTaskBatch> jobTaskBatches = jobTaskBatchMapper.selectList(new LambdaQueryWrapper<JobTaskBatch>()
.in(JobTaskBatch::getTaskBatchStatus, NOT_COMPLETE)
.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());
workflowTaskBatch.setOperationReason(operationReason); workflowTaskBatch.setOperationReason(operationReason);
@ -193,15 +202,6 @@ public class WorkflowBatchHandler {
workflowTaskBatchId)); workflowTaskBatchId));
SnailSpringContext.getContext().publishEvent(new WorkflowTaskFailAlarmEvent(workflowTaskBatchId)); SnailSpringContext.getContext().publishEvent(new WorkflowTaskFailAlarmEvent(workflowTaskBatchId));
// 关闭已经触发的任务
List<JobTaskBatch> jobTaskBatches = jobTaskBatchMapper.selectList(new LambdaQueryWrapper<JobTaskBatch>()
.in(JobTaskBatch::getTaskBatchStatus, NOT_COMPLETE)
.eq(JobTaskBatch::getWorkflowTaskBatchId, 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);

3
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/AbstractJobTaskStopHandler.java
View File

@ -60,6 +60,9 @@ public abstract class AbstractJobTaskStopHandler implements JobTaskStopHandler,
if (context.isNeedUpdateTaskStatus()) { if (context.isNeedUpdateTaskStatus()) {
for (final JobTask jobTask : jobTasks) { for (final JobTask jobTask : jobTasks) {
if (jobTask.getTaskStatus() == JobTaskStatusEnum.SUCCESS.getStatus()){
continue;
}
JobExecutorResultDTO jobExecutorResultDTO = JobTaskConverter.INSTANCE.toJobExecutorResultDTO(jobTask); JobExecutorResultDTO jobExecutorResultDTO = JobTaskConverter.INSTANCE.toJobExecutorResultDTO(jobTask);
jobExecutorResultDTO.setTaskStatus(JobTaskStatusEnum.STOP.getStatus()); jobExecutorResultDTO.setTaskStatus(JobTaskStatusEnum.STOP.getStatus());
jobExecutorResultDTO.setMessage("任务停止成功"); jobExecutorResultDTO.setMessage("任务停止成功");

4
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/JobHandler.java
View File

@ -93,7 +93,9 @@ public class JobHandler {
String wfContext = getWfContext(workflowTaskBatchId); String wfContext = getWfContext(workflowTaskBatchId);
for (JobTask jobTask : jobTasks) { for (JobTask jobTask : jobTasks) {
if (jobTask.getTaskStatus() == JobTaskStatusEnum.RUNNING.getStatus()) { // 增加Map及MapReduce重试任务的状态判断，防止重复执行
if (jobTask.getTaskStatus() == JobTaskStatusEnum.RUNNING.getStatus()
|| jobTask.getTaskStatus() == JobTaskStatusEnum.SUCCESS.getStatus()) {
continue; continue;
} }