wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update 补全实体类 注入注解

This commit is contained in:
疯狂的狮子li 2021-04-22 21:07:18 +08:00
parent 6dc791c34f
commit 1bef814c51
13 changed files with 52 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
View File

@ -69,6 +69,7 @@ public class SysDept implements Serializable
private String parentName;
/** 创建者 */
@TableField(fill = FieldFill.INSERT)
private String createBy;
/** 创建时间 */
@ -77,6 +78,7 @@ public class SysDept implements Serializable
private Date createTime;
/** 更新者 */
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 更新时间 */

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
View File

@ -73,6 +73,7 @@ public class SysDictData implements Serializable
private String status;
/** 创建者 */
@TableField(fill = FieldFill.INSERT)
private String createBy;
/** 创建时间 */
@ -81,6 +82,7 @@ public class SysDictData implements Serializable
private Date createTime;
/** 更新者 */
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 更新时间 */

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
View File

@ -51,6 +51,7 @@ public class SysDictType implements Serializable
private String status;
/** 创建者 */
@TableField(fill = FieldFill.INSERT)
private String createBy;
/** 创建时间 */
@ -59,6 +60,7 @@ public class SysDictType implements Serializable
private Date createTime;
/** 更新者 */
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 更新时间 */

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
View File

@ -77,6 +77,7 @@ public class SysMenu implements Serializable
private String icon;
/** 创建者 */
@TableField(fill = FieldFill.INSERT)
private String createBy;
/** 创建时间 */
@ -85,6 +86,7 @@ public class SysMenu implements Serializable
private Date createTime;
/** 更新者 */
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 更新时间 */

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
View File

@ -70,6 +70,7 @@ public class SysRole implements Serializable
private String delFlag;
/** 创建者 */
@TableField(fill = FieldFill.INSERT)
private String createBy;
/** 创建时间 */
@ -78,6 +79,7 @@ public class SysRole implements Serializable
private Date createTime;
/** 更新者 */
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 更新时间 */

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
View File

@ -102,6 +102,7 @@ public class SysUser implements Serializable
private Date loginDate;
/** 创建者 */
@TableField(fill = FieldFill.INSERT)
private String createBy;
/** 创建时间 */
@ -110,6 +111,7 @@ public class SysUser implements Serializable
private Date createTime;
/** 更新者 */
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 更新时间 */

12
ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
View File

@ -25,18 +25,6 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
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

2
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
View File

@ -135,6 +135,7 @@ public class GenTable implements Serializable {
/**
* 创建者
*/
@TableField(fill = FieldFill.INSERT)
private String createBy;
/**
@ -147,6 +148,7 @@ public class GenTable implements Serializable {
/**
* 更新者
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/**

2
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
View File

@ -120,6 +120,7 @@ public class GenTableColumn implements Serializable {
/**
* 创建者
*/
@TableField(fill = FieldFill.INSERT)
private String createBy;
/**
@ -132,6 +133,7 @@ public class GenTableColumn implements Serializable {
/**
* 更新者
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/**

45
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
View File

@ -20,7 +20,7 @@ import java.util.Map;
/**
* 定时任务调度表 sys_job
*
*
* @author ruoyi
*/
@ -28,52 +28,68 @@ import java.util.Map;
@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 @@ public class SysJob implements Serializable
/**
* 更新者
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/**
@ -107,10 +124,8 @@ public class SysJob implements Serializable
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;

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
View File

@ -68,6 +68,7 @@ public class SysConfig implements Serializable {
/**
* 创建者
*/
@TableField(fill = FieldFill.INSERT)
private String createBy;
/**
@ -80,6 +81,7 @@ public class SysConfig implements Serializable {
/**
* 更新者
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/**

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
View File

@ -56,6 +56,7 @@ public class SysNotice implements Serializable {
/**
* 创建者
*/
@TableField(fill = FieldFill.INSERT)
private String createBy;
/**
@ -68,6 +69,7 @@ public class SysNotice implements Serializable {
/**
* 更新者
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/**

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
View File

@ -67,6 +67,7 @@ public class SysPost implements Serializable {
/**
* 创建者
*/
@TableField(fill = FieldFill.INSERT)
private String createBy;
/**
@ -79,6 +80,7 @@ public class SysPost implements Serializable {
/**
* 更新者
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/**