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 TaskList = forecastTaskService.list(new QueryWrapper().eq("status", "0")); - if (CollectionUtils.isNotEmpty(TaskList)) { - Map jobMap = TaskList.stream() + List taskList = forecastTaskService.list(new QueryWrapper().eq("status", "0")); + if (CollectionUtils.isNotEmpty(taskList)) { + Map jobMap = taskList.stream() .collect(Collectors.toMap(ForecastTask::getId, Function.identity(), (key1, key2)->key2)); for (Map.Entry entry : jobMap.entrySet()) { taskGroupHandler.addCronJob(String.valueOf(entry.getKey()), entry.getValue());