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); }