From e3f63046656370af38d5db6d4cb701000ec70d12 Mon Sep 17 00:00:00 2001
From: cxw <1520264117@qq.com>
Date: Thu, 14 Nov 2024 14:48:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B4=AA=E6=B0=B4=E9=A2=84?=
 =?UTF-8?q?=E6=8A=A5=E8=87=AA=E5=8A=A8=E6=89=A7=E8=A1=8C=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gunshi/project/xyt/schedule/TaskGroupJob.java     | 8 +++-----
 .../gunshi/project/xyt/schedule/TaskGroupJobRunner.java   | 6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupJob.java b/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupJob.java
index ba6e6e5..48a2da0 100644
--- a/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupJob.java
+++ b/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupJob.java
@@ -19,13 +19,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.quartz.Job;
 import org.quartz.JobDataMap;
 import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -62,7 +60,7 @@ public class TaskGroupJob implements Job {
     private ForecastTaskService forecastTaskService;
 
     @Override
-    public void execute(JobExecutionContext context) throws JobExecutionException {
+    public void execute(JobExecutionContext context) {
         Date nowDate = new Date();
         JobDataMap jdMap = context.getJobDetail().getJobDataMap();
         String jobId = (String) jdMap.get("jobId");
@@ -71,7 +69,7 @@ public class TaskGroupJob implements Job {
         forecastTask.setLastExcuteTm(nowDate);
         try {
             // 根据执行时间、预热期、预见期获取对应的预报、开始、结束时间
-            Date nowTime = sdfMinute.parse(sdf.format(nowDate));
+            Date nowTime = sdfMinute.parse(sdfMinute.format(nowDate));
             Date forecastTime = nowTime;
             Date startTime;
             Date endTime;
@@ -134,6 +132,6 @@ public class TaskGroupJob implements Job {
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
-        log.info("{}----TaskGroupJob-计划执行结束===>jobId:{}", sdf.format(LocalDateTime.now()), jobId);
+        log.info("{}----TaskGroupJob-计划执行结束===>jobId:{}", sdf.format(new Date()), jobId);
     }
 }
diff --git a/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupJobRunner.java b/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupJobRunner.java
index 3f65842..bc410c6 100644
--- a/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupJobRunner.java
+++ b/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupJobRunner.java
@@ -36,9 +36,9 @@ public class TaskGroupJobRunner implements CommandLineRunner {
     @Override
     public void run(String... args) {
         // 初始加载数据库里状态为正常的定时任务
-        List<ForecastTask> TaskList = forecastTaskService.list(new QueryWrapper<ForecastTask>().eq("status", "0"));
-        if (CollectionUtils.isNotEmpty(TaskList)) {
-            Map<Long, ForecastTask> jobMap = TaskList.stream()
+        List<ForecastTask> taskList = forecastTaskService.list(new QueryWrapper<ForecastTask>().eq("status", "0"));
+        if (CollectionUtils.isNotEmpty(taskList)) {
+            Map<Long, ForecastTask> jobMap = taskList.stream()
                     .collect(Collectors.toMap(ForecastTask::getId, Function.identity(), (key1, key2)->key2));
             for (Map.Entry<Long, ForecastTask> entry : jobMap.entrySet()) {
                 taskGroupHandler.addCronJob(String.valueOf(entry.getKey()), entry.getValue());