yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

同步优化

master
chenxiwang 2024-07-31 14:20:26 +08:00
parent 9960f2b9fe
commit 8d8d1a802e
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/gunshi/project/xyt/schedule/TaskGroupHandler.java
View File

@ -38,10 +38,10 @@ public class TaskGroupHandler {
*/ */
public void addCronJob(String jobId, ForecastPlan forecastPlan) { public void addCronJob(String jobId, ForecastPlan forecastPlan) {
try { try {
TriggerKey triggerKey = TriggerKey.triggerKey(jobId, "TaskGroup"); TriggerKey triggerKey = TriggerKey.triggerKey(jobId, "FloodForecast");
//构建job信息 //构建job信息
JobDetail job = JobBuilder.newJob(TaskGroupJob.class).withIdentity(jobId, "TaskGroup") JobDetail job = JobBuilder.newJob(TaskGroupJob.class).withIdentity(jobId, "FloodForecast")
.withDescription("任务组编排").build(); .withDescription("任务组编排").build();
JobDataMap jobDataMap = job.getJobDataMap(); JobDataMap jobDataMap = job.getJobDataMap();
jobDataMap.put("jobId", jobId); jobDataMap.put("jobId", jobId);
@ -76,13 +76,13 @@ public class TaskGroupHandler {
public void removeCronJob(String jobId) { public void removeCronJob(String jobId) {
try { try {
// TriggerKey 定义了trigger的名称和组别 ，通过任务名和任务组名获取TriggerKey // TriggerKey 定义了trigger的名称和组别 ，通过任务名和任务组名获取TriggerKey
TriggerKey triggerKey = TriggerKey.triggerKey(jobId,"TaskGroup"); TriggerKey triggerKey = TriggerKey.triggerKey(jobId,"FloodForecast");
// 停止触发器 // 停止触发器
scheduler.resumeTrigger(triggerKey); scheduler.resumeTrigger(triggerKey);
// 移除触发器 // 移除触发器
scheduler.unscheduleJob(triggerKey); scheduler.unscheduleJob(triggerKey);
// 移除任务 // 移除任务
scheduler.deleteJob(JobKey.jobKey(jobId,"TaskGroup")); scheduler.deleteJob(JobKey.jobKey(jobId,"FloodForecast"));
log.info("删除定时任务成功, jobId:{}", jobId); log.info("删除定时任务成功, jobId:{}", jobId);
} catch (SchedulerException e) { } catch (SchedulerException e) {
log.error("删除定时任务异常, jobId:{}", jobId, e); log.error("删除定时任务异常, jobId:{}", jobId, e);
@ -95,7 +95,7 @@ public class TaskGroupHandler {
*/ */
public void pauseJob(String jobId) { public void pauseJob(String jobId) {
try { try {
JobKey jobKey = JobKey.jobKey(jobId,"TaskGroup"); JobKey jobKey = JobKey.jobKey(jobId,"FloodForecast");
// 暂停任务 // 暂停任务
scheduler.pauseJob(jobKey); scheduler.pauseJob(jobKey);
log.info("暂停定时任务成功, jobId:{}", jobId); log.info("暂停定时任务成功, jobId:{}", jobId);
@ -112,7 +112,7 @@ public class TaskGroupHandler {
public void resumeJob(String jobId) { public void resumeJob(String jobId) {
try { try {
// 通过任务名和任务组名获取jobKey // 通过任务名和任务组名获取jobKey
JobKey jobKey = JobKey.jobKey(jobId,"TaskGroup"); JobKey jobKey = JobKey.jobKey(jobId,"FloodForecast");
// 继续任务 // 继续任务
scheduler.resumeJob(jobKey); scheduler.resumeJob(jobKey);
log.info("继续定时任务成功, jobId:{}", jobId); log.info("继续定时任务成功, jobId:{}", jobId);

14
src/main/java/com/gunshi/project/xyt/timetask/DataTask.java
View File

@ -184,11 +184,11 @@ public class DataTask {
for(StPptnR stPptnR : stcdLast){ for(StPptnR stPptnR : stcdLast){
Date stm = stPptnR.getStm(); Date stm = stPptnR.getStm();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
// 默认40天前（接口最多40天），存在则加1秒（接口是大于等于开始时间） // 默认40天前（接口最多40天），存在则加1小时（接口是按小时算且大于等于开始时间）
if(ObjectUtils.isEmpty(stm)){ if(ObjectUtils.isEmpty(stm)){
calendar.add(Calendar.DATE, -40); calendar.add(Calendar.DATE, -40);
} else { } else {
calendar.add(Calendar.SECOND, 1); calendar.add(Calendar.HOUR, 1);
} }
stm = calendar.getTime(); stm = calendar.getTime();
Response resp = client.newCall(new Request.Builder().url(owrsvrPath + hbskpphisRoute) Response resp = client.newCall(new Request.Builder().url(owrsvrPath + hbskpphisRoute)
@ -238,7 +238,7 @@ public class DataTask {
String stcd = stPptnRD.getStcd(); String stcd = stPptnRD.getStcd();
Date stm = stPptnRD.getStm(); Date stm = stPptnRD.getStm();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
// 默认两周前的时间（接口只提供addvcd的条件，数据量较大），如果存在，需要加一天（接口是大于等于开始时间） // 默认两周前的时间（接口只提供addvcd的条件，数据量较大），如果存在，需要加一天（接口是按天算且大于等于开始时间）
if(ObjectUtils.isEmpty(stm)){ if(ObjectUtils.isEmpty(stm)){
calendar.add(Calendar.DATE, -14); calendar.add(Calendar.DATE, -14);
} else { } else {
@ -344,11 +344,11 @@ public class DataTask {
for(StRsvrR stRsvrR : stcdLast){ for(StRsvrR stRsvrR : stcdLast){
Date stm = stRsvrR.getStm(); Date stm = stRsvrR.getStm();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
// 默认40天前（接口最多40天），存在则加1秒（接口是大于等于开始时间） // 默认40天前（接口最多40天），存在则加1小时（接口是按小时算且大于等于开始时间）
if(ObjectUtils.isEmpty(stm)){ if(ObjectUtils.isEmpty(stm)){
calendar.add(Calendar.DATE, -40); calendar.add(Calendar.DATE, -40);
} else { } else {
calendar.add(Calendar.SECOND, 1); calendar.add(Calendar.HOUR, 1);
} }
stm = calendar.getTime(); stm = calendar.getTime();
Response resp = client.newCall(new Request.Builder().url(owrsvrPath + hbskzzhisRoute) Response resp = client.newCall(new Request.Builder().url(owrsvrPath + hbskzzhisRoute)
@ -444,11 +444,11 @@ public class DataTask {
for (StImgR stImgR : stcdLast) { for (StImgR stImgR : stcdLast) {
Date stm = stImgR.getStm(); Date stm = stImgR.getStm();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
// 默认40天前（接口最多40天），存在则加1秒（接口是大于等于开始时间） // 默认40天前（接口最多40天），存在则加1小时（接口是按小时算且大于等于开始时间）
if(ObjectUtils.isEmpty(stm)){ if(ObjectUtils.isEmpty(stm)){
calendar.add(Calendar.DATE, -40); calendar.add(Calendar.DATE, -40);
} else { } else {
calendar.add(Calendar.SECOND, 1); calendar.add(Calendar.HOUR, 1);
} }
stm = calendar.getTime(); stm = calendar.getTime();
Response resp = client.newCall(new Request.Builder().url(owrsvrPath + hbskpichisRoute) Response resp = client.newCall(new Request.Builder().url(owrsvrPath + hbskpichisRoute)