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

feat(1.3.0-beta2): 修复retryStatus为NULL问题

Browse Source
This commit is contained in:
opensnail 2025-01-13 23:10:51 +08:00
parent c3d594fc41
commit 1e0095c6de
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,9 +57,10 @@ public class JobTaskBatchHandler {
@Transactional @Transactional
public boolean handleResult(CompleteJobBatchDTO completeJobBatchDTO) { public boolean handleResult(CompleteJobBatchDTO completeJobBatchDTO) {
Assert.notNull(completeJobBatchDTO.getTaskType(), ()-> new SnailJobServerException("taskType can not be null")); 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<JobTaskBatch>() Long countJobTaskBatch = jobTaskBatchMapper.selectCount(new LambdaQueryWrapper<JobTaskBatch>()
.eq(JobTaskBatch::getId, completeJobBatchDTO.getTaskBatchId()) .eq(JobTaskBatch::getId, completeJobBatchDTO.getTaskBatchId())

1
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/prepare/job/RunningJobPrepareHandler.java
View File

@ -49,6 +49,7 @@ public class RunningJobPrepareHandler extends AbstractJobPrepareHandler {
JobOperationReasonEnum jobOperationReasonEnum = JobOperationReasonEnum.NONE; JobOperationReasonEnum jobOperationReasonEnum = JobOperationReasonEnum.NONE;
CompleteJobBatchDTO completeJobBatchDTO = JobTaskConverter.INSTANCE.completeJobBatchDTO(prepare); CompleteJobBatchDTO completeJobBatchDTO = JobTaskConverter.INSTANCE.completeJobBatchDTO(prepare);
completeJobBatchDTO.setJobOperationReason(jobOperationReasonEnum.getReason()); completeJobBatchDTO.setJobOperationReason(jobOperationReasonEnum.getReason());
completeJobBatchDTO.setRetryStatus(Boolean.FALSE);
if (jobTaskBatchHandler.handleResult(completeJobBatchDTO)) { if (jobTaskBatchHandler.handleResult(completeJobBatchDTO)) {
blockStrategy = BlockStrategyEnum.CONCURRENCY.getBlockStrategy(); blockStrategy = BlockStrategyEnum.CONCURRENCY.getBlockStrategy();
} else { } else {