diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/JobTaskBatchHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/JobTaskBatchHandler.java index b6485c6c9..a21a98829 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/JobTaskBatchHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/JobTaskBatchHandler.java @@ -57,9 +57,10 @@ public class JobTaskBatchHandler { @Transactional public boolean handleResult(CompleteJobBatchDTO completeJobBatchDTO) { Assert.notNull(completeJobBatchDTO.getTaskType(), ()-> new SnailJobServerException("taskType can not be null")); + Assert.notNull(completeJobBatchDTO.getRetryStatus(), ()-> new SnailJobServerException("retryStatus can not be null")); // 非重试流量幂等处理 - if(!completeJobBatchDTO.getRetryStatus()) { + if(Boolean.FALSE.equals(completeJobBatchDTO.getRetryStatus())) { // 幂等处理 Long countJobTaskBatch = jobTaskBatchMapper.selectCount(new LambdaQueryWrapper() .eq(JobTaskBatch::getId, completeJobBatchDTO.getTaskBatchId()) diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/prepare/job/RunningJobPrepareHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/prepare/job/RunningJobPrepareHandler.java index 4279884e9..368fcbde1 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/prepare/job/RunningJobPrepareHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/prepare/job/RunningJobPrepareHandler.java @@ -49,6 +49,7 @@ public class RunningJobPrepareHandler extends AbstractJobPrepareHandler { JobOperationReasonEnum jobOperationReasonEnum = JobOperationReasonEnum.NONE; CompleteJobBatchDTO completeJobBatchDTO = JobTaskConverter.INSTANCE.completeJobBatchDTO(prepare); completeJobBatchDTO.setJobOperationReason(jobOperationReasonEnum.getReason()); + completeJobBatchDTO.setRetryStatus(Boolean.FALSE); if (jobTaskBatchHandler.handleResult(completeJobBatchDTO)) { blockStrategy = BlockStrategyEnum.CONCURRENCY.getBlockStrategy(); } else {