From 6e9f47b48d0e1275a87a3657ee38fba3e36702ed Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Tue, 25 Feb 2025 21:31:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(1.4.0-beta1):=20=E4=BF=AE=E5=A4=8Djob?= =?UTF-8?q?=E8=B0=83=E5=BA=A6=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/job/task/support/dispatch/JobTaskPrepareActor.java | 2 -- .../task/support/prepare/job/TerminalJobPrepareHandler.java | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobTaskPrepareActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobTaskPrepareActor.java index a003c131c..7e4baabd8 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobTaskPrepareActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobTaskPrepareActor.java @@ -77,8 +77,6 @@ public class JobTaskPrepareActor extends AbstractActor { // 模拟完成情况 jobTaskBatch.setTaskBatchStatus(JobTaskBatchStatusEnum.SUCCESS.getStatus()); notCompleteJobTaskBatchList = Lists.newArrayList(jobTaskBatch); -// TerminalJobPrepareHandler terminalJobPrepareHandler = SnailSpringContext.getBeanByType(TerminalJobPrepareHandler.class); -// terminalJobPrepareHandler.handle(prepare); } boolean onlyTimeoutCheck = false; 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 38e3f652a..fa1760e8e 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 @@ -12,6 +12,8 @@ import org.springframework.stereotype.Component; import java.util.Objects; +import static com.aizuda.snailjob.common.core.enums.JobTaskBatchStatusEnum.COMPLETED; + /** * 处理处于已完成 {@link JobTaskBatchStatusEnum::COMPLETED} 状态的任务 * @@ -29,7 +31,7 @@ public class TerminalJobPrepareHandler extends AbstractJobPrepareHandler { @Override public boolean matches(Integer status) { - return Objects.isNull(status); + return COMPLETED.contains(status); } @Override