From d39fb43ef663c24ce9b09db63dc5acb31903e5b6 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Thu, 17 Apr 2025 23:26:00 +0800 Subject: [PATCH] =?UTF-8?q?feat(1.5.0-beta1):=20=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=94=B9=E4=B8=BA=E5=88=86=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/access/log/JobLogMessageAccess.java | 2 +- .../server/web/service/impl/JobLogServiceImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/JobLogMessageAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/JobLogMessageAccess.java index 1021a97bf..35df8cf4a 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/JobLogMessageAccess.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/JobLogMessageAccess.java @@ -56,7 +56,7 @@ public class JobLogMessageAccess implements JobLogAccess { PageDTO selectPage = jobLogMessageMapper.selectPage( new PageDTO<>(queryDO.getPage(), logPageQueryDO.getSize(), logPageQueryDO.isSearchCount()), new LambdaQueryWrapper() - .ge(JobLogMessage::getRealTime, logPageQueryDO.getStartRealTime()) + .gt(JobLogMessage::getRealTime, logPageQueryDO.getStartRealTime()) .eq(JobLogMessage::getTaskBatchId, logPageQueryDO.getTaskBatchId()) .eq(JobLogMessage::getTaskId, logPageQueryDO.getTaskId()) .orderByAsc(JobLogMessage::getId) diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobLogServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobLogServiceImpl.java index 6ad178d69..8e4ad0975 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobLogServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobLogServiceImpl.java @@ -53,8 +53,8 @@ public class JobLogServiceImpl implements JobLogService { int totalPage = (int) ((total + queryVO.getSize() - 1) / queryVO.getSize()); - Long lastRealTime = null; - for (int i = 1; i < totalPage; i++) { + Long lastRealTime = 0L; + for (int i = 1; i <= totalPage;) { for (JobLogMessageDO jobLogMessageDO : pageResponseDO.getRows()) { // 循环覆盖，最后一个肯定是最大的 lastRealTime = jobLogMessageDO.getRealTime(); @@ -75,7 +75,7 @@ public class JobLogServiceImpl implements JobLogService { // 继续查询下一页 pageQueryDO.setSearchCount(false); - pageQueryDO.setPage((i - 1) * queryVO.getSize()); + pageQueryDO.setPage(++i); pageResponseDO = accessTemplate.getJobLogMessageAccess() .listPage(pageQueryDO); } @@ -96,7 +96,7 @@ public class JobLogServiceImpl implements JobLogService { SnailSpringContext.getContext().publishEvent(sendEvent); } else { // 覆盖作为下次查询的起始条件 - pageQueryDO.setStartRealTime(lastRealTime); + queryVO.setStartRealTime(lastRealTime); // 继续查询 scheduleNextAttempt(queryVO, sid); }