clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

支持mybatis-plus

This commit is contained in:
anweiguo 2021-05-25 13:57:04 +08:00
parent 5bc9b0da3b
commit d7e6220d64
7 changed files with 224 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-modules/ruoyi-job/pom.xml
View File

@ -65,6 +65,12 @@
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
</dependency> </dependency>
<!-- Mybatis-plus -->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
</dependency>
<!-- RuoYi Common Log --> <!-- RuoYi Common Log -->
<dependency> <dependency>

129
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java
View File

@ -2,10 +2,15 @@ package com.ruoyi.job.domain;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
@ -18,81 +23,143 @@ import com.ruoyi.job.util.CronUtils;
/** /**
* 定时任务调度表 sys_job * 定时任务调度表 sys_job
* *
* @author ruoyi * @author ruoyi
*/ */
@Data @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; private static final long serialVersionUID = 1L;
/** 任务ID */ /**
* 任务ID
*/
@Excel(name = "任务序号", cellType = ColumnType.NUMERIC) @Excel(name = "任务序号", cellType = ColumnType.NUMERIC)
@TableId(value = "job_id", type = IdType.AUTO)
private Long jobId; private Long jobId;
/** 任务名称 */ /**
* 任务名称
*/
@Excel(name = "任务名称") @Excel(name = "任务名称")
@NotBlank(message = "任务名称不能为空") @NotBlank(message = "任务名称不能为空")
@Size(min = 0, max = 64, message = "任务名称不能超过64个字符") @Size(min = 0, max = 64, message = "任务名称不能超过64个字符")
private String jobName; private String jobName;
/** 任务组名 */ /**
* 任务组名
*/
@Excel(name = "任务组名") @Excel(name = "任务组名")
private String jobGroup; private String jobGroup;
/** 调用目标字符串 */ /**
* 调用目标字符串
*/
@Excel(name = "调用目标字符串") @Excel(name = "调用目标字符串")
@NotBlank(message = "调用目标字符串不能为空") @NotBlank(message = "调用目标字符串不能为空")
@Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符") @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符")
private String invokeTarget; private String invokeTarget;
/** cron执行表达式 */ /**
* cron执行表达式
*/
@Excel(name = "执行表达式 ") @Excel(name = "执行表达式 ")
@NotBlank(message = "Cron执行表达式不能为空") @NotBlank(message = "Cron执行表达式不能为空")
@Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符") @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符")
private String cronExpression; private String cronExpression;
/** cron计划策略 */ /**
* cron计划策略
*/
@Excel(name = "计划策略 ", readConverterExp = "0=默认,1=立即触发执行,2=触发一次执行,3=不触发立即执行") @Excel(name = "计划策略 ", readConverterExp = "0=默认,1=立即触发执行,2=触发一次执行,3=不触发立即执行")
private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT; private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT;
/** 是否并发执行（0允许 1禁止） */ /**
* 是否并发执行（0允许 1禁止）
*/
@Excel(name = "并发执行", readConverterExp = "0=允许,1=禁止") @Excel(name = "并发执行", readConverterExp = "0=允许,1=禁止")
private String concurrent; private String concurrent;
/** 任务状态（0正常 1暂停） */ /**
* 任务状态（0正常 1暂停）
*/
@Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停") @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停")
private String status; private String status;
/** 下次执行时间 */ /**
* 下次执行时间
*/
private Date nextValidTime; private Date nextValidTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date getNextValidTime() public Date getNextValidTime() {
{ if (StringUtils.isNotEmpty(cronExpression)) {
if (StringUtils.isNotEmpty(cronExpression))
{
return CronUtils.getNextExecution(cronExpression); return CronUtils.getNextExecution(cronExpression);
} }
return null; 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<String, Object> params = new HashMap<>();
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("jobId", getJobId()) .append("jobId", getJobId())
.append("jobName", getJobName()) .append("jobName", getJobName())
.append("jobGroup", getJobGroup()) .append("jobGroup", getJobGroup())
.append("cronExpression", getCronExpression()) .append("cronExpression", getCronExpression())
.append("nextValidTime", getNextValidTime()) .append("nextValidTime", getNextValidTime())
.append("misfirePolicy", getMisfirePolicy()) .append("misfirePolicy", getMisfirePolicy())
.append("concurrent", getConcurrent()) .append("concurrent", getConcurrent())
.append("status", getStatus()) .append("status", getStatus())
.append("createBy", getCreateBy()) .append("createBy", getCreateBy())
.append("createTime", getCreateTime()) .append("createTime", getCreateTime())
.append("updateBy", getUpdateBy()) .append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime()) .append("updateTime", getUpdateTime())
.append("remark", getRemark()) .append("remark", getRemark())
.toString(); .toString();
} }
} }

116
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java
View File

@ -1,8 +1,15 @@
package com.ruoyi.job.domain; package com.ruoyi.job.domain;
import java.io.Serializable;
import java.util.Date; 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.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel;
@ -10,59 +17,124 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
/** /**
* 定时任务调度日志表 sys_job_log * 定时任务调度日志表 sys_job_log
* *
* @author ruoyi * @author ruoyi
*/ */
@Data @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; private static final long serialVersionUID = 1L;
/** ID */ /**
* ID
*/
@Excel(name = "日志序号") @Excel(name = "日志序号")
@TableId(value = "job_log_id", type = IdType.AUTO)
private Long jobLogId; private Long jobLogId;
/** 任务名称 */ /**
* 任务名称
*/
@Excel(name = "任务名称") @Excel(name = "任务名称")
private String jobName; private String jobName;
/** 任务组名 */ /**
* 任务组名
*/
@Excel(name = "任务组名") @Excel(name = "任务组名")
private String jobGroup; private String jobGroup;
/** 调用目标字符串 */ /**
* 调用目标字符串
*/
@Excel(name = "调用目标字符串") @Excel(name = "调用目标字符串")
private String invokeTarget; private String invokeTarget;
/** 日志信息 */ /**
* 日志信息
*/
@Excel(name = "日志信息") @Excel(name = "日志信息")
private String jobMessage; private String jobMessage;
/** 执行状态（0正常 1失败） */ /**
* 执行状态（0正常 1失败）
*/
@Excel(name = "执行状态", readConverterExp = "0=正常,1=失败") @Excel(name = "执行状态", readConverterExp = "0=正常,1=失败")
private String status; private String status;
/** 异常信息 */ /**
* 异常信息
*/
@Excel(name = "异常信息") @Excel(name = "异常信息")
private String exceptionInfo; private String exceptionInfo;
/** 开始时间 */ /**
* 开始时间
*/
private Date startTime; private Date startTime;
/** 停止时间 */ /**
* 停止时间
*/
private Date stopTime; 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<String, Object> params = new HashMap<>();
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("jobLogId", getJobLogId()) .append("jobLogId", getJobLogId())
.append("jobName", getJobName()) .append("jobName", getJobName())
.append("jobGroup", getJobGroup()) .append("jobGroup", getJobGroup())
.append("jobMessage", getJobMessage()) .append("jobMessage", getJobMessage())
.append("status", getStatus()) .append("status", getStatus())
.append("exceptionInfo", getExceptionInfo()) .append("exceptionInfo", getExceptionInfo())
.append("startTime", getStartTime()) .append("startTime", getStartTime())
.append("stopTime", getStopTime()) .append("stopTime", getStopTime())
.toString(); .toString();
} }
} }

18
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.job.mapper; package com.ruoyi.job.mapper;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.job.domain.SysJobLog; import com.ruoyi.job.domain.SysJobLog;
/** /**
@ -8,7 +10,7 @@ import com.ruoyi.job.domain.SysJobLog;
* *
* @author ruoyi * @author ruoyi
*/ */
public interface SysJobLogMapper public interface SysJobLogMapper extends BaseMapper<SysJobLog>
{ {
/** /**
* 获取quartz调度器日志的计划任务 * 获取quartz调度器日志的计划任务
@ -16,14 +18,14 @@ public interface SysJobLogMapper
* @param jobLog 调度日志信息 * @param jobLog 调度日志信息
* @return 调度任务日志集合 * @return 调度任务日志集合
*/ */
public List<SysJobLog> selectJobLogList(SysJobLog jobLog); List<SysJobLog> selectJobLogList(SysJobLog jobLog);
/** /**
* 查询所有调度任务日志 * 查询所有调度任务日志
* *
* @return 调度任务日志列表 * @return 调度任务日志列表
*/ */
public List<SysJobLog> selectJobLogAll(); List<SysJobLog> selectJobLogAll();
/** /**
* 通过调度任务日志ID查询调度信息 * 通过调度任务日志ID查询调度信息
@ -31,7 +33,7 @@ public interface SysJobLogMapper
* @param jobLogId 调度任务日志ID * @param jobLogId 调度任务日志ID
* @return 调度任务日志对象信息 * @return 调度任务日志对象信息
*/ */
public SysJobLog selectJobLogById(Long jobLogId); SysJobLog selectJobLogById(Long jobLogId);
/** /**
* 新增任务日志 * 新增任务日志
@ -39,7 +41,7 @@ public interface SysJobLogMapper
* @param jobLog 调度日志信息 * @param jobLog 调度日志信息
* @return 结果 * @return 结果
*/ */
public int insertJobLog(SysJobLog jobLog); int insertJobLog(SysJobLog jobLog);
/** /**
* 批量删除调度日志信息 * 批量删除调度日志信息
@ -47,7 +49,7 @@ public interface SysJobLogMapper
* @param logIds 需要删除的数据ID * @param logIds 需要删除的数据ID
* @return 结果 * @return 结果
*/ */
public int deleteJobLogByIds(Long[] logIds); int deleteJobLogByIds(Long[] logIds);
/** /**
* 删除任务日志 * 删除任务日志
@ -55,10 +57,10 @@ public interface SysJobLogMapper
* @param jobId 调度日志ID * @param jobId 调度日志ID
* @return 结果 * @return 结果
*/ */
public int deleteJobLogById(Long jobId); int deleteJobLogById(Long jobId);
/** /**
* 清空任务日志 * 清空任务日志
*/ */
public void cleanJobLog(); void cleanJobLog();
} }

18
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.job.mapper; package com.ruoyi.job.mapper;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.job.domain.SysJob; import com.ruoyi.job.domain.SysJob;
/** /**
@ -8,7 +10,7 @@ import com.ruoyi.job.domain.SysJob;
* *
* @author ruoyi * @author ruoyi
*/ */
public interface SysJobMapper public interface SysJobMapper extends BaseMapper<SysJob>
{ {
/** /**
* 查询调度任务日志集合 * 查询调度任务日志集合
@ -16,14 +18,14 @@ public interface SysJobMapper
* @param job 调度信息 * @param job 调度信息
* @return 操作日志集合 * @return 操作日志集合
*/ */
public List<SysJob> selectJobList(SysJob job); List<SysJob> selectJobList(SysJob job);
/** /**
* 查询所有调度任务 * 查询所有调度任务
* *
* @return 调度任务列表 * @return 调度任务列表
*/ */
public List<SysJob> selectJobAll(); List<SysJob> selectJobAll();
/** /**
* 通过调度ID查询调度任务信息 * 通过调度ID查询调度任务信息
@ -31,7 +33,7 @@ public interface SysJobMapper
* @param jobId 调度ID * @param jobId 调度ID
* @return 角色对象信息 * @return 角色对象信息
*/ */
public SysJob selectJobById(Long jobId); SysJob selectJobById(Long jobId);
/** /**
* 通过调度ID删除调度任务信息 * 通过调度ID删除调度任务信息
@ -39,7 +41,7 @@ public interface SysJobMapper
* @param jobId 调度ID * @param jobId 调度ID
* @return 结果 * @return 结果
*/ */
public int deleteJobById(Long jobId); int deleteJobById(Long jobId);
/** /**
* 批量删除调度任务信息 * 批量删除调度任务信息
@ -47,7 +49,7 @@ public interface SysJobMapper
* @param ids 需要删除的数据ID * @param ids 需要删除的数据ID
* @return 结果 * @return 结果
*/ */
public int deleteJobByIds(Long[] ids); int deleteJobByIds(Long[] ids);
/** /**
* 修改调度任务信息 * 修改调度任务信息
@ -55,7 +57,7 @@ public interface SysJobMapper
* @param job 调度任务信息 * @param job 调度任务信息
* @return 结果 * @return 结果
*/ */
public int updateJob(SysJob job); int updateJob(SysJob job);
/** /**
* 新增调度任务信息 * 新增调度任务信息
@ -63,5 +65,5 @@ public interface SysJobMapper
* @param job 调度任务信息 * @param job 调度任务信息
* @return 结果 * @return 结果
*/ */
public int insertJob(SysJob job); int insertJob(SysJob job);
} }

17
ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml
View File

@ -4,23 +4,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.job.mapper.SysJobLogMapper"> <mapper namespace="com.ruoyi.job.mapper.SysJobLogMapper">
<resultMap type="SysJobLog" id="SysJobLogResult">
<id property="jobLogId" column="job_log_id" />
<result property="jobName" column="job_name" />
<result property="jobGroup" column="job_group" />
<result property="invokeTarget" column="invoke_target" />
<result property="jobMessage" column="job_message" />
<result property="status" column="status" />
<result property="exceptionInfo" column="exception_info" />
<result property="createTime" column="create_time" />
</resultMap>
<sql id="selectJobLogVo"> <sql id="selectJobLogVo">
select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time
from sys_job_log from sys_job_log
</sql> </sql>
<select id="selectJobLogList" parameterType="SysJobLog" resultMap="SysJobLogResult"> <select id="selectJobLogList" parameterType="SysJobLog" resultType="SysJobLog">
<include refid="selectJobLogVo"/> <include refid="selectJobLogVo"/>
<where> <where>
<if test="jobName != null and jobName != ''"> <if test="jobName != null and jobName != ''">
@ -44,11 +33,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
</select> </select>
<select id="selectJobLogAll" resultMap="SysJobLogResult"> <select id="selectJobLogAll" resultType="SysJobLog">
<include refid="selectJobLogVo"/> <include refid="selectJobLogVo"/>
</select> </select>
<select id="selectJobLogById" parameterType="Long" resultMap="SysJobLogResult"> <select id="selectJobLogById" parameterType="Long" resultType="SysJobLog">
<include refid="selectJobLogVo"/> <include refid="selectJobLogVo"/>
where job_log_id = #{jobLogId} where job_log_id = #{jobLogId}
</select> </select>

22
ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml
View File

@ -3,29 +3,13 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.job.mapper.SysJobMapper"> <mapper namespace="com.ruoyi.job.mapper.SysJobMapper">
<resultMap type="SysJob" id="SysJobResult">
<id property="jobId" column="job_id" />
<result property="jobName" column="job_name" />
<result property="jobGroup" column="job_group" />
<result property="invokeTarget" column="invoke_target" />
<result property="cronExpression" column="cron_expression" />
<result property="misfirePolicy" column="misfire_policy" />
<result property="concurrent" column="concurrent" />
<result property="status" column="status" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectJobVo"> <sql id="selectJobVo">
select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark
from sys_job from sys_job
</sql> </sql>
<select id="selectJobList" parameterType="SysJob" resultMap="SysJobResult"> <select id="selectJobList" parameterType="SysJob" resultType="SysJob">
<include refid="selectJobVo"/> <include refid="selectJobVo"/>
<where> <where>
<if test="jobName != null and jobName != ''"> <if test="jobName != null and jobName != ''">
@ -43,11 +27,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
</select> </select>
<select id="selectJobAll" resultMap="SysJobResult"> <select id="selectJobAll" resultType="SysJob">
<include refid="selectJobVo"/> <include refid="selectJobVo"/>
</select> </select>
<select id="selectJobById" parameterType="Long" resultMap="SysJobResult"> <select id="selectJobById" parameterType="Long" resultType="SysJob">
<include refid="selectJobVo"/> <include refid="selectJobVo"/>
where job_id = #{jobId} where job_id = #{jobId}
</select> </select>