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

feat(sj_1.0.0): 修复sqlserver数据库MP分页查询是没有带order by 导致的查询报错

Browse Source
This commit is contained in:
opensnail 2024-06-02 17:43:09 +08:00
parent 71a03b083e
commit 67a714fb36
7 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/util/PartitionTaskUtils.java
View File

@ -19,6 +19,14 @@ public class PartitionTaskUtils {
private PartitionTaskUtils() {
}
/**
* 使用此方法必须order id asc
*
* @param dataSource 数据来源
* @param task 执行任务
* @param startId 初始id
* @return 总任务数
*/
public static long process(LongFunction<List<? extends PartitionTask>> dataSource,
Consumer<List<? extends PartitionTask>> task,
long startId) {

7
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobClearLogSchedule.java
View File

@ -102,8 +102,11 @@ public class JobClearLogSchedule extends AbstractSchedule implements Lifecycle {
List<JobTaskBatch> jobTaskBatchList = jobTaskBatchMapper.selectPage(
new Page<>(0, 1000),
new LambdaUpdateWrapper<JobTaskBatch>().ge(JobTaskBatch::getId, startId)
.le(JobTaskBatch::getCreateDt, endTime)).getRecords();
new LambdaUpdateWrapper<JobTaskBatch>()
.ge(JobTaskBatch::getId, startId)
.le(JobTaskBatch::getCreateDt, endTime)
.orderByAsc(JobTaskBatch::getId)
).getRecords();
return JobTaskConverter.INSTANCE.toJobTaskBatchPartitionTasks(jobTaskBatchList);
}

7
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobLogMergeSchedule.java
View File

@ -104,9 +104,12 @@ public class JobLogMergeSchedule extends AbstractSchedule implements Lifecycle {
List<JobTaskBatch> jobTaskBatchList = jobTaskBatchMapper.selectPage(
new Page<>(0, 1000),
new LambdaUpdateWrapper<JobTaskBatch>().ge(JobTaskBatch::getId, startId)
new LambdaUpdateWrapper<JobTaskBatch>()
.ge(JobTaskBatch::getId, startId)
.in(JobTaskBatch::getTaskBatchStatus, JobTaskBatchStatusEnum.COMPLETED)
.le(JobTaskBatch::getCreateDt, endTime)).getRecords();
.le(JobTaskBatch::getCreateDt, endTime)
.orderByAsc(JobTaskBatch::getId)
).getRecords();
return JobTaskConverter.INSTANCE.toJobTaskBatchPartitionTasks(jobTaskBatchList);
}

6
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/ClearLogSchedule.java
View File

@ -96,7 +96,11 @@ public class ClearLogSchedule extends AbstractSchedule implements Lifecycle {
List<RetryTaskLog> retryTaskLogList = retryTaskLogMapper.selectPage(
new Page<>(0, 1000),
new LambdaUpdateWrapper<RetryTaskLog>().ge(RetryTaskLog::getId, startId).le(RetryTaskLog::getCreateDt, endTime)).getRecords();
new LambdaUpdateWrapper<RetryTaskLog>()
.ge(RetryTaskLog::getId, startId)
.le(RetryTaskLog::getCreateDt, endTime)
.orderByAsc(RetryTaskLog::getId)
).getRecords();
return RetryTaskConverter.INSTANCE.toRetryTaskLogPartitionTasks(retryTaskLogList);
}

8
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryErrorMoreThresholdAlarmSchedule.java
View File

@ -123,10 +123,12 @@ public class RetryErrorMoreThresholdAlarmSchedule extends AbstractSchedule imple
private List<NotifyConfigPartitionTask> getNotifyConfigPartitions(Long startId) {
List<NotifyConfig> notifyConfigs = accessTemplate.getNotifyConfigAccess()
.listPage(new PageDTO<>(startId, 1000), new LambdaQueryWrapper<NotifyConfig>()
.listPage(new PageDTO<>(0, 1000), new LambdaQueryWrapper<NotifyConfig>()
.gt(NotifyConfig::getId, startId)
.eq(NotifyConfig::getNotifyStatus, StatusEnum.YES.getStatus())
.eq(NotifyConfig::getNotifyScene, RetryNotifySceneEnum.MAX_RETRY_ERROR.getNotifyScene()))
.getRecords();
.eq(NotifyConfig::getNotifyScene, RetryNotifySceneEnum.MAX_RETRY_ERROR.getNotifyScene())
.orderByAsc(NotifyConfig::getId)
).getRecords();
if (CollUtil.isEmpty(notifyConfigs)) {
return Lists.newArrayList();

4
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryLogMergeSchedule.java
View File

@ -109,7 +109,9 @@ public class RetryLogMergeSchedule extends AbstractSchedule implements Lifecycle
.in(RetryTaskLog::getRetryStatus, Lists.newArrayList(
RetryStatusEnum.FINISH.getStatus(),
RetryStatusEnum.MAX_COUNT.getStatus()))
.le(RetryTaskLog::getCreateDt, endTime)).getRecords();
.le(RetryTaskLog::getCreateDt, endTime)
.orderByAsc(RetryTaskLog::getId)
).getRecords();
return RetryTaskLogConverter.INSTANCE.toRetryMergePartitionTaskDTOs(jobTaskBatchList);
}

4
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryTaskMoreThresholdAlarmSchedule.java
View File

@ -116,11 +116,11 @@ public class RetryTaskMoreThresholdAlarmSchedule extends AbstractSchedule implem
private List<NotifyConfigPartitionTask> getNotifyConfigPartitions(Long startId) {
List<NotifyConfig> notifyConfigs = accessTemplate.getNotifyConfigAccess()
.listPage(new PageDTO<>(startId, 1000), new LambdaQueryWrapper<NotifyConfig>()
.listPage(new PageDTO<>(0, 1000), new LambdaQueryWrapper<NotifyConfig>()
.eq(NotifyConfig::getNotifyStatus, StatusEnum.YES.getStatus())
.eq(NotifyConfig::getSystemTaskType, SyetemTaskTypeEnum.RETRY.getType())
.eq(NotifyConfig::getNotifyScene, RetryNotifySceneEnum.MAX_RETRY.getNotifyScene())
.orderByDesc(NotifyConfig::getId)) // SQLServer 分页必须 ORDER BY
.orderByAsc(NotifyConfig::getId)) // SQLServer 分页必须 ORDER BY
.getRecords();
Set<Long> recipientIds = notifyConfigs.stream()