fix: 设备保养和巡检定时任务修改

gongchunyi

3 天以前 0481b3942353f83c8506d77a0fc1a447a6942763

 src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java

@@ -1,8 +1,8 @@
package com.ruoyi.inspectiontask.service.impl;

import com.ruoyi.inspectiontask.pojo.TimingTask;
import lombok.RequiredArgsConstructor;
import org.quartz.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.LocalTime;
@@ -13,10 +13,10 @@
import java.util.stream.Collectors;

@Service
@RequiredArgsConstructor
public class TimingTaskScheduler {

    @Autowired
    private Scheduler scheduler;
    private final Scheduler scheduler;

    /**
     * 添加新任务到调度器
@@ -31,15 +31,37 @@
     * 更新已有任务
     */
    public void rescheduleTimingTask(TimingTask task) throws SchedulerException {
        TriggerKey triggerKey = new TriggerKey("trigger_" + task.getId(), "TIMING_TASK_TRIGGER_GROUP");
        TriggerKey triggerKey = new TriggerKey("trigger_" + task.getId());
        JobKey jobKey = new JobKey("timingTask_" + task.getId());

        // 获取现有触发器并转换为 CronTrigger
        // 获取现有触发器
        Trigger oldTrigger = scheduler.getTrigger(triggerKey);
        if (!(oldTrigger instanceof CronTrigger)) {
            throw new SchedulerException("Existing trigger is not a CronTrigger");

        if (oldTrigger == null) {
            if (!scheduler.checkExists(jobKey)) {
                JobDetail jobDetail = buildJobDetail(task);
                Trigger newTrigger = buildJobTrigger(task, jobDetail);
                scheduler.scheduleJob(jobDetail, newTrigger);
            } else {
                Trigger newTrigger = buildJobTrigger(task, scheduler.getJobDetail(jobKey));
                scheduler.scheduleJob(newTrigger);
            }
            return;
        }

        // 3. 构建CronTrigger，确保持久化配置
        if (!(oldTrigger instanceof CronTrigger)) {
            scheduler.unscheduleJob(triggerKey);
            if (!scheduler.checkExists(jobKey)) {
                JobDetail jobDetail = buildJobDetail(task);
                Trigger newTrigger = buildJobTrigger(task, jobDetail);
                scheduler.scheduleJob(jobDetail, newTrigger);
            } else {
                Trigger newTrigger = buildJobTrigger(task, scheduler.getJobDetail(jobKey));
                scheduler.scheduleJob(newTrigger);
            }
            return;
        }

        CronTrigger newTrigger = TriggerBuilder.newTrigger()
                .withIdentity(triggerKey)                // 唯一标识，用于持久化存储
                .withDescription(task.getTaskName() + "_TRIGGER") // 触发器描述
@@ -47,20 +69,11 @@
                .withSchedule(CronScheduleBuilder
                        .cronSchedule(convertToCronExpression(task)) // 错过执行时的策略（根据业务调整）
                )
                // 4. 设置开始时间（若为null则立即生效）
                // 设置开始时间（若为null则立即生效）
                .startAt(task.getNextExecutionTime() != null
                        ? Date.from(task.getNextExecutionTime().atZone(ZoneId.systemDefault()).toInstant())
                        : new Date())
                .build();

        // 构建新触发器
//        Trigger newTrigger = TriggerBuilder.newTrigger()
//                .withIdentity(triggerKey)
//                .withDescription(task.getTaskName())
//                .withSchedule(CronScheduleBuilder.cronSchedule(convertToCronExpression(task)))
//                .startAt(Date.from(task.getNextExecutionTime().atZone(ZoneId.systemDefault()).toInstant()))
//                .forJob(oldTrigger.getJobKey())
//                .build();

        scheduler.rescheduleJob(triggerKey, newTrigger);
    }
@@ -84,14 +97,18 @@
    /**
     * 删除任务
     */
    public void unscheduleTimingTask(Long taskId) throws SchedulerException {
        JobKey jobKey = new JobKey("timingTask_" + taskId);
        scheduler.deleteJob(jobKey);
    public void unscheduleTimingTask(Long taskId){
        try {
            JobKey jobKey = new JobKey("timingTask_" + taskId);
            scheduler.deleteJob(jobKey);
        }catch (SchedulerException e){
            throw new RuntimeException(e);
        }
    }

    private JobDetail buildJobDetail(TimingTask task) {
        // 1. 构建唯一JobKey（基于任务ID，确保重启后能识别）
        JobKey jobKey = new JobKey("timingTask_" + task.getId(), "TIMING_TASK_GROUP");
        JobKey jobKey = new JobKey("timingTask_" + task.getId());

        // 2. 封装任务数据（仅使用基本类型，确保可序列化）
        JobDataMap jobDataMap = new JobDataMap();
@@ -105,20 +122,20 @@
                .withIdentity(jobKey)                    // 唯一标识，用于持久化存储
                .withDescription(task.getTaskName())     // 任务描述，存入数据库
                .usingJobData(jobDataMap)                // 绑定任务数据
                .storeDurably()                          // 即使没有触发器关联也持久化保存
                .storeDurably(true)                          // 即使没有触发器关联也持久化保存
                .requestRecovery(true)                   // 当调度器崩溃后恢复时，重新执行未完成的任务
                .build();
    }

    private Trigger buildJobTrigger(TimingTask task, JobDetail jobDetail) {
        // 1. 构建唯一TriggerKey（基于任务ID）
        TriggerKey triggerKey = new TriggerKey("trigger_" + task.getId(), "TIMING_TASK_TRIGGER_GROUP");
        TriggerKey triggerKey = new TriggerKey("trigger_" + task.getId());

        // 2. 生成Cron表达式（原逻辑不变）
        String cronExpression = convertToCronExpression(task);

        // 3. 构建CronTrigger，确保持久化配置
        CronTrigger trigger = TriggerBuilder.newTrigger()
        return TriggerBuilder.newTrigger()
                .withIdentity(triggerKey)                // 唯一标识，用于持久化存储
                .withDescription(task.getTaskName() + "_TRIGGER") // 触发器描述
                .forJob(jobDetail)                       // 关联对应的Job
@@ -131,7 +148,6 @@
                        ? Date.from(task.getNextExecutionTime().atZone(ZoneId.systemDefault()).toInstant())
                        : new Date())
                .build();
        return trigger;
    }
    private String convertToCronExpression(TimingTask task) {
        // 参数校验