init

src/main/java/net/yyc/quartz/mapper/JobBriefingMapper.java

@@ -19,20 +19,6 @@ public interface JobBriefingMapper {
     List<Map<String, Object>> selectJobStatSummary(@Param("startTime") LocalDateTime startTime,
                                                     @Param("endTime") LocalDateTime endTime);
 
-    /**
-     * 查询失败任务列表
-     */
-    List<Map<String, Object>> selectFailedJobs(@Param("startTime") LocalDateTime startTime,
-                                                @Param("endTime") LocalDateTime endTime,
-                                                @Param("limit") int limit);
-
-    /**
-     * 查询Top N最慢任务
-     */
-    List<Map<String, Object>> selectTopSlowJobs(@Param("startTime") LocalDateTime startTime,
-                                                  @Param("endTime") LocalDateTime endTime,
-                                                  @Param("limit") int limit);
-
     /**
      * 查询指定日期有执行记录的任务ID列表
      */

src/main/java/net/yyc/quartz/service/impl/JobBriefingServiceImpl.java

@@ -1,5 +1,6 @@
 package net.yyc.quartz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.yyc.quartz.entity.JobBriefing;
@@ -34,19 +35,18 @@ public class JobBriefingServiceImpl implements JobBriefingService {
         // 1. 获取昨日执行的任务列表
         List<Integer> executedJobIds = jobBriefingMapper.selectExecutedJobIds(startTime, endTime);
 
-        // 2. 获取当前运行中的任务
-        List<SysJob> runningJobs = sysJobService.list(null);
-        if (runningJobs == null) {
-            runningJobs = Collections.emptyList();
+        // 2. 获取非删除状态的任务（1已发布 2运行中 3暂停）
+        LambdaQueryWrapper<SysJob> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(SysJob::getJobStatus, "1", "2", "3");
+        List<SysJob> runningJobList = sysJobService.list(queryWrapper);
+        if (runningJobList == null) {
+            runningJobList = Collections.emptyList();
         }
-        List<SysJob> runningJobList = runningJobs.stream()
-                .filter(job -> "2".equals(job.getJobStatus()))
-                .collect(Collectors.toList());
-
-        // 3. 计算任务列表并集（昨日执行 + 当前运行中）
-        Set<Integer> allJobIds = new HashSet<>();
-        allJobIds.addAll(executedJobIds);
-        runningJobList.forEach(job -> allJobIds.add(job.getJobId()));
+
+        // 3. 任务ID列表
+        Set<Integer> allJobIds = runningJobList.stream()
+                .map(SysJob::getJobId)
+                .collect(Collectors.toSet());
 
         // 4. 获取任务ID到任务的映射
         Map<Integer, SysJob> jobMap = new HashMap<>();

src/main/resources/mapper/JobBriefingMapper.xml

@@ -19,35 +19,6 @@
         GROUP BY job_id, job_name, job_group
     </select>
 
-    <!-- 查询失败任务列表 -->
-    <select id="selectFailedJobs" resultType="map">
-        SELECT
-            job_name,
-            job_group,
-            execute_time,
-            exception_info,
-            create_time
-        FROM sys_job_log
-        WHERE create_time BETWEEN #{startTime} AND #{endTime}
-            AND job_log_status = '1'
-        ORDER BY create_time DESC
-        LIMIT #{limit}
-    </select>
-
-    <!-- 查询Top N最慢任务 -->
-    <select id="selectTopSlowJobs" resultType="map">
-        SELECT
-            job_name,
-            job_group,
-            execute_time
-        FROM sys_job_log
-        WHERE create_time BETWEEN #{startTime} AND #{endTime}
-            AND execute_time IS NOT NULL
-            AND execute_time != ''
-        ORDER BY CAST(execute_time AS SIGNED) DESC
-        LIMIT #{limit}
-    </select>
-
     <!-- 查询指定日期有执行记录的任务ID -->
     <select id="selectExecutedJobIds" resultType="java.lang.Integer">
         SELECT DISTINCT job_id