From 9a26a3c4e81dad23f73a0481916d3049700c6592 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 22 四月 2021 21:14:48 +0800
Subject: [PATCH] !22 同步 master Merge pull request !22 from 疯狂的狮子li/master

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java |   45 ++++++++++++++++++++++++++++++---------------
 1 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
index 22e48d6..98e02d3 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
@@ -20,7 +20,7 @@
 
 /**
  * 瀹氭椂浠诲姟璋冨害琛� sys_job
- * 
+ *
  * @author ruoyi
  */
 
@@ -28,52 +28,68 @@
 @NoArgsConstructor
 @Accessors(chain = true)
 @TableName("sys_job")
-public class SysJob implements Serializable
-{
+public class SysJob implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /** 浠诲姟ID */
+    /**
+     * 浠诲姟ID
+     */
     @Excel(name = "浠诲姟搴忓彿", cellType = ColumnType.NUMERIC)
     @TableId(value = "job_id", type = IdType.AUTO)
     private Long jobId;
 
-    /** 浠诲姟鍚嶇О */
+    /**
+     * 浠诲姟鍚嶇О
+     */
     @NotBlank(message = "浠诲姟鍚嶇О涓嶈兘涓虹┖")
     @Size(min = 0, max = 64, message = "浠诲姟鍚嶇О涓嶈兘瓒呰繃64涓瓧绗�")
     @Excel(name = "浠诲姟鍚嶇О")
     private String jobName;
 
-    /** 浠诲姟缁勫悕 */
+    /**
+     * 浠诲姟缁勫悕
+     */
     @Excel(name = "浠诲姟缁勫悕")
     private String jobGroup;
 
-    /** 璋冪敤鐩爣瀛楃涓� */
+    /**
+     * 璋冪敤鐩爣瀛楃涓�
+     */
     @NotBlank(message = "璋冪敤鐩爣瀛楃涓蹭笉鑳戒负绌�")
     @Size(min = 0, max = 500, message = "璋冪敤鐩爣瀛楃涓查暱搴︿笉鑳借秴杩�500涓瓧绗�")
     @Excel(name = "璋冪敤鐩爣瀛楃涓�")
     private String invokeTarget;
 
-    /** cron鎵ц琛ㄨ揪寮� */
+    /**
+     * cron鎵ц琛ㄨ揪寮�
+     */
     @NotBlank(message = "Cron鎵ц琛ㄨ揪寮忎笉鑳戒负绌�")
     @Size(min = 0, max = 255, message = "Cron鎵ц琛ㄨ揪寮忎笉鑳借秴杩�255涓瓧绗�")
     @Excel(name = "鎵ц琛ㄨ揪寮� ")
     private String cronExpression;
 
-    /** cron璁″垝绛栫暐 */
+    /**
+     * cron璁″垝绛栫暐
+     */
     @Excel(name = "璁″垝绛栫暐 ", readConverterExp = "0=榛樿,1=绔嬪嵆瑙﹀彂鎵ц,2=瑙﹀彂涓�娆℃墽琛�,3=涓嶈Е鍙戠珛鍗虫墽琛�")
     private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT;
 
-    /** 鏄惁骞跺彂鎵ц锛�0鍏佽 1绂佹锛� */
+    /**
+     * 鏄惁骞跺彂鎵ц锛�0鍏佽 1绂佹锛�
+     */
     @Excel(name = "骞跺彂鎵ц", readConverterExp = "0=鍏佽,1=绂佹")
     private String concurrent;
 
-    /** 浠诲姟鐘舵�侊紙0姝ｅ父 1鏆傚仠锛� */
+    /**
+     * 浠诲姟鐘舵�侊紙0姝ｅ父 1鏆傚仠锛�
+     */
     @Excel(name = "浠诲姟鐘舵��", readConverterExp = "0=姝ｅ父,1=鏆傚仠")
     private String status;
 
     /**
      * 鍒涘缓鑰�
      */
+    @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
     /**
@@ -86,6 +102,7 @@
     /**
      * 鏇存柊鑰�
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private String updateBy;
 
     /**
@@ -107,10 +124,8 @@
     private Map<String, Object> params = new HashMap<>();
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    public Date getNextValidTime()
-    {
-        if (StrUtil.isNotEmpty(cronExpression))
-        {
+    public Date getNextValidTime() {
+        if (StrUtil.isNotEmpty(cronExpression)) {
             return CronUtils.getNextExecution(cronExpression);
         }
         return null;

--
Gitblit v1.9.3