From 15e341fcac576e827144aa2529bf898f3dae4c00 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Wed, 2 Apr 2025 22:41:46 +0800 Subject: [PATCH] =?UTF-8?q?feat(1.5.0-beta1):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=AB=E6=8F=8F=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/job/task/support/dispatch/ScanJobTaskActor.java | 2 +- .../server/job/task/support/dispatch/ScanWorkflowTaskActor.java | 2 +- .../server/job/task/support/schedule/JobLogMergeSchedule.java | 2 +- .../server/retry/task/support/dispatch/ScanRetryActor.java | 2 +- .../server/retry/task/support/schedule/CleanerSchedule.java | 2 +- .../retry/task/support/schedule/RetryLogMergeSchedule.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ScanJobTaskActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ScanJobTaskActor.java index 9b66850e6..5eb5c81d2 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ScanJobTaskActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ScanJobTaskActor.java @@ -163,7 +163,7 @@ public class ScanJobTaskActor extends AbstractActor { return Collections.emptyList(); } - List jobs = jobMapper.selectPage(new PageDTO<>(0, systemProperties.getJobPullPageSize()), + List jobs = jobMapper.selectPage(new PageDTO<>(0, systemProperties.getJobPullPageSize(), Boolean.FALSE), new LambdaQueryWrapper() .select(Job::getGroupName, Job::getNextTriggerAt, Job::getBlockStrategy, Job::getTriggerType, Job::getTriggerInterval, Job::getExecutorTimeout, Job::getTaskType, Job::getResident, diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ScanWorkflowTaskActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ScanWorkflowTaskActor.java index fdbf815f2..aa8cd0948 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ScanWorkflowTaskActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ScanWorkflowTaskActor.java @@ -130,7 +130,7 @@ public class ScanWorkflowTaskActor extends AbstractActor { return Collections.emptyList(); } - List workflows = workflowMapper.selectPage(new PageDTO<>(0, systemProperties.getJobPullPageSize()), + List workflows = workflowMapper.selectPage(new PageDTO<>(0, systemProperties.getJobPullPageSize(), Boolean.FALSE), new LambdaQueryWrapper() .select(Workflow::getId, Workflow::getGroupName, Workflow::getNextTriggerAt, Workflow::getTriggerType, Workflow::getTriggerInterval, Workflow::getExecutorTimeout, Workflow::getNamespaceId, diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobLogMergeSchedule.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobLogMergeSchedule.java index 32bfde298..a19c24064 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobLogMergeSchedule.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobLogMergeSchedule.java @@ -94,7 +94,7 @@ public class JobLogMergeSchedule extends AbstractSchedule implements Lifecycle { private List jobTaskBatchList(Long startId, LocalDateTime endTime) { List jobTaskBatchList = jobTaskBatchMapper.selectPage( - new Page<>(0, 1000), + new Page<>(0, 1000, Boolean.FALSE), new LambdaUpdateWrapper() .ge(JobTaskBatch::getId, startId) .in(JobTaskBatch::getTaskBatchStatus, JobTaskBatchStatusEnum.COMPLETED) diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java index 655a9d67b..18d72217e 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java @@ -196,7 +196,7 @@ public class ScanRetryActor extends AbstractActor { public List listAvailableTasks(Long startId, Set buckets) { List retries = accessTemplate.getRetryAccess() - .listPage(new PageDTO<>(0, systemProperties.getRetryPullPageSize()), + .listPage(new PageDTO<>(0, systemProperties.getRetryPullPageSize(), Boolean.FALSE), new LambdaQueryWrapper() .select(Retry::getId, Retry::getNextTriggerAt, Retry::getGroupName, Retry::getRetryCount, Retry::getSceneName, Retry::getNamespaceId, Retry::getTaskType) diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/CleanerSchedule.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/CleanerSchedule.java index 718473a91..b2729b6bd 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/CleanerSchedule.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/CleanerSchedule.java @@ -112,7 +112,7 @@ public class CleanerSchedule extends AbstractSchedule implements Lifecycle { private List retryTaskBatchList(Long startId, LocalDateTime endTime) { List retryTaskList = retryMapper.selectPage( - new Page<>(0, 500), + new Page<>(0, 500, Boolean.FALSE), new LambdaUpdateWrapper() .ge(Retry::getId, startId) .le(Retry::getCreateDt, endTime) diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryLogMergeSchedule.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryLogMergeSchedule.java index 23dd1c19b..c4cadb1da 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryLogMergeSchedule.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryLogMergeSchedule.java @@ -94,7 +94,7 @@ public class RetryLogMergeSchedule extends AbstractSchedule implements Lifecycle private List retryLogList(Long startId, LocalDateTime endTime) { List jobTaskBatchList = retryTaskMapper.selectPage( - new Page<>(0, 1000), + new Page<>(0, 1000, Boolean.FALSE), new LambdaUpdateWrapper() .ge(RetryTask::getId, startId) .in(RetryTask::getTaskStatus, Lists.newArrayList(