From 8cfb78b8afe56efd8d16d173995a8223d041f0b9 Mon Sep 17 00:00:00 2001 From: yufengshuo Date: Tue, 31 Mar 2026 10:55:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=96=E9=83=A8=E5=8C=96=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=85=8D=E7=BD=AE=E8=87=B3applicati?= =?UTF-8?q?on.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将WeatherDataScheduleTask和OutageStateSetScheduledTask中的硬编码cron表达式移至配置文件,提升配置灵活性,便于不同环境调整执行时间。 --- .../power/grid/task/OutageStateSetScheduledTask.java | 2 +- .../southern/power/grid/task/WeatherDataScheduleTask.java | 2 +- src/main/resources/application.yml | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/southern/power/grid/task/OutageStateSetScheduledTask.java b/src/main/java/com/southern/power/grid/task/OutageStateSetScheduledTask.java index fdd46bd..7e31a7b 100644 --- a/src/main/java/com/southern/power/grid/task/OutageStateSetScheduledTask.java +++ b/src/main/java/com/southern/power/grid/task/OutageStateSetScheduledTask.java @@ -20,7 +20,7 @@ public class OutageStateSetScheduledTask { @Resource private IDnerHourlyPowerOutageEventService hourlyPowerOutageEventService; - @Scheduled(cron = "0 0 0 * * ?") + @Scheduled(cron = "${schedule.outage-state-set}") public void schedule() { log.info("【设置已复电状态任务】定时触发--开始"); try { diff --git a/src/main/java/com/southern/power/grid/task/WeatherDataScheduleTask.java b/src/main/java/com/southern/power/grid/task/WeatherDataScheduleTask.java index 48bdd65..9beb444 100644 --- a/src/main/java/com/southern/power/grid/task/WeatherDataScheduleTask.java +++ b/src/main/java/com/southern/power/grid/task/WeatherDataScheduleTask.java @@ -23,7 +23,7 @@ public class WeatherDataScheduleTask { /** * 每小时第20分钟执行 */ - @Scheduled(cron = "0 20 * * * ?") + @Scheduled(cron = "${schedule.weather-data-sync}") public void schedule() { log.info("【区域天气数据同步任务】定时触发--开始"); execute(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 203a33d..65a0602 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -53,4 +53,7 @@ async: keep-alive-seconds: 60 # 空闲线程存活时间(秒),实现线程回收 await-termination-seconds: 60 # 优雅停机:等待任务完成的最大时长(秒) - +# 定时任务配置 +schedule: + weather-data-sync: "0 20 * * * ?" # 区域天气数据同步任务:每小时第20分钟执行 + outage-state-set: "0 0 0 * * ?" # 设置已复电状态任务:每天凌晨执行