From 3f17e3c31a547d3c428af8032f2e0c3e172fd2eb Mon Sep 17 00:00:00 2001 From: junjie Date: Thu, 3 Jun 2021 11:28:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(fix):=E5=89=8D=E7=AB=AF=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/add/AddCustom.vue | 2 +- frontend/src/views/dataset/add/AddSQL.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/dataset/add/AddCustom.vue b/frontend/src/views/dataset/add/AddCustom.vue index 042056bad8..37e2bee5b1 100644 --- a/frontend/src/views/dataset/add/AddCustom.vue +++ b/frontend/src/views/dataset/add/AddCustom.vue @@ -281,7 +281,7 @@ export default { } .span-number{ - color: #f18126; + color: #0a7be0; } .table-count{ color: #606266; diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue index e7b90264f9..225c7797ce 100644 --- a/frontend/src/views/dataset/add/AddSQL.vue +++ b/frontend/src/views/dataset/add/AddSQL.vue @@ -335,7 +335,7 @@ export default { font-size: 14px; } .span-number{ - color: #f18126; + color: #0a7be0; } .table-count{ color: #606266; From 01bd2b165c2336334954613c1968bb57e39f3de3 Mon Sep 17 00:00:00 2001 From: junjie Date: Thu, 3 Jun 2021 12:04:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(fix):=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/sechedule/ScheduleManager.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java b/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java index 562561dcb2..1521cb2346 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java +++ b/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java @@ -73,12 +73,17 @@ public class ScheduleManager { triggerBuilder.withIdentity(triggerKey); + Date nTimeByCron = getNTimeByCron(cron); if (startTime.before(new Date())) { - triggerBuilder.startAt(getNTimeByCron(cron)); + triggerBuilder.startAt(nTimeByCron); } if (endTime != null) { - triggerBuilder.endAt(endTime); + if (endTime.before(nTimeByCron)) { + triggerBuilder.endAt(nTimeByCron); + } else { + triggerBuilder.endAt(endTime); + } } triggerBuilder.withSchedule(CronScheduleBuilder.cronSchedule(cron)); @@ -151,12 +156,17 @@ public class ScheduleManager { triggerBuilder.withIdentity(triggerKey);// 触发器名,触发器组 + Date nTimeByCron = getNTimeByCron(cron); if (startTime.before(new Date())) { - triggerBuilder.startAt(getNTimeByCron(cron)); + triggerBuilder.startAt(nTimeByCron); } if (endTime != null) { - triggerBuilder.endAt(endTime); + if (endTime.before(nTimeByCron)) { + triggerBuilder.endAt(nTimeByCron); + } else { + triggerBuilder.endAt(endTime); + } } triggerBuilder.withSchedule(CronScheduleBuilder.cronSchedule(cron));// 触发器时间设定