center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'main' of github.com:dataease/dataease into main

Browse Source
This commit is contained in:
taojinlong 2021-06-03 12:17:19 +08:00
commit 9d142bcfc8
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java
View File

@ -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));// 触发器时间设定

2
frontend/src/views/dataset/add/AddCustom.vue
View File

@ -281,7 +281,7 @@ export default {
}
.span-number{
color: #f18126;
color: #0a7be0;
}
.table-count{
color: #606266;

2
frontend/src/views/dataset/add/AddSQL.vue
View File

@ -335,7 +335,7 @@ export default {
font-size: 14px;
}
.span-number{
color: #f18126;
color: #0a7be0;
}
.table-count{
color: #606266;