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

feat(fix):定时任务重启执行修复；前端form校验优化

Browse Source
This commit is contained in:
junjie 2021-06-02 16:16:20 +08:00
parent 183c867452
commit 47392eead8
3 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,9 +2,16 @@ package io.dataease.job.sechedule;
import io.dataease.commons.utils.LogUtil;
import org.quartz.*;
import org.quartz.impl.triggers.CronTriggerImpl;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@ -73,7 +80,9 @@ public class ScheduleManager {
triggerBuilder.withIdentity(triggerKey);
triggerBuilder.startAt(startTime);
if (startTime.before(new Date())) {
triggerBuilder.startAt(getNTimeByCron(cron));
}
if (endTime != null) {
triggerBuilder.endAt(endTime);
@ -149,7 +158,9 @@ public class ScheduleManager {
triggerBuilder.withIdentity(triggerKey);// 触发器名,触发器组
triggerBuilder.startAt(startTime);
if (startTime.before(new Date())) {
triggerBuilder.startAt(getNTimeByCron(cron));
}
if (endTime != null) {
triggerBuilder.endAt(endTime);
@ -395,4 +406,23 @@ public class ScheduleManager {
return returnMap;
}
public static Date getNTimeByCron(String cron) {
try {
CronTriggerImpl cronTriggerImpl = new CronTriggerImpl();
cronTriggerImpl.setCronExpression(cron);
Calendar calendar = Calendar.getInstance();
Date now = calendar.getTime();
// calendar.add(java.util.Calendar.YEAR, 1);
calendar.add(Calendar.MONTH, 2);
List<Date> dates = TriggerUtils.computeFireTimesBetween(cronTriggerImpl, null, now, calendar.getTime());
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String nextTime = dateFormat.format(dates.get(0));
Date date = dateFormat.parse(nextTime);
return date;
} catch (Exception e) {
throw new RuntimeException(e);
}
}
}

1
frontend/src/views/chart/group/Group.vue
View File

@ -445,6 +445,7 @@ export default {
},
close() {
this.$refs['groupForm'].resetFields()
this.editGroup = false
this.groupForm = {
name: '',

1
frontend/src/views/dataset/group/Group.vue
View File

@ -458,6 +458,7 @@ export default {
},
close() {
this.$refs['groupForm'].resetFields()
this.editGroup = false
this.groupForm = {
name: '',