|
@@ -35,9 +35,9 @@ public class JobBriefingServiceImpl implements JobBriefingService {
|
|
|
// 1. 获取昨日执行的任务列表
|
|
// 1. 获取昨日执行的任务列表
|
|
|
List<Integer> executedJobIds = jobBriefingMapper.selectExecutedJobIds(startTime, endTime);
|
|
List<Integer> executedJobIds = jobBriefingMapper.selectExecutedJobIds(startTime, endTime);
|
|
|
|
|
|
|
|
- // 2. 获取非删除状态的任务(1已发布 2运行中 3暂停)
|
|
|
|
|
|
|
+ // 2. 获取非删除且非暂停的任务(1已发布 2运行中)
|
|
|
LambdaQueryWrapper<SysJob> queryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<SysJob> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper.in(SysJob::getJobStatus, "1", "2", "3");
|
|
|
|
|
|
|
+ queryWrapper.in(SysJob::getJobStatus, "1", "2");
|
|
|
List<SysJob> runningJobList = sysJobService.list(queryWrapper);
|
|
List<SysJob> runningJobList = sysJobService.list(queryWrapper);
|
|
|
if (runningJobList == null) {
|
|
if (runningJobList == null) {
|
|
|
runningJobList = Collections.emptyList();
|
|
runningJobList = Collections.emptyList();
|
|
@@ -154,11 +154,6 @@ public class JobBriefingServiceImpl implements JobBriefingService {
|
|
|
LocalDateTime now = LocalDateTime.now();
|
|
LocalDateTime now = LocalDateTime.now();
|
|
|
|
|
|
|
|
for (SysJob job : runningJobList) {
|
|
for (SysJob job : runningJobList) {
|
|
|
- // 跳过已删除的任务
|
|
|
|
|
- if ("4".equals(job.getJobStatus())) {
|
|
|
|
|
- continue;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
// 检查昨日是否有执行记录
|
|
// 检查昨日是否有执行记录
|
|
|
if (executedSet.contains(job.getJobId())) {
|
|
if (executedSet.contains(job.getJobId())) {
|
|
|
continue;
|
|
continue;
|