若依 3.1

This commit is contained in:
RuoYi
2018-12-01 16:14:19 +08:00
parent 451caf12fc
commit 6a592827e8
41 changed files with 2004 additions and 5547 deletions

View File

@ -1,11 +1,14 @@
package com.ruoyi.quartz.domain;
import java.io.Serializable;
import java.util.Date;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.io.Serializable;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.base.BaseEntity;
import com.ruoyi.common.constant.ScheduleConstants;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.quartz.util.CronUtils;
/**
* 定时任务调度表 sys_job
@ -108,6 +111,15 @@ public class SysJob extends BaseEntity implements Serializable
this.cronExpression = cronExpression;
}
public Date getNextValidTime()
{
if (StringUtils.isNotEmpty(cronExpression))
{
return CronUtils.getNextExecution(cronExpression);
}
return null;
}
public String getMisfirePolicy()
{
return misfirePolicy;
@ -137,6 +149,7 @@ public class SysJob extends BaseEntity implements Serializable
.append("methodName", getMethodName())
.append("methodParams", getMethodParams())
.append("cronExpression", getCronExpression())
.append("nextValidTime", getNextValidTime())
.append("misfirePolicy", getMisfirePolicy())
.append("status", getStatus())
.append("createBy", getCreateBy())

View File

@ -4,6 +4,7 @@ import java.util.Date;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
@ -23,6 +24,7 @@ import com.ruoyi.quartz.service.ISysJobLogService;
* @author ruoyi
*
*/
@DisallowConcurrentExecution
public class ScheduleJob extends QuartzJobBean
{
private static final Logger log = LoggerFactory.getLogger(ScheduleJob.class);