upd: 编码规范
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
package cn.odboy.config;
|
||||
|
||||
import cn.odboy.mapper.QuartzJobMapper;
|
||||
import cn.odboy.domain.QuartzJob;
|
||||
import cn.odboy.model.job.domain.QuartzJob;
|
||||
import cn.odboy.util.QuartzManage;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.slf4j.Logger;
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
package cn.odboy.domain;
|
||||
|
||||
import cn.odboy.base.BaseEntity;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@TableName("sys_quartz_job")
|
||||
public class QuartzJob extends BaseEntity {
|
||||
|
||||
public static final String JOB_KEY = "JOB_KEY";
|
||||
|
||||
@TableId(value = "job_id", type = IdType.AUTO)
|
||||
@NotNull(groups = {Update.class})
|
||||
private Long id;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "用于子任务唯一标识", hidden = true)
|
||||
private String uuid;
|
||||
|
||||
@ApiModelProperty(value = "定时器名称")
|
||||
private String jobName;
|
||||
|
||||
@NotBlank
|
||||
@ApiModelProperty(value = "Bean名称")
|
||||
private String beanName;
|
||||
|
||||
@NotBlank
|
||||
@ApiModelProperty(value = "方法名称")
|
||||
private String methodName;
|
||||
|
||||
@ApiModelProperty(value = "参数")
|
||||
private String params;
|
||||
|
||||
@NotBlank
|
||||
@ApiModelProperty(value = "cron表达式")
|
||||
private String cronExpression;
|
||||
|
||||
@ApiModelProperty(value = "状态,暂时或启动")
|
||||
private Boolean isPause = false;
|
||||
|
||||
@ApiModelProperty(value = "负责人")
|
||||
private String personInCharge;
|
||||
|
||||
@ApiModelProperty(value = "报警邮箱")
|
||||
private String email;
|
||||
|
||||
@ApiModelProperty(value = "子任务")
|
||||
private String subTask;
|
||||
|
||||
@ApiModelProperty(value = "失败后暂停")
|
||||
private Boolean pauseAfterFailure;
|
||||
|
||||
@NotBlank
|
||||
@ApiModelProperty(value = "备注")
|
||||
private String description;
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
package cn.odboy.domain;
|
||||
|
||||
import cn.odboy.base.MyObject;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.sql.Timestamp;
|
||||
|
||||
@Data
|
||||
@TableName("sys_quartz_log")
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
public class QuartzLog extends MyObject {
|
||||
|
||||
@TableId(value = "log_id", type = IdType.AUTO)
|
||||
@ApiModelProperty(value = "ID", hidden = true)
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty(value = "任务名称", hidden = true)
|
||||
private String jobName;
|
||||
|
||||
@ApiModelProperty(value = "bean名称", hidden = true)
|
||||
private String beanName;
|
||||
|
||||
@ApiModelProperty(value = "方法名称", hidden = true)
|
||||
private String methodName;
|
||||
|
||||
@ApiModelProperty(value = "参数", hidden = true)
|
||||
private String params;
|
||||
|
||||
@ApiModelProperty(value = "cron表达式", hidden = true)
|
||||
private String cronExpression;
|
||||
|
||||
@ApiModelProperty(value = "状态", hidden = true)
|
||||
private Boolean isSuccess;
|
||||
|
||||
@ApiModelProperty(value = "异常详情", hidden = true)
|
||||
private String exceptionDetail;
|
||||
|
||||
@ApiModelProperty(value = "执行耗时", hidden = true)
|
||||
private Long time;
|
||||
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@ApiModelProperty(value = "创建时间", hidden = true)
|
||||
private Timestamp createTime;
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
package cn.odboy.domain.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.sql.Timestamp;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Data
|
||||
public class QuartzJobQueryCriteria {
|
||||
|
||||
@ApiModelProperty(value = "定时任务名称")
|
||||
private String jobName;
|
||||
|
||||
@ApiModelProperty(value = "是否成功")
|
||||
private Boolean isSuccess;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private List<Timestamp> createTime;
|
||||
|
||||
@ApiModelProperty(value = "页码", example = "1")
|
||||
private Integer page = 1;
|
||||
|
||||
@ApiModelProperty(value = "每页数据量", example = "10")
|
||||
private Integer size = 10;
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.odboy.mapper;
|
||||
|
||||
import cn.odboy.domain.dto.QuartzJobQueryCriteria;
|
||||
import cn.odboy.domain.QuartzJob;
|
||||
import cn.odboy.model.job.domain.QuartzJob;
|
||||
import cn.odboy.model.job.dto.QuartzJobQueryCriteria;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.odboy.mapper;
|
||||
|
||||
import cn.odboy.domain.dto.QuartzJobQueryCriteria;
|
||||
import cn.odboy.domain.QuartzLog;
|
||||
import cn.odboy.model.job.domain.QuartzLog;
|
||||
import cn.odboy.model.job.dto.QuartzJobQueryCriteria;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package cn.odboy.rest;
|
||||
|
||||
import cn.odboy.domain.QuartzJob;
|
||||
import cn.odboy.domain.QuartzLog;
|
||||
import cn.odboy.domain.dto.QuartzJobQueryCriteria;
|
||||
import cn.odboy.base.PageResult;
|
||||
import cn.odboy.exception.BadRequestException;
|
||||
import cn.odboy.model.job.domain.QuartzJob;
|
||||
import cn.odboy.model.job.domain.QuartzLog;
|
||||
import cn.odboy.model.job.dto.QuartzJobQueryCriteria;
|
||||
import cn.odboy.service.QuartzJobService;
|
||||
import cn.odboy.util.PageResult;
|
||||
import cn.odboy.util.SpringBeanHolder;
|
||||
import cn.odboy.context.SpringBeanHolder;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package cn.odboy.service;
|
||||
|
||||
import cn.odboy.domain.dto.QuartzJobQueryCriteria;
|
||||
import cn.odboy.domain.QuartzJob;
|
||||
import cn.odboy.domain.QuartzLog;
|
||||
import cn.odboy.util.PageResult;
|
||||
import cn.odboy.base.PageResult;
|
||||
import cn.odboy.model.job.domain.QuartzJob;
|
||||
import cn.odboy.model.job.domain.QuartzLog;
|
||||
import cn.odboy.model.job.dto.QuartzJobQueryCriteria;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
|
||||
@@ -2,12 +2,13 @@ package cn.odboy.service.impl;
|
||||
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.odboy.domain.dto.QuartzJobQueryCriteria;
|
||||
import cn.odboy.base.PageResult;
|
||||
import cn.odboy.exception.BadRequestException;
|
||||
import cn.odboy.mapper.QuartzJobMapper;
|
||||
import cn.odboy.mapper.QuartzLogMapper;
|
||||
import cn.odboy.domain.QuartzJob;
|
||||
import cn.odboy.domain.QuartzLog;
|
||||
import cn.odboy.model.job.domain.QuartzJob;
|
||||
import cn.odboy.model.job.domain.QuartzLog;
|
||||
import cn.odboy.model.job.dto.QuartzJobQueryCriteria;
|
||||
import cn.odboy.service.QuartzJobService;
|
||||
import cn.odboy.util.*;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
|
||||
@@ -4,16 +4,14 @@ import cn.hutool.extra.template.Template;
|
||||
import cn.hutool.extra.template.TemplateConfig;
|
||||
import cn.hutool.extra.template.TemplateEngine;
|
||||
import cn.hutool.extra.template.TemplateUtil;
|
||||
import cn.odboy.domain.dto.EmailDto;
|
||||
import cn.odboy.context.SpringBeanHolder;
|
||||
import cn.odboy.exception.util.ThrowableUtil;
|
||||
import cn.odboy.mapper.QuartzLogMapper;
|
||||
import cn.odboy.domain.QuartzJob;
|
||||
import cn.odboy.domain.QuartzLog;
|
||||
import cn.odboy.service.QuartzJobService;
|
||||
import cn.odboy.model.job.domain.QuartzJob;
|
||||
import cn.odboy.model.job.domain.QuartzLog;
|
||||
import cn.odboy.model.tools.dto.EmailDto;
|
||||
import cn.odboy.service.EmailService;
|
||||
import cn.odboy.util.RedisUtil;
|
||||
import cn.odboy.util.SpringBeanHolder;
|
||||
import cn.odboy.util.StringUtil;
|
||||
import cn.odboy.util.ThrowableUtil;
|
||||
import cn.odboy.service.QuartzJobService;
|
||||
import org.quartz.JobExecutionContext;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -27,9 +25,7 @@ import java.util.Map;
|
||||
import java.util.concurrent.Future;
|
||||
|
||||
public class ExecutionJob extends QuartzJobBean {
|
||||
|
||||
private final Logger logger = LoggerFactory.getLogger(this.getClass());
|
||||
|
||||
// 此处仅供参考,可根据任务执行情况自定义线程池参数
|
||||
private final ThreadPoolTaskExecutor executor = SpringBeanHolder.getBean("taskAsync");
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package cn.odboy.util;
|
||||
|
||||
import cn.odboy.exception.BadRequestException;
|
||||
import cn.odboy.domain.QuartzJob;
|
||||
import cn.odboy.model.job.domain.QuartzJob;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.quartz.*;
|
||||
import org.quartz.impl.triggers.CronTriggerImpl;
|
||||
@@ -10,8 +10,6 @@ import org.springframework.stereotype.Component;
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Date;
|
||||
|
||||
import static org.quartz.TriggerBuilder.newTrigger;
|
||||
|
||||
@Slf4j
|
||||
@Component
|
||||
public class QuartzManage {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package cn.odboy.util;
|
||||
|
||||
import cn.odboy.util.SpringBeanHolder;
|
||||
import cn.odboy.context.SpringBeanHolder;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.util.ReflectionUtils;
|
||||
|
||||
@@ -1,35 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="cn.odboy.mapper.QuartzJobMapper">
|
||||
|
||||
<resultMap id="BaseResultMap" type="cn.odboy.domain.QuartzJob">
|
||||
<id column="job_id" property="id" jdbcType="BIGINT"/>
|
||||
<result column="job_name" property="jobName" jdbcType="VARCHAR"/>
|
||||
<result column="bean_name" property="beanName" jdbcType="VARCHAR"/>
|
||||
<result column="method_name" property="methodName" jdbcType="VARCHAR"/>
|
||||
<result column="params" property="params" jdbcType="VARCHAR"/>
|
||||
<result column="cron_expression" property="cronExpression" jdbcType="VARCHAR"/>
|
||||
<result column="is_pause" property="isPause" jdbcType="TINYINT"/>
|
||||
<result column="person_in_charge" property="personInCharge" jdbcType="VARCHAR"/>
|
||||
<result column="email" property="email" jdbcType="VARCHAR"/>
|
||||
<result column="sub_task" property="subTask" jdbcType="VARCHAR"/>
|
||||
<result column="pause_after_failure" property="pauseAfterFailure" jdbcType="TINYINT"/>
|
||||
<result column="description" property="description" jdbcType="VARCHAR"/>
|
||||
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
|
||||
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
|
||||
<result column="create_by" property="createBy" jdbcType="VARCHAR"/>
|
||||
<result column="update_by" property="updateBy" jdbcType="VARCHAR"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="Base_Column_List">
|
||||
job_id
|
||||
, job_name, bean_name, method_name, params, cron_expression, is_pause, person_in_charge, email, sub_task,
|
||||
pause_after_failure, description, create_time, update_time, create_by, update_by
|
||||
</sql>
|
||||
|
||||
<select id="findAll" resultMap="BaseResultMap">
|
||||
<select id="findAll" resultType="cn.odboy.model.job.domain.QuartzJob">
|
||||
SELECT
|
||||
<include refid="Base_Column_List"/>
|
||||
*
|
||||
FROM sys_quartz_job
|
||||
<where>
|
||||
<if test="criteria.jobName != null and criteria.jobName != ''">
|
||||
@@ -39,12 +13,11 @@
|
||||
AND update_time BETWEEN #{criteria.createTime[0]} AND #{criteria.createTime[1]}
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY job_id DESC
|
||||
ORDER BY id DESC
|
||||
</select>
|
||||
|
||||
<select id="findByIsPauseIsFalse" resultMap="BaseResultMap">
|
||||
SELECT
|
||||
<include refid="Base_Column_List"/>
|
||||
<select id="findByIsPauseIsFalse" resultType="cn.odboy.model.job.domain.QuartzJob">
|
||||
SELECT *
|
||||
FROM sys_quartz_job
|
||||
WHERE is_pause = 0
|
||||
</select>
|
||||
|
||||
@@ -1,29 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="cn.odboy.mapper.QuartzLogMapper">
|
||||
|
||||
<resultMap id="BaseResultMap" type="cn.odboy.domain.QuartzLog">
|
||||
<id column="log_id" property="id" jdbcType="BIGINT"/>
|
||||
<result column="job_name" property="jobName" jdbcType="VARCHAR"/>
|
||||
<result column="bean_name" property="beanName" jdbcType="VARCHAR"/>
|
||||
<result column="method_name" property="methodName" jdbcType="VARCHAR"/>
|
||||
<result column="params" property="params" jdbcType="VARCHAR"/>
|
||||
<result column="cron_expression" property="cronExpression" jdbcType="VARCHAR"/>
|
||||
<result column="is_success" property="isSuccess" jdbcType="VARCHAR"/>
|
||||
<result column="exception_detail" property="exceptionDetail" jdbcType="BIGINT"/>
|
||||
<result column="time" property="time" jdbcType="BIGINT"/>
|
||||
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="Base_Column_List">
|
||||
log_id
|
||||
, job_name, bean_name, method_name, params, cron_expression, is_success, exception_detail, time,
|
||||
create_time
|
||||
</sql>
|
||||
|
||||
<select id="findAll" resultMap="BaseResultMap">
|
||||
<select id="findAll" resultType="cn.odboy.model.job.domain.QuartzLog">
|
||||
SELECT
|
||||
<include refid="Base_Column_List"/>
|
||||
*
|
||||
FROM sys_quartz_log
|
||||
<where>
|
||||
<if test="criteria.jobName != null and criteria.jobName != ''">
|
||||
|
||||
Reference in New Issue
Block a user