From 1c6ee314865bf86aebbdaff94e5710fe68ce0d91 Mon Sep 17 00:00:00 2001
From: Odboy <tianjun@odboy.cn>
Date: Tue, 25 Mar 2025 19:13:08 +0800
Subject: [PATCH] =?UTF-8?q?upd:=20=E7=BC=96=E7=A0=81=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/odboy/config/JobRunner.java            | 5 +++--
 .../src/main/java/cn/odboy/mapper/QuartzJobMapper.java      | 2 --
 .../src/main/java/cn/odboy/service/QuartzJobService.java    | 1 +
 .../java/cn/odboy/service/impl/QuartzJobServiceImpl.java    | 5 +++++
 .../src/main/resources/mapper/QuartzJobMapper.xml           | 6 ------
 .../src/main/resources/mapper/QuartzLogMapper.xml           | 1 -
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/config/JobRunner.java b/cutejava/cutejava-job/src/main/java/cn/odboy/config/JobRunner.java
index 99e91708..0199545a 100644
--- a/cutejava/cutejava-job/src/main/java/cn/odboy/config/JobRunner.java
+++ b/cutejava/cutejava-job/src/main/java/cn/odboy/config/JobRunner.java
@@ -2,6 +2,7 @@ package cn.odboy.config;
 
 import cn.odboy.mapper.QuartzJobMapper;
 import cn.odboy.model.job.domain.QuartzJob;
+import cn.odboy.service.QuartzJobService;
 import cn.odboy.util.QuartzManage;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
@@ -16,7 +17,7 @@ import java.util.List;
 @RequiredArgsConstructor
 public class JobRunner implements ApplicationRunner {
     private static final Logger log = LoggerFactory.getLogger(JobRunner.class);
-    private final QuartzJobMapper quartzJobMapper;
+    private final QuartzJobService quartzJobService;
     private final QuartzManage quartzManage;
 
     /**
@@ -26,7 +27,7 @@ public class JobRunner implements ApplicationRunner {
      */
     @Override
     public void run(ApplicationArguments applicationArguments) {
-        List<QuartzJob> quartzJobs = quartzJobMapper.selectActiveJob();
+        List<QuartzJob> quartzJobs = quartzJobService.listActiveJob();
         quartzJobs.forEach(quartzManage::addJob);
         log.info("Timing task injection complete");
     }
diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzJobMapper.java b/cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzJobMapper.java
index e776f533..8ccb574e 100644
--- a/cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzJobMapper.java
+++ b/cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzJobMapper.java
@@ -16,6 +16,4 @@ public interface QuartzJobMapper extends BaseMapper<QuartzJob> {
     IPage<QuartzJob> selectByPage(@Param("criteria") QuartzJobQueryCriteria criteria, Page<Object> page);
 
     List<QuartzJob> selectByPage(@Param("criteria") QuartzJobQueryCriteria criteria);
-
-    List<QuartzJob> selectActiveJob();
 }
diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/service/QuartzJobService.java b/cutejava/cutejava-job/src/main/java/cn/odboy/service/QuartzJobService.java
index 1165b298..2256ced0 100644
--- a/cutejava/cutejava-job/src/main/java/cn/odboy/service/QuartzJobService.java
+++ b/cutejava/cutejava-job/src/main/java/cn/odboy/service/QuartzJobService.java
@@ -109,4 +109,5 @@ public interface QuartzJobService extends IService<QuartzJob> {
      * @throws InterruptedException /
      */
     void executionSubJob(String[] tasks) throws InterruptedException;
+    List<QuartzJob> listActiveJob();
 }
diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/service/impl/QuartzJobServiceImpl.java b/cutejava/cutejava-job/src/main/java/cn/odboy/service/impl/QuartzJobServiceImpl.java
index aadb2537..7d62818f 100644
--- a/cutejava/cutejava-job/src/main/java/cn/odboy/service/impl/QuartzJobServiceImpl.java
+++ b/cutejava/cutejava-job/src/main/java/cn/odboy/service/impl/QuartzJobServiceImpl.java
@@ -134,6 +134,11 @@ public class QuartzJobServiceImpl extends ServiceImpl<QuartzJobMapper, QuartzJob
         }
     }
 
+    @Override
+    public List<QuartzJob> listActiveJob() {
+        return lambdaQuery().eq(QuartzJob::getIsPause, 0).list();
+    }
+
     @Override
     public void download(List<QuartzJob> quartzJobs, HttpServletResponse response) throws IOException {
         List<Map<String, Object>> list = new ArrayList<>();
diff --git a/cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml b/cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml
index 8946c773..aa83ffc5 100644
--- a/cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml
+++ b/cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml
@@ -15,10 +15,4 @@
         </where>
         ORDER BY id DESC
     </select>
-
-    <select id="selectPauseJob" resultType="cn.odboy.model.job.domain.QuartzJob">
-        SELECT *
-        FROM sys_quartz_job
-        WHERE is_pause = 0
-    </select>
 </mapper>
\ No newline at end of file
diff --git a/cutejava/cutejava-job/src/main/resources/mapper/QuartzLogMapper.xml b/cutejava/cutejava-job/src/main/resources/mapper/QuartzLogMapper.xml
index 3934b0aa..90adef6a 100644
--- a/cutejava/cutejava-job/src/main/resources/mapper/QuartzLogMapper.xml
+++ b/cutejava/cutejava-job/src/main/resources/mapper/QuartzLogMapper.xml
@@ -18,5 +18,4 @@
         </where>
         ORDER BY id DESC
     </select>
-
 </mapper>
\ No newline at end of file