From 1bef814c519c40d3e569745a50a639565a89ef44 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 22 四月 2021 21:07:18 +0800
Subject: [PATCH] update 补全实体类 注入注解
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java | 204 ++++++++++++++++++++------------------------------
1 files changed, 83 insertions(+), 121 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 e9b8071..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
@@ -1,172 +1,134 @@
package com.ruoyi.quartz.domain;
-import java.io.Serializable;
-import java.util.Date;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.constant.ScheduleConstants;
-import com.ruoyi.common.core.domain.BaseEntity;
-import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.quartz.util.CronUtils;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
/**
* 瀹氭椂浠诲姟璋冨害琛� sys_job
- *
+ *
* @author ruoyi
*/
-public class SysJob extends BaseEntity implements Serializable
-{
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("sys_job")
+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;
- public Long getJobId()
- {
- return jobId;
- }
+ /**
+ * 鍒涘缓鑰�
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private String createBy;
- public void setJobId(Long jobId)
- {
- this.jobId = jobId;
- }
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
- @NotBlank(message = "浠诲姟鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 64, message = "浠诲姟鍚嶇О涓嶈兘瓒呰繃64涓瓧绗�")
- public String getJobName()
- {
- return jobName;
- }
+ /**
+ * 鏇存柊鑰�
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private String updateBy;
- public void setJobName(String jobName)
- {
- this.jobName = jobName;
- }
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
- public String getJobGroup()
- {
- return jobGroup;
- }
+ /**
+ * 澶囨敞
+ */
+ private String remark;
- public void setJobGroup(String jobGroup)
- {
- this.jobGroup = jobGroup;
- }
-
- @NotBlank(message = "璋冪敤鐩爣瀛楃涓蹭笉鑳戒负绌�")
- @Size(min = 0, max = 500, message = "璋冪敤鐩爣瀛楃涓查暱搴︿笉鑳借秴杩�500涓瓧绗�")
- public String getInvokeTarget()
- {
- return invokeTarget;
- }
-
- public void setInvokeTarget(String invokeTarget)
- {
- this.invokeTarget = invokeTarget;
- }
-
- @NotBlank(message = "Cron鎵ц琛ㄨ揪寮忎笉鑳戒负绌�")
- @Size(min = 0, max = 255, message = "Cron鎵ц琛ㄨ揪寮忎笉鑳借秴杩�255涓瓧绗�")
- public String getCronExpression()
- {
- return cronExpression;
- }
-
- public void setCronExpression(String cronExpression)
- {
- this.cronExpression = cronExpression;
- }
+ /**
+ * 璇锋眰鍙傛暟
+ */
+ @TableField(exist = false)
+ private Map<String, Object> params = new HashMap<>();
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date getNextValidTime()
- {
- if (StringUtils.isNotEmpty(cronExpression))
- {
+ public Date getNextValidTime() {
+ if (StrUtil.isNotEmpty(cronExpression)) {
return CronUtils.getNextExecution(cronExpression);
}
return null;
}
- public String getMisfirePolicy()
- {
- return misfirePolicy;
- }
-
- public void setMisfirePolicy(String misfirePolicy)
- {
- this.misfirePolicy = misfirePolicy;
- }
-
- public String getConcurrent()
- {
- return concurrent;
- }
-
- public void setConcurrent(String concurrent)
- {
- this.concurrent = concurrent;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("jobId", getJobId())
- .append("jobName", getJobName())
- .append("jobGroup", getJobGroup())
- .append("cronExpression", getCronExpression())
- .append("nextValidTime", getNextValidTime())
- .append("misfirePolicy", getMisfirePolicy())
- .append("concurrent", getConcurrent())
- .append("status", getStatus())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
- }
}
--
Gitblit v1.9.3