From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/dao/timer/scheduler/QuartzManage.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/timer/scheduler/QuartzManage.java b/server/service/src/main/java/com/doumee/dao/timer/scheduler/QuartzManage.java
index e0191a9..599446e 100644
--- a/server/service/src/main/java/com/doumee/dao/timer/scheduler/QuartzManage.java
+++ b/server/service/src/main/java/com/doumee/dao/timer/scheduler/QuartzManage.java
@@ -1,5 +1,7 @@
package com.doumee.dao.timer.scheduler;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.dao.timer.entity.JobState;
import com.doumee.dao.timer.entity.QuartzJob;
import org.quartz.*;
@@ -85,14 +87,18 @@
CronScheduleBuilder scheduleBuilder = CronScheduleBuilder
.cronSchedule(quartzJob.getCronExpres())
.withMisfireHandlingInstructionDoNothing();
- // 浠诲姟瑙﹀彂鍣�
- CronTrigger trigger = getCronTrigger(quartzJob.getId())
- .getTriggerBuilder().withIdentity(triggerKey)
- .withSchedule(scheduleBuilder).build();
- trigger.getJobDataMap().put(QuartzJob.JOB_PARAM_KEY, quartzJob);
- scheduler.rescheduleJob(triggerKey, trigger);
- // 鐘舵�佹牎楠�
- checkStop(quartzJob) ;
+ CronTrigger t = getCronTrigger(quartzJob.getId());
+ if(t !=null){
+ // 浠诲姟瑙﹀彂鍣�
+ CronTrigger trigger = t
+ .getTriggerBuilder().withIdentity(triggerKey)
+ .withSchedule(scheduleBuilder).build();
+ trigger.getJobDataMap().put(QuartzJob.JOB_PARAM_KEY, quartzJob);
+ scheduler.rescheduleJob(triggerKey, trigger);
+ // 鐘舵�佹牎楠�
+ checkStop(quartzJob) ;
+ }
+
} catch (SchedulerException e) {
throw new RuntimeException("updateJob Fail",e) ;
}
@@ -142,7 +148,7 @@
this.scheduler.pauseJob(getJobKey(quartzJob.getId()));
}
} catch (SchedulerException e){
- throw new RuntimeException("pauseJob Fail",e) ;
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"pauseJob Fail",e) ;
}
}
--
Gitblit v1.9.3