malei05 1 ماه پیش
والد
کامیت
c53f8dccd5

+ 2 - 2
src/main/java/net/yyc/quartz/config/QuartzInitJob.java

@@ -55,10 +55,10 @@ public class QuartzInitJob {
                 taskUtil.removeJob(sysjob, scheduler);
             } else if (QuartzEnum.JOB_STATUS_RUNNING.getType().equals(sysjob.getJobStatus())) {
                 log.info("[QUARTZ] [INIT] 调度 | jobId={} jobName={}", sysjob.getJobId(), sysjob.getJobName());
-                taskUtil.addOrUpdateJob(sysjob, scheduler);
+                taskUtil.resumeJob(sysjob, scheduler);
             } else if (QuartzEnum.JOB_STATUS_NOT_RUNNING.getType().equals(sysjob.getJobStatus())) {
                 log.info("[QUARTZ] [INIT] 暂停 | jobId={} jobName={}", sysjob.getJobId(), sysjob.getJobName());
-                taskUtil.addOrUpdateJob(sysjob, scheduler);
+                taskUtil.pauseJob(sysjob, scheduler);
             } else {
                 log.info("[QUARTZ] [INIT] 移除 | jobId={} jobName={} 状态={}", sysjob.getJobId(), sysjob.getJobName(), sysjob.getJobStatus());
                 taskUtil.removeJob(sysjob, scheduler);

+ 0 - 1
src/main/java/net/yyc/quartz/event/SysJobLogListener.java

@@ -40,7 +40,6 @@ public class SysJobLogListener {
 	public void saveSysJobLog(SysJobLogEvent event) {
 		SysJobLog sysJobLog = event.getSysJobLog();
 		sysJobLogService.save(sysJobLog);
-		log.info("执行定时任务日志");
 	}
 
 }

+ 2 - 14
src/main/java/net/yyc/quartz/util/TaskUtil.java

@@ -60,29 +60,17 @@ public class TaskUtil {
             trigger = (CronTrigger) scheduler.getTrigger(triggerKey);
             // 判断触发器是否存在(如果存在说明之前运行过但是在当前被禁用了,如果不存在说明一次都没运行过)
             if (trigger == null) {
-                log.info("不存在,新增定时任务:" + sysjob.getJobName());
-                // 新建一个工作任务 指定任务类型为串接进行的
                 JobDetail jobDetail = JobBuilder.newJob(QuartzFactory.class).withIdentity(jobKey).build();
-                // 将任务信息添加到任务信息中
                 jobDetail.getJobDataMap().put(SCHEDULE_JOB_KEY.getType(), sysjob);
-                // 将cron表达式进行转换
                 CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(sysjob.getCronExpression());
                 cronScheduleBuilder = this.handleCronScheduleMisfirePolicy(sysjob, cronScheduleBuilder);
-                // 创建触发器并将cron表达式对象给塞入
-                trigger = TriggerBuilder.newTrigger().withIdentity(triggerKey).withSchedule(cronScheduleBuilder)
-                        .build();
-                // 在调度器中将触发器和任务进行组合
+                trigger = TriggerBuilder.newTrigger().withIdentity(triggerKey).withSchedule(cronScheduleBuilder).build();
                 scheduler.scheduleJob(jobDetail, trigger);
             } else {
-                log.info("已经存在的定时任务:" + sysjob.getJobName());
                 CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(sysjob.getCronExpression());
                 cronScheduleBuilder = this.handleCronScheduleMisfirePolicy(sysjob, cronScheduleBuilder);
-                // 按照新的规则进行
-                trigger = trigger.getTriggerBuilder().withIdentity(triggerKey).withSchedule(cronScheduleBuilder)
-                        .build();
-                // 将任务信息更新到任务信息中
+                trigger = trigger.getTriggerBuilder().withIdentity(triggerKey).withSchedule(cronScheduleBuilder).build();
                 trigger.getJobDataMap().put(SCHEDULE_JOB_KEY.getType(), sysjob);
-                // 重启
                 scheduler.rescheduleJob(triggerKey, trigger);
             }
             // 如任务状态为暂停