From 8d8d1a802e902d2e1f65dc0a3e3f0bfc9998ba19 Mon Sep 17 00:00:00 2001 From: chenxiwang <1520264117@qq.com> Date: Wed, 31 Jul 2024 14:20:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/xyt/schedule/TaskGroupHandler.java | 12 ++++++------ .../com/gunshi/project/xyt/timetask/DataTask.java | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupHandler.java b/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupHandler.java index 95368b9..97c2851 100644 --- a/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupHandler.java +++ b/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupHandler.java @@ -38,10 +38,10 @@ public class TaskGroupHandler { */ public void addCronJob(String jobId, ForecastPlan forecastPlan) { try { - TriggerKey triggerKey = TriggerKey.triggerKey(jobId, "TaskGroup"); + TriggerKey triggerKey = TriggerKey.triggerKey(jobId, "FloodForecast"); //构建job信息 - JobDetail job = JobBuilder.newJob(TaskGroupJob.class).withIdentity(jobId, "TaskGroup") + JobDetail job = JobBuilder.newJob(TaskGroupJob.class).withIdentity(jobId, "FloodForecast") .withDescription("任务组编排").build(); JobDataMap jobDataMap = job.getJobDataMap(); jobDataMap.put("jobId", jobId); @@ -76,13 +76,13 @@ public class TaskGroupHandler { public void removeCronJob(String jobId) { try { // TriggerKey 定义了trigger的名称和组别 ，通过任务名和任务组名获取TriggerKey - TriggerKey triggerKey = TriggerKey.triggerKey(jobId,"TaskGroup"); + TriggerKey triggerKey = TriggerKey.triggerKey(jobId,"FloodForecast"); // 停止触发器 scheduler.resumeTrigger(triggerKey); // 移除触发器 scheduler.unscheduleJob(triggerKey); // 移除任务 - scheduler.deleteJob(JobKey.jobKey(jobId,"TaskGroup")); + scheduler.deleteJob(JobKey.jobKey(jobId,"FloodForecast")); log.info("删除定时任务成功, jobId:{}", jobId); } catch (SchedulerException e) { log.error("删除定时任务异常, jobId:{}", jobId, e); @@ -95,7 +95,7 @@ public class TaskGroupHandler { */ public void pauseJob(String jobId) { try { - JobKey jobKey = JobKey.jobKey(jobId,"TaskGroup"); + JobKey jobKey = JobKey.jobKey(jobId,"FloodForecast"); // 暂停任务 scheduler.pauseJob(jobKey); log.info("暂停定时任务成功, jobId:{}", jobId); @@ -112,7 +112,7 @@ public class TaskGroupHandler { public void resumeJob(String jobId) { try { // 通过任务名和任务组名获取jobKey - JobKey jobKey = JobKey.jobKey(jobId,"TaskGroup"); + JobKey jobKey = JobKey.jobKey(jobId,"FloodForecast"); // 继续任务 scheduler.resumeJob(jobKey); log.info("继续定时任务成功, jobId:{}", jobId); diff --git a/src/main/java/com/gunshi/project/xyt/timetask/DataTask.java b/src/main/java/com/gunshi/project/xyt/timetask/DataTask.java index 5de2220..110cd07 100644 --- a/src/main/java/com/gunshi/project/xyt/timetask/DataTask.java +++ b/src/main/java/com/gunshi/project/xyt/timetask/DataTask.java @@ -184,11 +184,11 @@ public class DataTask { for(StPptnR stPptnR : stcdLast){ Date stm = stPptnR.getStm(); Calendar calendar = Calendar.getInstance(); - // 默认40天前（接口最多40天），存在则加1秒（接口是大于等于开始时间） + // 默认40天前（接口最多40天），存在则加1小时（接口是按小时算且大于等于开始时间） if(ObjectUtils.isEmpty(stm)){ calendar.add(Calendar.DATE, -40); } else { - calendar.add(Calendar.SECOND, 1); + calendar.add(Calendar.HOUR, 1); } stm = calendar.getTime(); Response resp = client.newCall(new Request.Builder().url(owrsvrPath + hbskpphisRoute) @@ -238,7 +238,7 @@ public class DataTask { String stcd = stPptnRD.getStcd(); Date stm = stPptnRD.getStm(); Calendar calendar = Calendar.getInstance(); - // 默认两周前的时间（接口只提供addvcd的条件，数据量较大），如果存在，需要加一天（接口是大于等于开始时间） + // 默认两周前的时间（接口只提供addvcd的条件，数据量较大），如果存在，需要加一天（接口是按天算且大于等于开始时间） if(ObjectUtils.isEmpty(stm)){ calendar.add(Calendar.DATE, -14); } else { @@ -344,11 +344,11 @@ public class DataTask { for(StRsvrR stRsvrR : stcdLast){ Date stm = stRsvrR.getStm(); Calendar calendar = Calendar.getInstance(); - // 默认40天前（接口最多40天），存在则加1秒（接口是大于等于开始时间） + // 默认40天前（接口最多40天），存在则加1小时（接口是按小时算且大于等于开始时间） if(ObjectUtils.isEmpty(stm)){ calendar.add(Calendar.DATE, -40); } else { - calendar.add(Calendar.SECOND, 1); + calendar.add(Calendar.HOUR, 1); } stm = calendar.getTime(); Response resp = client.newCall(new Request.Builder().url(owrsvrPath + hbskzzhisRoute) @@ -444,11 +444,11 @@ public class DataTask { for (StImgR stImgR : stcdLast) { Date stm = stImgR.getStm(); Calendar calendar = Calendar.getInstance(); - // 默认40天前（接口最多40天），存在则加1秒（接口是大于等于开始时间） + // 默认40天前（接口最多40天），存在则加1小时（接口是按小时算且大于等于开始时间） if(ObjectUtils.isEmpty(stm)){ calendar.add(Calendar.DATE, -40); } else { - calendar.add(Calendar.SECOND, 1); + calendar.add(Calendar.HOUR, 1); } stm = calendar.getTime(); Response resp = client.newCall(new Request.Builder().url(owrsvrPath + hbskpichisRoute)