定时任务支持并发控制

ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java

@@ -47,6 +47,9 @@ public class SysJob extends BaseEntity implements Serializable
     @Excel(name = "计划策略 ")
     private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT;
 
+    /** 是否并发执行（0允许 1禁止） */
+    private String concurrent;
+
     /** 任务状态（0正常 1暂停） */
     @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停")
     private String status;
@@ -130,6 +133,16 @@ public class SysJob extends BaseEntity implements Serializable
         this.misfirePolicy = misfirePolicy;
     }
 
+    public String getConcurrent()
+    {
+        return concurrent;
+    }
+
+    public void setConcurrent(String concurrent)
+    {
+        this.concurrent = concurrent;
+    }
+
     public String getStatus()
     {
         return status;
@@ -139,7 +152,7 @@ public class SysJob extends BaseEntity implements Serializable
     {
         this.status = status;
     }
-
+    
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -151,6 +164,7 @@ public class SysJob extends BaseEntity implements Serializable
             .append("cronExpression", getCronExpression())
             .append("nextValidTime", getNextValidTime())
             .append("misfirePolicy", getMisfirePolicy())
+            .append("concurrent", getConcurrent())
             .append("status", getStatus())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
@@ -159,4 +173,4 @@ public class SysJob extends BaseEntity implements Serializable
             .append("remark", getRemark())
             .toString();
     }
-}
+}

ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java

@@ -1,7 +1,9 @@
 package com.ruoyi.quartz.domain;
 
+import java.util.Date;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
@@ -46,6 +48,14 @@ public class SysJobLog extends BaseEntity
     @Excel(name = "异常信息")
     private String exceptionInfo;
 
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
     public Long getJobLogId()
     {
         return jobLogId;
@@ -125,6 +135,26 @@ public class SysJobLog extends BaseEntity
     {
         this.exceptionInfo = exceptionInfo;
     }
+    
+    public Date getStartTime()
+    {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime)
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime()
+    {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime)
+    {
+        this.endTime = endTime;
+    }
 
     @Override
     public String toString() {
@@ -137,7 +167,8 @@ public class SysJobLog extends BaseEntity
             .append("jobMessage", getJobMessage())
             .append("status", getStatus())
             .append("exceptionInfo", getExceptionInfo())
-            .append("createTime", getCreateTime())
+            .append("startTime", getStartTime())
+            .append("endTime", getEndTime())
             .toString();
     }
 }