From d7e6220d64c307f456519a1ffe108863db3687a0 Mon Sep 17 00:00:00 2001 From: anweiguo Date: Tue, 25 May 2021 13:57:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81mybatis-plus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-modules/ruoyi-job/pom.xml | 6 + .../java/com/ruoyi/job/domain/SysJob.java | 129 +++++++++++++----- .../java/com/ruoyi/job/domain/SysJobLog.java | 116 +++++++++++++--- .../com/ruoyi/job/mapper/SysJobLogMapper.java | 18 +-- .../com/ruoyi/job/mapper/SysJobMapper.java | 18 +-- .../resources/mapper/job/SysJobLogMapper.xml | 17 +-- .../resources/mapper/job/SysJobMapper.xml | 22 +-- 7 files changed, 224 insertions(+), 102 deletions(-) diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index 0746ea7b..2f43109f 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -65,6 +65,12 @@ mysql mysql-connector-java + + + + com.baomidou + mybatis-plus-boot-starter + diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java index 0a379f28..b17ff8f2 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java @@ -2,10 +2,15 @@ package com.ruoyi.job.domain; import java.io.Serializable; import java.util.Date; +import java.util.HashMap; +import java.util.Map; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.annotation.JsonFormat; @@ -18,81 +23,143 @@ import com.ruoyi.job.util.CronUtils; /** * 定时任务调度表 sys_job - * + * * @author ruoyi */ @Data -public class SysJob extends BaseEntity implements Serializable -{ +@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; - /** 任务名称 */ + /** + * 任务名称 + */ @Excel(name = "任务名称") @NotBlank(message = "任务名称不能为空") @Size(min = 0, max = 64, message = "任务名称不能超过64个字符") private String jobName; - /** 任务组名 */ + /** + * 任务组名 + */ @Excel(name = "任务组名") private String jobGroup; - /** 调用目标字符串 */ + /** + * 调用目标字符串 + */ @Excel(name = "调用目标字符串") @NotBlank(message = "调用目标字符串不能为空") @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符") private String invokeTarget; - /** cron执行表达式 */ + /** + * cron执行表达式 + */ @Excel(name = "执行表达式 ") @NotBlank(message = "Cron执行表达式不能为空") @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符") 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; - /** 下次执行时间 */ + /** + * 下次执行时间 + */ private Date nextValidTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - public Date getNextValidTime() - { - if (StringUtils.isNotEmpty(cronExpression)) - { + public Date getNextValidTime() { + if (StringUtils.isNotEmpty(cronExpression)) { return CronUtils.getNextExecution(cronExpression); } return null; } + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 备注 + */ + private String remark; + + /** + * 搜索值 + */ + @TableField(exist = false) + private String searchValue; + + /** + * 请求参数 + */ + @TableField(exist = false) + private Map params = new HashMap<>(); + @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(); + 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(); } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java index c63a83a7..049de02d 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java @@ -1,8 +1,15 @@ package com.ruoyi.job.domain; +import java.io.Serializable; import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; @@ -10,59 +17,124 @@ import com.ruoyi.common.core.web.domain.BaseEntity; /** * 定时任务调度日志表 sys_job_log - * + * * @author ruoyi */ @Data -public class SysJobLog extends BaseEntity -{ +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_job_log") +public class SysJobLog implements Serializable { private static final long serialVersionUID = 1L; - /** ID */ + /** + * ID + */ @Excel(name = "日志序号") + @TableId(value = "job_log_id", type = IdType.AUTO) private Long jobLogId; - /** 任务名称 */ + /** + * 任务名称 + */ @Excel(name = "任务名称") private String jobName; - /** 任务组名 */ + /** + * 任务组名 + */ @Excel(name = "任务组名") private String jobGroup; - /** 调用目标字符串 */ + /** + * 调用目标字符串 + */ @Excel(name = "调用目标字符串") private String invokeTarget; - /** 日志信息 */ + /** + * 日志信息 + */ @Excel(name = "日志信息") private String jobMessage; - /** 执行状态（0正常 1失败） */ + /** + * 执行状态（0正常 1失败） + */ @Excel(name = "执行状态", readConverterExp = "0=正常,1=失败") private String status; - /** 异常信息 */ + /** + * 异常信息 + */ @Excel(name = "异常信息") private String exceptionInfo; - /** 开始时间 */ + /** + * 开始时间 + */ private Date startTime; - /** 停止时间 */ + /** + * 停止时间 + */ private Date stopTime; + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 备注 + */ + private String remark; + + /** + * 搜索值 + */ + @TableField(exist = false) + private String searchValue; + + /** + * 请求参数 + */ + @TableField(exist = false) + private Map params = new HashMap<>(); + + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("jobLogId", getJobLogId()) - .append("jobName", getJobName()) - .append("jobGroup", getJobGroup()) - .append("jobMessage", getJobMessage()) - .append("status", getStatus()) - .append("exceptionInfo", getExceptionInfo()) - .append("startTime", getStartTime()) - .append("stopTime", getStopTime()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("jobLogId", getJobLogId()) + .append("jobName", getJobName()) + .append("jobGroup", getJobGroup()) + .append("jobMessage", getJobMessage()) + .append("status", getStatus()) + .append("exceptionInfo", getExceptionInfo()) + .append("startTime", getStartTime()) + .append("stopTime", getStopTime()) + .toString(); } } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java index 742eba54..0e2949ad 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.job.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.job.domain.SysJobLog; /** @@ -8,7 +10,7 @@ import com.ruoyi.job.domain.SysJobLog; * * @author ruoyi */ -public interface SysJobLogMapper +public interface SysJobLogMapper extends BaseMapper { /** * 获取quartz调度器日志的计划任务 @@ -16,14 +18,14 @@ public interface SysJobLogMapper * @param jobLog 调度日志信息 * @return 调度任务日志集合 */ - public List selectJobLogList(SysJobLog jobLog); + List selectJobLogList(SysJobLog jobLog); /** * 查询所有调度任务日志 * * @return 调度任务日志列表 */ - public List selectJobLogAll(); + List selectJobLogAll(); /** * 通过调度任务日志ID查询调度信息 @@ -31,7 +33,7 @@ public interface SysJobLogMapper * @param jobLogId 调度任务日志ID * @return 调度任务日志对象信息 */ - public SysJobLog selectJobLogById(Long jobLogId); + SysJobLog selectJobLogById(Long jobLogId); /** * 新增任务日志 @@ -39,7 +41,7 @@ public interface SysJobLogMapper * @param jobLog 调度日志信息 * @return 结果 */ - public int insertJobLog(SysJobLog jobLog); + int insertJobLog(SysJobLog jobLog); /** * 批量删除调度日志信息 @@ -47,7 +49,7 @@ public interface SysJobLogMapper * @param logIds 需要删除的数据ID * @return 结果 */ - public int deleteJobLogByIds(Long[] logIds); + int deleteJobLogByIds(Long[] logIds); /** * 删除任务日志 @@ -55,10 +57,10 @@ public interface SysJobLogMapper * @param jobId 调度日志ID * @return 结果 */ - public int deleteJobLogById(Long jobId); + int deleteJobLogById(Long jobId); /** * 清空任务日志 */ - public void cleanJobLog(); + void cleanJobLog(); } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java index 352fa874..2cb0a422 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.job.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.job.domain.SysJob; /** @@ -8,7 +10,7 @@ import com.ruoyi.job.domain.SysJob; * * @author ruoyi */ -public interface SysJobMapper +public interface SysJobMapper extends BaseMapper { /** * 查询调度任务日志集合 @@ -16,14 +18,14 @@ public interface SysJobMapper * @param job 调度信息 * @return 操作日志集合 */ - public List selectJobList(SysJob job); + List selectJobList(SysJob job); /** * 查询所有调度任务 * * @return 调度任务列表 */ - public List selectJobAll(); + List selectJobAll(); /** * 通过调度ID查询调度任务信息 @@ -31,7 +33,7 @@ public interface SysJobMapper * @param jobId 调度ID * @return 角色对象信息 */ - public SysJob selectJobById(Long jobId); + SysJob selectJobById(Long jobId); /** * 通过调度ID删除调度任务信息 @@ -39,7 +41,7 @@ public interface SysJobMapper * @param jobId 调度ID * @return 结果 */ - public int deleteJobById(Long jobId); + int deleteJobById(Long jobId); /** * 批量删除调度任务信息 @@ -47,7 +49,7 @@ public interface SysJobMapper * @param ids 需要删除的数据ID * @return 结果 */ - public int deleteJobByIds(Long[] ids); + int deleteJobByIds(Long[] ids); /** * 修改调度任务信息 @@ -55,7 +57,7 @@ public interface SysJobMapper * @param job 调度任务信息 * @return 结果 */ - public int updateJob(SysJob job); + int updateJob(SysJob job); /** * 新增调度任务信息 @@ -63,5 +65,5 @@ public interface SysJobMapper * @param job 调度任务信息 * @return 结果 */ - public int insertJob(SysJob job); + int insertJob(SysJob job); } diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml b/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml index 6e4ae7c6..37c022b3 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml @@ -4,23 +4,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time from sys_job_log - @@ -44,11 +33,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - where job_log_id = #{jobLogId} diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml b/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml index 0323cf11..83853162 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml @@ -3,29 +3,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark from sys_job - @@ -43,11 +27,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - where job_id = #{jobId}