From 250c5ba226c63afb3f884d75f4be93778453a7b9 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 29 七月 2022 20:28:59 +0800
Subject: [PATCH] 优化任务过期不执行调度
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
index 37fe72e..e6dea10 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
@@ -10,9 +10,12 @@
import org.quartz.SchedulerException;
import org.quartz.TriggerBuilder;
import org.quartz.TriggerKey;
+import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.ScheduleConstants;
import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.common.exception.job.TaskException.Code;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.quartz.domain.SysJob;
/**
@@ -80,7 +83,12 @@
scheduler.deleteJob(getJobKey(jobId, jobGroup));
}
- scheduler.scheduleJob(jobDetail, trigger);
+ // 鍒ゆ柇浠诲姟鏄惁杩囨湡
+ if (StringUtils.isNotNull(CronUtils.getNextExecution(job.getCronExpression())))
+ {
+ // 鎵ц璋冨害浠诲姟
+ scheduler.scheduleJob(jobDetail, trigger);
+ }
// 鏆傚仠浠诲姟
if (job.getStatus().equals(ScheduleConstants.Status.PAUSE.getValue()))
@@ -110,4 +118,22 @@
+ "' cannot be used in cron schedule tasks", Code.CONFIG_ERROR);
}
}
+
+ /**
+ * 妫�鏌ュ寘鍚嶆槸鍚︿负鐧藉悕鍗曢厤缃�
+ *
+ * @param invokeTarget 鐩爣瀛楃涓�
+ * @return 缁撴灉
+ */
+ public static boolean whiteList(String invokeTarget)
+ {
+ String packageName = StringUtils.substringBefore(invokeTarget, "(");
+ int count = StringUtils.countMatches(packageName, ".");
+ if (count > 1)
+ {
+ return StringUtils.containsAnyIgnoreCase(invokeTarget, Constants.JOB_WHITELIST_STR);
+ }
+ Object obj = SpringUtils.getBean(StringUtils.split(invokeTarget, ".")[0]);
+ return StringUtils.containsAnyIgnoreCase(obj.getClass().getPackage().getName(), Constants.JOB_WHITELIST_STR);
+ }
}
--
Gitblit v1.9.3