From d69d1fbfe8412c7919f86a65166bc811508a17ca Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期一, 12 四月 2021 17:49:56 +0800 Subject: [PATCH] update 更新任务调度模块 与 代码生成模块 MP lombok 化 --- ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java | 150 ++++++++++++++++---------------------------------- 1 files changed, 48 insertions(+), 102 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 939bfa0..22e48d6 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,34 +1,45 @@ package com.ruoyi.quartz.domain; 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.quartz.util.CronUtils; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +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 */ @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; @@ -37,10 +48,14 @@ private String jobGroup; /** 璋冪敤鐩爣瀛楃涓� */ + @NotBlank(message = "璋冪敤鐩爣瀛楃涓蹭笉鑳戒负绌�") + @Size(min = 0, max = 500, message = "璋冪敤鐩爣瀛楃涓查暱搴︿笉鑳借秴杩�500涓瓧绗�") @Excel(name = "璋冪敤鐩爣瀛楃涓�") private String invokeTarget; /** cron鎵ц琛ㄨ揪寮� */ + @NotBlank(message = "Cron鎵ц琛ㄨ揪寮忎笉鑳戒负绌�") + @Size(min = 0, max = 255, message = "Cron鎵ц琛ㄨ揪寮忎笉鑳借秴杩�255涓瓧绗�") @Excel(name = "鎵ц琛ㄨ揪寮� ") private String cronExpression; @@ -56,61 +71,40 @@ @Excel(name = "浠诲姟鐘舵��", readConverterExp = "0=姝e父,1=鏆傚仠") private String status; - public Long getJobId() - { - return jobId; - } + /** + * 鍒涘缓鑰� + */ + 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; - } + /** + * 鏇存柊鑰� + */ + 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() @@ -122,52 +116,4 @@ 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