From 0541c0791acea41b584f71fc59e22d4d21ba0883 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 15 四月 2026 11:10:46 +0800
Subject: [PATCH] ``` refactor(energy): 优化实时能耗数据服务实现
---
src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java | 188 ++++++++++++++++++++++------------------------
1 files changed, 90 insertions(+), 98 deletions(-)
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 cb63d96..5671156 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java
@@ -1,7 +1,17 @@
package com.ruoyi.inspectiontask.service.impl;
import com.ruoyi.inspectiontask.pojo.TimingTask;
-import org.quartz.*;
+import org.quartz.CronScheduleBuilder;
+import org.quartz.CronTrigger;
+import org.quartz.JobBuilder;
+import org.quartz.JobDataMap;
+import org.quartz.JobDetail;
+import org.quartz.JobKey;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.Trigger;
+import org.quartz.TriggerBuilder;
+import org.quartz.TriggerKey;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -18,117 +28,107 @@
@Autowired
private Scheduler scheduler;
- /**
- * 娣诲姞鏂颁换鍔″埌璋冨害鍣�
- */
public void scheduleTimingTask(TimingTask task) throws SchedulerException {
JobDetail jobDetail = buildJobDetail(task);
Trigger trigger = buildJobTrigger(task, jobDetail);
scheduler.scheduleJob(jobDetail, trigger);
}
- /**
- * 鏇存柊宸叉湁浠诲姟
- */
public void rescheduleTimingTask(TimingTask task) throws SchedulerException {
TriggerKey triggerKey = new TriggerKey("trigger_" + task.getId());
-
- // 鑾峰彇鐜版湁瑙﹀彂鍣ㄥ苟杞崲涓� CronTrigger
Trigger oldTrigger = scheduler.getTrigger(triggerKey);
if (!(oldTrigger instanceof CronTrigger)) {
throw new SchedulerException("Existing trigger is not a CronTrigger");
}
- // 鏋勫缓鏂拌Е鍙戝櫒
- Trigger newTrigger = TriggerBuilder.newTrigger()
+ CronTrigger newTrigger = TriggerBuilder.newTrigger()
.withIdentity(triggerKey)
- .withDescription(task.getTaskName())
- .withSchedule(CronScheduleBuilder.cronSchedule(convertToCronExpression(task)))
- .startAt(Date.from(task.getNextExecutionTime().atZone(ZoneId.systemDefault()).toInstant()))
+ .withDescription(task.getTaskName() + "_TRIGGER")
.forJob(oldTrigger.getJobKey())
+ .withSchedule(CronScheduleBuilder.cronSchedule(convertToCronExpression(task)))
+ .startAt(task.getNextExecutionTime() != null
+ ? Date.from(task.getNextExecutionTime().atZone(ZoneId.systemDefault()).toInstant())
+ : new Date())
.build();
scheduler.rescheduleJob(triggerKey, newTrigger);
}
- /**
- * 鏆傚仠浠诲姟
- */
public void pauseTimingTask(Long taskId) throws SchedulerException {
- JobKey jobKey = new JobKey("timingTask_" + taskId);
- scheduler.pauseJob(jobKey);
+ scheduler.pauseJob(new JobKey("timingTask_" + taskId));
}
- /**
- * 鎭㈠浠诲姟
- */
public void resumeTimingTask(Long taskId) throws SchedulerException {
- JobKey jobKey = new JobKey("timingTask_" + taskId);
- scheduler.resumeJob(jobKey);
+ scheduler.resumeJob(new JobKey("timingTask_" + taskId));
}
- /**
- * 鍒犻櫎浠诲姟
- */
- public void unscheduleTimingTask(Long taskId) throws SchedulerException {
- JobKey jobKey = new JobKey("timingTask_" + taskId);
- scheduler.deleteJob(jobKey);
+ public void unscheduleTimingTask(Long taskId) {
+ try {
+ scheduler.deleteJob(new JobKey("timingTask_" + taskId));
+ } catch (SchedulerException e) {
+ throw new RuntimeException(e);
+ }
}
private JobDetail buildJobDetail(TimingTask task) {
+ JobKey jobKey = new JobKey("timingTask_" + task.getId());
JobDataMap jobDataMap = new JobDataMap();
jobDataMap.put("taskId", task.getId());
+ jobDataMap.put("taskName", task.getTaskName());
+ jobDataMap.put("taskType", task.getFrequencyType());
return JobBuilder.newJob(TimingTaskJob.class)
- .withIdentity("timingTask_" + task.getId())
+ .withIdentity(jobKey)
.withDescription(task.getTaskName())
.usingJobData(jobDataMap)
- .storeDurably()
+ .storeDurably(true)
+ .requestRecovery(true)
.build();
}
private Trigger buildJobTrigger(TimingTask task, JobDetail jobDetail) {
+ TriggerKey triggerKey = new TriggerKey("trigger_" + task.getId());
String cronExpression = convertToCronExpression(task);
- TriggerBuilder<CronTrigger> triggerBuilder = TriggerBuilder.newTrigger()
- .withIdentity("trigger_" + task.getId())
- .withDescription(task.getTaskName())
- .withSchedule(CronScheduleBuilder.cronSchedule(cronExpression));
-
- if (jobDetail != null) {
- triggerBuilder.forJob(jobDetail);
- }
-
- if (task.getNextExecutionTime() != null) {
- triggerBuilder.startAt(Date.from(task.getNextExecutionTime().atZone(ZoneId.systemDefault()).toInstant()));
- }
-
- return triggerBuilder.build();
+ return TriggerBuilder.newTrigger()
+ .withIdentity(triggerKey)
+ .withDescription(task.getTaskName() + "_TRIGGER")
+ .forJob(jobDetail)
+ .withSchedule(CronScheduleBuilder.cronSchedule(cronExpression)
+ .withMisfireHandlingInstructionDoNothing())
+ .startAt(task.getNextExecutionTime() != null
+ ? Date.from(task.getNextExecutionTime().atZone(ZoneId.systemDefault()).toInstant())
+ : new Date())
+ .build();
}
private String convertToCronExpression(TimingTask task) {
- // 鍙傛暟鏍￠獙
if (task == null || task.getFrequencyType() == null || task.getFrequencyDetail() == null) {
throw new IllegalArgumentException("浠诲姟鍙傛暟涓嶈兘涓虹┖");
}
- // 浣跨敤switch纭繚鏉′欢浜掓枼
- return switch (task.getFrequencyType().toUpperCase()) { // 缁熶竴杞负澶у啓姣旇緝
- case "DAILY" -> convertDailyToCron(task.getFrequencyDetail());
- case "WEEKLY" -> convertWeeklyToCron(task.getFrequencyDetail());
- case "MONTHLY" -> convertMonthlyToCron(task.getFrequencyDetail());
- case "QUARTERLY" -> convertQuarterlyToCron(task.getFrequencyDetail());
- default -> throw new IllegalArgumentException("涓嶆敮鎸佺殑棰戠巼绫诲瀷: " + task.getFrequencyType());
- };
+ String frequencyType = task.getFrequencyType().toUpperCase();
+ switch (frequencyType) {
+ case "DAILY":
+ return convertDailyToCron(task.getFrequencyDetail());
+ case "WEEKLY":
+ return convertWeeklyToCron(task.getFrequencyDetail());
+ case "MONTHLY":
+ return convertMonthlyToCron(task.getFrequencyDetail());
+ case "QUARTERLY":
+ return convertQuarterlyToCron(task.getFrequencyDetail());
+ case "YEARLY":
+ return convertYearlyToCron(task.getFrequencyDetail());
+ default:
+ throw new IllegalArgumentException("涓嶆敮鎸佺殑棰戠巼绫诲瀷: " + task.getFrequencyType());
+ }
}
- // 姣忔棩浠诲姟杞崲
private String convertDailyToCron(String frequencyDetail) {
LocalTime time = parseTime(frequencyDetail);
return String.format("0 %d %d * * ?", time.getMinute(), time.getHour());
}
- // 姣忓懆浠诲姟杞崲
private String convertWeeklyToCron(String frequencyDetail) {
String[] parts = validateAndSplit(frequencyDetail, ",", 2);
String daysOfWeek = convertDayNamesToCron(parts[0]);
@@ -136,7 +136,6 @@
return String.format("0 %d %d ? * %s", time.getMinute(), time.getHour(), daysOfWeek);
}
- // 姣忔湀浠诲姟杞崲
private String convertMonthlyToCron(String frequencyDetail) {
String[] parts = validateAndSplit(frequencyDetail, ",", 2);
int day = validateDayOfMonth(parts[0]);
@@ -144,29 +143,29 @@
return String.format("0 %d %d %d * ?", time.getMinute(), time.getHour(), day);
}
- // 姣忓搴︿换鍔¤浆鎹�
private String convertQuarterlyToCron(String frequencyDetail) {
String[] parts = validateAndSplit(frequencyDetail, ",", 3);
- int month = validateMonth(parts[0]); // 楠岃瘉鏈堜唤(1-12)
- int day = validateDayOfMonth(parts[1]); // 楠岃瘉鏃ユ湡
- LocalTime time = parseTime(parts[2]); // 瑙ｆ瀽鏃堕棿
+ int month = validateMonth(parts[0]);
+ int day = validateDayOfMonth(parts[1]);
+ LocalTime time = parseTime(parts[2]);
- // 璁＄畻瀛ｅ害璧峰鏈堜唤(1鏈�=1, 4鏈�=4, 7鏈�=7, 10鏈�=10)
int quarterStartMonth = ((month - 1) / 3) * 3 + 1;
-
- return String.format("0 %d %d %d %d/3 ?",
- time.getMinute(),
- time.getHour(),
- day,
- quarterStartMonth);
+ return String.format("0 %d %d %d %d/3 ?", time.getMinute(), time.getHour(), day, quarterStartMonth);
}
- // 鏂板楠岃瘉鏈堜唤鐨勬柟娉�(1-12)
+ private String convertYearlyToCron(String frequencyDetail) {
+ String[] parts = validateAndSplit(frequencyDetail, ",", 3);
+ int month = validateMonth(parts[0]);
+ int day = validateDayOfMonth(parts[1]);
+ LocalTime time = parseTime(parts[2]);
+ return String.format("0 %d %d %d %d ?", time.getMinute(), time.getHour(), day, month);
+ }
+
private int validateMonth(String monthStr) {
try {
int month = Integer.parseInt(monthStr);
if (month < 1 || month > 12) {
- throw new IllegalArgumentException("鏈堜唤蹇呴』鍦�1-12涔嬮棿");
+ throw new IllegalArgumentException("鏈堜唤蹇呴』鍦� 1-12 涔嬮棿");
}
return month;
} catch (NumberFormatException e) {
@@ -174,61 +173,54 @@
}
}
- // 杈呭姪鏂规硶锛氳В鏋愭椂闂�
private LocalTime parseTime(String timeStr) {
try {
return LocalTime.parse(timeStr);
} catch (DateTimeParseException e) {
- throw new IllegalArgumentException("鏃堕棿鏍煎紡蹇呴』涓篐H:mm", e);
+ throw new IllegalArgumentException("鏃堕棿鏍煎紡蹇呴』涓� HH:mm", e);
}
}
- // 杈呭姪鏂规硶锛氶獙璇佸苟鍒嗗壊瀛楃涓�
private String[] validateAndSplit(String input, String delimiter, int expectedParts) {
String[] parts = input.split(delimiter);
if (parts.length != expectedParts) {
- throw new IllegalArgumentException(
- String.format("鏍煎紡閿欒锛屽簲涓�%d閮ㄥ垎鐢�'%s'鍒嗛殧", expectedParts, delimiter));
+ throw new IllegalArgumentException(String.format("鏍煎紡閿欒锛屽簲涓� %d 閮ㄥ垎锛屼互 '%s' 鍒嗛殧", expectedParts, delimiter));
}
return parts;
}
- // 杈呭姪鏂规硶锛氶獙璇佹湀浠戒腑鐨勬棩
private int validateDayOfMonth(String dayStr) {
int day = Integer.parseInt(dayStr);
if (day < 1 || day > 31) {
- throw new IllegalArgumentException("鏃ユ湡蹇呴』鍦�1-31涔嬮棿");
+ throw new IllegalArgumentException("鏃ユ湡蹇呴』鍦� 1-31 涔嬮棿");
}
return day;
}
- // 杈呭姪鏂规硶锛氶獙璇佸搴︿腑鐨勬湀
- private int validateMonthInQuarter(String monthStr) {
- int month = Integer.parseInt(monthStr);
- if (month < 1 || month > 3) {
- throw new IllegalArgumentException("瀛ｅ害鏈堜唤蹇呴』鏄�1銆�2鎴�3");
- }
- return month;
- }
-
- // 杞崲鏄熸湡鍑犲悕绉�
private String convertDayNamesToCron(String dayNames) {
return Arrays.stream(dayNames.split("\\|"))
.map(this::convertSingleDayName)
.collect(Collectors.joining(","));
}
- // 杞崲鍗曚釜鏄熸湡鍑犲悕绉�
private String convertSingleDayName(String dayName) {
switch (dayName.toUpperCase()) {
- case "MON": return "MON";
- case "TUE": return "TUE";
- case "WED": return "WED";
- case "THU": return "THU";
- case "FRI": return "FRI";
- case "SAT": return "SAT";
- case "SUN": return "SUN";
- default: throw new IllegalArgumentException("鏃犳晥鐨勬槦鏈熷嚑: " + dayName);
+ case "MON":
+ return "MON";
+ case "TUE":
+ return "TUE";
+ case "WED":
+ return "WED";
+ case "THU":
+ return "THU";
+ case "FRI":
+ return "FRI";
+ case "SAT":
+ return "SAT";
+ case "SUN":
+ return "SUN";
+ default:
+ throw new IllegalArgumentException("鏃犳晥鐨勬槦鏈�: " + dayName);
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3