From 0a4d548b6bf9cfef252400fb6d6612e45cf5b602 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 27 十月 2026 13:21:23 +0800
Subject: [PATCH] fix(scheduler): 修复定时任务调度问题并增强系统稳定性

---
 src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskScheduler.java      |   27 ++++++++
 src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java    |   46 +++++++++++++++
 src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java |   75 +++++++++++++++++++++++--
 src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java            |    4 +
 src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java   |   25 +++++++
 5 files changed, 166 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
index 204667b..fbc1b15 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
+++ b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
@@ -48,6 +48,10 @@
             if (timingTask == null) {
                 throw new JobExecutionException("MaintenanceTaskJob鎵句笉鍒板畾鏃朵换鍔�: " + taskId);
             }
+            // 浠诲姟宸插仠鐢ㄦ椂涓嶇敓鎴愪繚鍏昏褰�
+            if (!timingTask.isActive()) {
+                return;
+            }
 
             // 2. 鍒涘缓骞朵繚瀛樺贰妫�浠诲姟璁板綍 - 杩欏氨鏄偍鎻愪緵鐨勪唬鐮佸簲璇ユ斁鐨勪綅缃�
             DeviceMaintenance deviceMaintenance = createInspectionTask(timingTask);
diff --git a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskScheduler.java b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskScheduler.java
index ec7a8e3..17fb7da 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskScheduler.java
+++ b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskScheduler.java
@@ -48,7 +48,13 @@
            // 鑾峰彇鐜版湁瑙﹀彂鍣ㄥ苟杞崲涓� CronTrigger
            Trigger oldTrigger = scheduler.getTrigger(triggerKey);
            if (!(oldTrigger instanceof CronTrigger)) {
-               throw new SchedulerException("Existing trigger is not a CronTrigger");
+               // 瑙﹀彂鍣ㄤ笉瀛樺湪锛堥娆¢儴缃插悗浠庢湭娉ㄥ唽锛屾垨璋冨害璁板綍琚竻鐞嗭級锛屾敼涓洪噸鏂板垱寤�
+               JobKey jobKey = new JobKey("MaintenanceTask_" + task.getId());
+               if (scheduler.checkExists(jobKey)) {
+                   scheduler.deleteJob(jobKey);
+               }
+               scheduleMaintenanceTask(task);
+               return;
            }
 
            // 3. 鏋勫缓CronTrigger锛岀‘淇濇寔涔呭寲閰嶇疆
@@ -57,7 +63,8 @@
                    .withDescription(task.getTaskName() + "_TRIGGER") // 瑙﹀彂鍣ㄦ弿杩�
                    .forJob(oldTrigger.getJobKey())                       // 鍏宠仈瀵瑰簲鐨凧ob
                    .withSchedule(CronScheduleBuilder
-                           .cronSchedule(convertToCronExpression(task)) // 閿欒繃鎵ц鏃剁殑绛栫暐锛堟牴鎹笟鍔¤皟鏁达級
+                           .cronSchedule(convertToCronExpression(task))
+                           .withMisfireHandlingInstructionDoNothing()
                    )
                    // 4. 璁剧疆寮�濮嬫椂闂达紙鑻ヤ负null鍒欑珛鍗崇敓鏁堬級
                    .startAt(task.getNextExecutionTime() != null
@@ -72,6 +79,22 @@
     }
 
     /**
+     * 纭繚浠诲姟宸插湪璋冨害鍣ㄤ腑锛屾湭娉ㄥ唽鏃惰ˉ娉ㄥ唽锛堝簲鐢ㄥ惎鍔ㄦ椂鎭㈠浣跨敤锛�
+     */
+    public void ensureScheduled(MaintenanceTask task){
+        try {
+            JobKey jobKey = new JobKey("MaintenanceTask_" + task.getId());
+            if (scheduler.checkExists(jobKey)) {
+                return;
+            }
+            scheduleMaintenanceTask(task);
+            log.info("琛ユ敞鍐屼繚鍏诲畾鏃朵换鍔�: id={}, name={}", task.getId(), task.getTaskName());
+        } catch (SchedulerException e) {
+            log.error("SchedulerException ensureScheduled ERROR", e);
+        }
+    }
+
+    /**
      * 鏆傚仠浠诲姟
      */
     public void pauseMaintenanceTask(Long taskId) throws SchedulerException {
diff --git a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
index d0ba21f..b8abe83 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
@@ -12,6 +12,7 @@
 import com.ruoyi.inspectiontask.service.impl.TimingTaskServiceImpl;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.mapper.SysUserMapper;
+import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -32,6 +33,36 @@
     private final SysUserMapper sysUserMapper;
     private final TimingTaskServiceImpl timingTaskService;
     private final MaintenanceTaskScheduler maintenanceTaskScheduler;
+
+    /**
+     * 鍚姩鏃舵妸宸插惎鐢ㄤ絾鏈敞鍐屽埌 Quartz 鐨勪繚鍏讳换鍔¤ˉ娉ㄥ唽锛�
+     * 閬垮厤璋冨害璁板綍涓㈠け鍚庡畾鏃朵换鍔¢潤榛樹笉鎵ц
+     */
+    @PostConstruct
+    public void restoreScheduledTasks() {
+        try {
+            List<MaintenanceTask> tasks = maintenanceTaskMapper.selectList(new QueryWrapper<MaintenanceTask>()
+                    .eq("is_active", 1)
+                    .eq("deleted", 0));
+            for (MaintenanceTask task : tasks) {
+                try {
+                    TimingTask timingTask = new TimingTask();
+                    timingTask.setFrequencyType(task.getFrequencyType());
+                    timingTask.setFrequencyDetail(task.getFrequencyDetail());
+                    LocalDateTime nextTime = timingTaskService.calculateFirstExecutionTime(timingTask);
+                    if (!Objects.equals(task.getNextExecutionTime(), nextTime)) {
+                        task.setNextExecutionTime(nextTime);
+                        maintenanceTaskMapper.updateById(task);
+                    }
+                    maintenanceTaskScheduler.ensureScheduled(task);
+                } catch (Exception e) {
+                    log.error("鎭㈠淇濆吇瀹氭椂浠诲姟澶辫触: id={}, name={}", task.getId(), task.getTaskName(), e);
+                }
+            }
+        } catch (Exception e) {
+            log.error("鎭㈠淇濆吇瀹氭椂浠诲姟寮傚父", e);
+        }
+    }
 
     @Override
     public AjaxResult listPage(Page page, MaintenanceTask maintenanceTask) {
@@ -88,10 +119,23 @@
         if (maintenanceTask1 == null) {
             return AjaxResult.warn("娌℃湁姝ゆ暟鎹�");
         }
+        // 棰戠巼鍙樺寲鏃堕噸绠椾笅娆℃墽琛屾椂闂达紝閬垮厤椤甸潰鏄剧ず涓庡疄闄呰皟搴︿笉涓�鑷�
+        boolean frequencyChanged = !Objects.equals(maintenanceTask.getFrequencyType(), maintenanceTask1.getFrequencyType())
+                || !Objects.equals(maintenanceTask.getFrequencyDetail(), maintenanceTask1.getFrequencyDetail());
         BeanUtils.copyProperties(maintenanceTask, maintenanceTask1);
+        if (frequencyChanged) {
+            TimingTask task = new TimingTask();
+            task.setFrequencyType(maintenanceTask1.getFrequencyType());
+            task.setFrequencyDetail(maintenanceTask1.getFrequencyDetail());
+            maintenanceTask1.setNextExecutionTime(timingTaskService.calculateFirstExecutionTime(task));
+        }
         int update = maintenanceTaskMapper.updateById(maintenanceTask1);
         if (update > 0) {
-            maintenanceTaskScheduler.rescheduleMaintenanceTask(maintenanceTask1);
+            if (maintenanceTask1.isActive()) {
+                maintenanceTaskScheduler.rescheduleMaintenanceTask(maintenanceTask1);
+            } else {
+                maintenanceTaskScheduler.unscheduleMaintenanceTask(maintenanceTask1.getId());
+            }
         }
         return AjaxResult.success("鏇存柊鎴愬姛");
     }
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java
index a6179f6..3614a39 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java
@@ -2,6 +2,7 @@
 
 import com.ruoyi.inspectiontask.pojo.TimingTask;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.quartz.*;
 import org.springframework.stereotype.Service;
 
@@ -13,6 +14,7 @@
 import java.util.stream.Collectors;
 
 @Service
+@Slf4j
 @RequiredArgsConstructor
 public class TimingTaskScheduler {
 
@@ -36,7 +38,13 @@
         // 鑾峰彇鐜版湁瑙﹀彂鍣ㄥ苟杞崲涓� CronTrigger
         Trigger oldTrigger = scheduler.getTrigger(triggerKey);
         if (!(oldTrigger instanceof CronTrigger)) {
-            throw new SchedulerException("Existing trigger is not a CronTrigger");
+            // 瑙﹀彂鍣ㄤ笉瀛樺湪锛堥娆¢儴缃插悗浠庢湭娉ㄥ唽锛屾垨璋冨害璁板綍琚竻鐞嗭級锛屾敼涓洪噸鏂板垱寤�
+            JobKey jobKey = new JobKey("timingTask_" + task.getId());
+            if (scheduler.checkExists(jobKey)) {
+                scheduler.deleteJob(jobKey);
+            }
+            scheduleTimingTask(task);
+            return;
         }
 
         // 3. 鏋勫缓CronTrigger锛岀‘淇濇寔涔呭寲閰嶇疆
@@ -45,7 +53,8 @@
                 .withDescription(task.getTaskName() + "_TRIGGER") // 瑙﹀彂鍣ㄦ弿杩�
                 .forJob(oldTrigger.getJobKey())                       // 鍏宠仈瀵瑰簲鐨凧ob
                 .withSchedule(CronScheduleBuilder
-                        .cronSchedule(convertToCronExpression(task)) // 閿欒繃鎵ц鏃剁殑绛栫暐锛堟牴鎹笟鍔¤皟鏁达級
+                        .cronSchedule(convertToCronExpression(task))
+                        .withMisfireHandlingInstructionDoNothing()
                 )
                 // 4. 璁剧疆寮�濮嬫椂闂达紙鑻ヤ负null鍒欑珛鍗崇敓鏁堬級
                 .startAt(task.getNextExecutionTime() != null
@@ -66,6 +75,18 @@
     }
 
     /**
+     * 纭繚浠诲姟宸插湪璋冨害鍣ㄤ腑锛屾湭娉ㄥ唽鏃惰ˉ娉ㄥ唽锛堝簲鐢ㄥ惎鍔ㄦ椂鎭㈠浣跨敤锛�
+     */
+    public void ensureScheduled(TimingTask task) throws SchedulerException {
+        JobKey jobKey = new JobKey("timingTask_" + task.getId());
+        if (scheduler.checkExists(jobKey)) {
+            return;
+        }
+        scheduleTimingTask(task);
+        log.info("琛ユ敞鍐屽贰妫�瀹氭椂浠诲姟: id={}, name={}", task.getId(), task.getTaskName());
+    }
+
+    /**
      * 鏆傚仠浠诲姟
      */
     public void pauseTimingTask(Long taskId) throws SchedulerException {
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java
index ebe615d..deb88ac 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java
@@ -12,6 +12,7 @@
 import com.ruoyi.inspectiontask.service.TimingTaskService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.mapper.SysUserMapper;
+import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.SchedulerException;
@@ -37,6 +38,33 @@
     private final SysUserMapper sysUserMapper;
     private static final int ENABLED = 1;
     private static final int DISABLED = 0;
+
+    /**
+     * 鍚姩鏃舵妸宸插惎鐢ㄤ絾鏈敞鍐屽埌 Quartz 鐨勫贰妫�浠诲姟琛ユ敞鍐岋紝
+     * 閬垮厤璋冨害璁板綍涓㈠け鍚庡畾鏃朵换鍔¢潤榛樹笉鎵ц
+     */
+    @PostConstruct
+    public void restoreScheduledTasks() {
+        try {
+            List<TimingTask> tasks = timingTaskMapper.selectList(new LambdaQueryWrapper<TimingTask>()
+                    .eq(TimingTask::getIsEnabled, ENABLED)
+                    .eq(TimingTask::getDeleted, 0));
+            for (TimingTask task : tasks) {
+                try {
+                    LocalDateTime nextTime = calculateFirstExecutionTime(task);
+                    if (!Objects.equals(task.getNextExecutionTime(), nextTime)) {
+                        task.setNextExecutionTime(nextTime);
+                        timingTaskMapper.updateById(task);
+                    }
+                    timingTaskScheduler.ensureScheduled(task);
+                } catch (Exception e) {
+                    log.error("鎭㈠宸℃瀹氭椂浠诲姟澶辫触: id={}, name={}", task.getId(), task.getTaskName(), e);
+                }
+            }
+        } catch (Exception e) {
+            log.error("鎭㈠宸℃瀹氭椂浠诲姟寮傚父", e);
+        }
+    }
 
 
     @Override
@@ -161,8 +189,11 @@
             }
             return result;
         } else {
-
-
+            // 棰戠巼鍙樺寲鏃堕噸绠椾笅娆℃墽琛屾椂闂达紝閬垮厤椤甸潰鏄剧ず涓庡疄闄呰皟搴︿笉涓�鑷�
+            if (!Objects.equals(oldTimingTask.getFrequencyType(), timingTask.getFrequencyType())
+                    || !Objects.equals(oldTimingTask.getFrequencyDetail(), timingTask.getFrequencyDetail())) {
+                timingTask.setNextExecutionTime(calculateFirstExecutionTime(timingTask));
+            }
             int result = timingTaskMapper.updateById(timingTask);
             if (result > 0) {
                 boolean oldEnabled = isEnabled(oldTimingTask == null ? null : oldTimingTask.getIsEnabled(), oldTimingTask != null && oldTimingTask.isActive());
@@ -194,8 +225,8 @@
             // 濡傛灉鏄瘡鏈堟墽琛岋紝璁$畻涓嬩釜鏈堢殑鍏蜂綋鏃ユ湡
             return calculateMonthlyFirstExecution(task.getFrequencyDetail());
         } else if ("QUARTERLY".equals(frequencyType)) {
-            // 鑷畾涔夐鐜囷紝濡傛瘡灏忔椂銆佹瘡30鍒嗛挓绛�
-            return calculateCustomFirstExecution(task.getFrequencyDetail());
+            // 瀛e害鎵ц锛屾牸寮忎负 鏈�,鏃�,鏃堕棿
+            return calculateQuarterlyFirstExecution(task.getFrequencyDetail());
         } else {
             throw new IllegalArgumentException("涓嶆敮鎸佺殑棰戠巼绫诲瀷: " + task.getFrequencyType());
         }
@@ -314,8 +345,40 @@
         return targetDateTime;
     }
 
-    private LocalDateTime calculateCustomFirstExecution(String frequencyDetail) {
-        return null;
+    /**
+     * 璁$畻瀛e害浠诲姟鐨勯娆℃墽琛屾椂闂达紝鏍煎紡涓� 鏈�,鏃�,鏃堕棿锛堝 01,15,14:00锛�
+     * 鎵ц鏈堜唤鎸夊搴﹁捣鐐瑰榻愶紝涓� convertQuarterlyToCron 鐢熸垚鐨� cron 淇濇寔涓�鑷�
+     */
+    private LocalDateTime calculateQuarterlyFirstExecution(String frequencyDetail) {
+        String[] parts = frequencyDetail.split(",");
+        if (parts.length != 3) {
+            throw new IllegalArgumentException("鍙傛暟鏍煎紡閿欒锛屽簲涓�'01,15,14:00'鏍煎紡");
+        }
+        int month = Integer.parseInt(parts[0].trim());
+        int dayOfMonth = Integer.parseInt(parts[1].trim());
+        LocalTime time = LocalTime.parse(parts[2].trim(), DateTimeFormatter.ofPattern("HH:mm"));
+        if (month < 1 || month > 12) {
+            throw new IllegalArgumentException("鏈堜唤蹇呴』鍦�1-12涔嬮棿: " + month);
+        }
+        if (dayOfMonth < 1 || dayOfMonth > 31) {
+            throw new IllegalArgumentException("鏃ユ湡蹇呴』鍦�1-31涔嬮棿: " + dayOfMonth);
+        }
+
+        // 鎸夊搴﹁捣鐐瑰榻愭墽琛屾湀浠斤紙1銆�4銆�7銆�10 鏈堬級
+        int quarterStartMonth = ((month - 1) / 3) * 3 + 1;
+        LocalDateTime now = LocalDateTime.now();
+        int currentYear = now.getYear();
+        for (int i = 0; i < 8; i++) {
+            int totalMonth = quarterStartMonth + i * 3;
+            int year = currentYear + (totalMonth - 1) / 12;
+            int targetMonth = ((totalMonth - 1) % 12) + 1;
+            int adjustedDay = Math.min(dayOfMonth, YearMonth.of(year, targetMonth).lengthOfMonth());
+            LocalDateTime candidate = LocalDateTime.of(year, targetMonth, adjustedDay, time.getHour(), time.getMinute());
+            if (candidate.isAfter(now)) {
+                return candidate;
+            }
+        }
+        throw new IllegalStateException("鏃犳硶璁$畻瀛e害浠诲姟鐨勯娆℃墽琛屾椂闂�: " + frequencyDetail);
     }
 
     @Override

--
Gitblit v1.9.3