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-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 2 +
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java | 2 +
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java | 2 +
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java | 45 +++++++++++++++-------
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java | 2 +
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java | 2 +
ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java | 12 ------
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java | 2 +
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java | 2 +
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 2 +
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 2 +
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java | 2 +
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java | 2 +
13 files changed, 52 insertions(+), 27 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
index 5bfcb05..72240bc 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
@@ -69,6 +69,7 @@
private String parentName;
/** 鍒涘缓鑰� */
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/** 鍒涘缓鏃堕棿 */
@@ -77,6 +78,7 @@
private Date createTime;
/** 鏇存柊鑰� */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 鏇存柊鏃堕棿 */
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
index 43ed6e0..c98f9fc 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
@@ -73,6 +73,7 @@
private String status;
/** 鍒涘缓鑰� */
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/** 鍒涘缓鏃堕棿 */
@@ -81,6 +82,7 @@
private Date createTime;
/** 鏇存柊鑰� */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 鏇存柊鏃堕棿 */
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
index af2dca8..48ed252 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
@@ -51,6 +51,7 @@
private String status;
/** 鍒涘缓鑰� */
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/** 鍒涘缓鏃堕棿 */
@@ -59,6 +60,7 @@
private Date createTime;
/** 鏇存柊鑰� */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 鏇存柊鏃堕棿 */
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
index f6f6bd2..b9d0e8d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -77,6 +77,7 @@
private String icon;
/** 鍒涘缓鑰� */
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/** 鍒涘缓鏃堕棿 */
@@ -85,6 +86,7 @@
private Date createTime;
/** 鏇存柊鑰� */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 鏇存柊鏃堕棿 */
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
index ba89bec..6cbd22a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
@@ -70,6 +70,7 @@
private String delFlag;
/** 鍒涘缓鑰� */
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/** 鍒涘缓鏃堕棿 */
@@ -78,6 +79,7 @@
private Date createTime;
/** 鏇存柊鑰� */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 鏇存柊鏃堕棿 */
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 2f8fed1..57e46fc 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -102,6 +102,7 @@
private Date loginDate;
/** 鍒涘缓鑰� */
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/** 鍒涘缓鏃堕棿 */
@@ -110,6 +111,7 @@
private Date createTime;
/** 鏇存柊鑰� */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 鏇存柊鏃堕棿 */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
index d4ef144..7c0922e 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
@@ -25,18 +25,6 @@
this.setFieldValByName("createTime", createTime, metaObject);
}
//endregion
- //region 澶勭悊淇敼浜轰俊鎭�
- Object updateBy = this.getFieldValByName("updateBy", metaObject);
- Object updateTime = this.getFieldValByName("updateTime", metaObject);
- if (updateBy == null) {
- updateBy = createBy;
- this.setFieldValByName("updateBy", updateBy, metaObject);
- }
- if (updateTime == null) {
- updateTime = createTime;
- this.setFieldValByName("updateTime", updateTime, metaObject);
- }
- //endregion
}
@Override
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
index 03e9344..5d5c6a4 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
@@ -135,6 +135,7 @@
/**
* 鍒涘缓鑰�
*/
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/**
@@ -147,6 +148,7 @@
/**
* 鏇存柊鑰�
*/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/**
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
index 0b63729..9e03f5d 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
@@ -120,6 +120,7 @@
/**
* 鍒涘缓鑰�
*/
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/**
@@ -132,6 +133,7 @@
/**
* 鏇存柊鑰�
*/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/**
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;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
index 547e896..66569b7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
@@ -68,6 +68,7 @@
/**
* 鍒涘缓鑰�
*/
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/**
@@ -80,6 +81,7 @@
/**
* 鏇存柊鑰�
*/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
index 1efabf5..e50ecd1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
@@ -56,6 +56,7 @@
/**
* 鍒涘缓鑰�
*/
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/**
@@ -68,6 +69,7 @@
/**
* 鏇存柊鑰�
*/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
index 5957ed9..5bde684 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
@@ -67,6 +67,7 @@
/**
* 鍒涘缓鑰�
*/
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/**
@@ -79,6 +80,7 @@
/**
* 鏇存柊鑰�
*/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/**
--
Gitblit v1.9.3