diff --git a/accompany-business/accompany-business-service/pom.xml b/accompany-business/accompany-business-service/pom.xml index 4855d623e..7a5594f7f 100644 --- a/accompany-business/accompany-business-service/pom.xml +++ b/accompany-business/accompany-business-service/pom.xml @@ -83,17 +83,6 @@ UserAgentUtils ${bitwalker.version} - - org.quartz-scheduler - quartz - ${quartz.version} - - - com.zaxxer - HikariCP-java7 - - - com.aliyun diff --git a/accompany-dependencies/pom.xml b/accompany-dependencies/pom.xml index cf33c3069..9a63e8159 100644 --- a/accompany-dependencies/pom.xml +++ b/accompany-dependencies/pom.xml @@ -25,7 +25,6 @@ 3.2.9.RELEASE 3.2.5.RELEASE 8.0.17 - 2.3.2 3.1.0 4.5 31.1-jre diff --git a/accompany-scheduler/accompany-scheduler-sdk/pom.xml b/accompany-scheduler/accompany-scheduler-sdk/pom.xml deleted file mode 100644 index c28296ea6..000000000 --- a/accompany-scheduler/accompany-scheduler-sdk/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - 4.0.0 - - com.accompany - accompany-scheduler - 1.0.0 - - - accompany-scheduler-sdk - jar - - - - com.accompany - accompany-core - ${revision} - - - \ No newline at end of file diff --git a/accompany-scheduler/accompany-scheduler-sdk/src/main/java/com/accompany/scheduler/constant/QuartzJobType.java b/accompany-scheduler/accompany-scheduler-sdk/src/main/java/com/accompany/scheduler/constant/QuartzJobType.java deleted file mode 100644 index 699cbbd2b..000000000 --- a/accompany-scheduler/accompany-scheduler-sdk/src/main/java/com/accompany/scheduler/constant/QuartzJobType.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.accompany.scheduler.constant; - -/** - * @author PaperCut - * Created by PaperCut on 2018/8/1. - * Quartz任务类型 - */ -public enum QuartzJobType { - JavaJobClass(1, "JavaJobClass"), SqlJob(2, "SqlJob"), HttpGetJob(3, "HttpGetJob"); - public final int value; - - private final String desc; - - QuartzJobType(int value, String desc) { - this.value = value; - this.desc = desc; - } - - public String getDesc() { - return desc; - } - - public static String getDesc(int type) { - for (QuartzJobType enumType : QuartzJobType.values()) { - if (enumType.value == type) { - return enumType.getDesc(); - } - } - return "" + type; - } -} diff --git a/accompany-scheduler/accompany-scheduler-sdk/src/main/java/com/accompany/scheduler/model/QuartzJob.java b/accompany-scheduler/accompany-scheduler-sdk/src/main/java/com/accompany/scheduler/model/QuartzJob.java deleted file mode 100644 index 012c32055..000000000 --- a/accompany-scheduler/accompany-scheduler-sdk/src/main/java/com/accompany/scheduler/model/QuartzJob.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.accompany.scheduler.model; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -@Data -public class QuartzJob implements Serializable { - private Long id; - - private String expression; - - private String description; - - private String jobName; - - private String jobClassName; - - private Integer jobType; - - private String jobData; - - private Boolean isOneTime; - - private Date nextFireTime; - - private Date prevFireTime; - - private String triggerState; - - private String triggerType; - - private Date startTime; - - private Date endTime; - - private Date createTime; - - private Date updateTime; - -} \ No newline at end of file diff --git a/accompany-scheduler/accompany-scheduler-sdk/src/main/java/com/accompany/scheduler/model/QuartzJobExample.java b/accompany-scheduler/accompany-scheduler-sdk/src/main/java/com/accompany/scheduler/model/QuartzJobExample.java deleted file mode 100644 index 2277aa4ad..000000000 --- a/accompany-scheduler/accompany-scheduler-sdk/src/main/java/com/accompany/scheduler/model/QuartzJobExample.java +++ /dev/null @@ -1,1231 +0,0 @@ -package com.accompany.scheduler.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class QuartzJobExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public QuartzJobExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andExpressionIsNull() { - addCriterion("expression is null"); - return (Criteria) this; - } - - public Criteria andExpressionIsNotNull() { - addCriterion("expression is not null"); - return (Criteria) this; - } - - public Criteria andExpressionEqualTo(String value) { - addCriterion("expression =", value, "expression"); - return (Criteria) this; - } - - public Criteria andExpressionNotEqualTo(String value) { - addCriterion("expression <>", value, "expression"); - return (Criteria) this; - } - - public Criteria andExpressionGreaterThan(String value) { - addCriterion("expression >", value, "expression"); - return (Criteria) this; - } - - public Criteria andExpressionGreaterThanOrEqualTo(String value) { - addCriterion("expression >=", value, "expression"); - return (Criteria) this; - } - - public Criteria andExpressionLessThan(String value) { - addCriterion("expression <", value, "expression"); - return (Criteria) this; - } - - public Criteria andExpressionLessThanOrEqualTo(String value) { - addCriterion("expression <=", value, "expression"); - return (Criteria) this; - } - - public Criteria andExpressionLike(String value) { - addCriterion("expression like", value, "expression"); - return (Criteria) this; - } - - public Criteria andExpressionNotLike(String value) { - addCriterion("expression not like", value, "expression"); - return (Criteria) this; - } - - public Criteria andExpressionIn(List values) { - addCriterion("expression in", values, "expression"); - return (Criteria) this; - } - - public Criteria andExpressionNotIn(List values) { - addCriterion("expression not in", values, "expression"); - return (Criteria) this; - } - - public Criteria andExpressionBetween(String value1, String value2) { - addCriterion("expression between", value1, value2, "expression"); - return (Criteria) this; - } - - public Criteria andExpressionNotBetween(String value1, String value2) { - addCriterion("expression not between", value1, value2, "expression"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNull() { - addCriterion("description is null"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNotNull() { - addCriterion("description is not null"); - return (Criteria) this; - } - - public Criteria andDescriptionEqualTo(String value) { - addCriterion("description =", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotEqualTo(String value) { - addCriterion("description <>", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThan(String value) { - addCriterion("description >", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThanOrEqualTo(String value) { - addCriterion("description >=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThan(String value) { - addCriterion("description <", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThanOrEqualTo(String value) { - addCriterion("description <=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLike(String value) { - addCriterion("description like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotLike(String value) { - addCriterion("description not like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionIn(List values) { - addCriterion("description in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotIn(List values) { - addCriterion("description not in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionBetween(String value1, String value2) { - addCriterion("description between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotBetween(String value1, String value2) { - addCriterion("description not between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andJobNameIsNull() { - addCriterion("job_name is null"); - return (Criteria) this; - } - - public Criteria andJobNameIsNotNull() { - addCriterion("job_name is not null"); - return (Criteria) this; - } - - public Criteria andJobNameEqualTo(String value) { - addCriterion("job_name =", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameNotEqualTo(String value) { - addCriterion("job_name <>", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameGreaterThan(String value) { - addCriterion("job_name >", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameGreaterThanOrEqualTo(String value) { - addCriterion("job_name >=", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameLessThan(String value) { - addCriterion("job_name <", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameLessThanOrEqualTo(String value) { - addCriterion("job_name <=", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameLike(String value) { - addCriterion("job_name like", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameNotLike(String value) { - addCriterion("job_name not like", value, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameIn(List values) { - addCriterion("job_name in", values, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameNotIn(List values) { - addCriterion("job_name not in", values, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameBetween(String value1, String value2) { - addCriterion("job_name between", value1, value2, "jobName"); - return (Criteria) this; - } - - public Criteria andJobNameNotBetween(String value1, String value2) { - addCriterion("job_name not between", value1, value2, "jobName"); - return (Criteria) this; - } - - public Criteria andJobClassNameIsNull() { - addCriterion("job_class_name is null"); - return (Criteria) this; - } - - public Criteria andJobClassNameIsNotNull() { - addCriterion("job_class_name is not null"); - return (Criteria) this; - } - - public Criteria andJobClassNameEqualTo(String value) { - addCriterion("job_class_name =", value, "jobClassName"); - return (Criteria) this; - } - - public Criteria andJobClassNameNotEqualTo(String value) { - addCriterion("job_class_name <>", value, "jobClassName"); - return (Criteria) this; - } - - public Criteria andJobClassNameGreaterThan(String value) { - addCriterion("job_class_name >", value, "jobClassName"); - return (Criteria) this; - } - - public Criteria andJobClassNameGreaterThanOrEqualTo(String value) { - addCriterion("job_class_name >=", value, "jobClassName"); - return (Criteria) this; - } - - public Criteria andJobClassNameLessThan(String value) { - addCriterion("job_class_name <", value, "jobClassName"); - return (Criteria) this; - } - - public Criteria andJobClassNameLessThanOrEqualTo(String value) { - addCriterion("job_class_name <=", value, "jobClassName"); - return (Criteria) this; - } - - public Criteria andJobClassNameLike(String value) { - addCriterion("job_class_name like", value, "jobClassName"); - return (Criteria) this; - } - - public Criteria andJobClassNameNotLike(String value) { - addCriterion("job_class_name not like", value, "jobClassName"); - return (Criteria) this; - } - - public Criteria andJobClassNameIn(List values) { - addCriterion("job_class_name in", values, "jobClassName"); - return (Criteria) this; - } - - public Criteria andJobClassNameNotIn(List values) { - addCriterion("job_class_name not in", values, "jobClassName"); - return (Criteria) this; - } - - public Criteria andJobClassNameBetween(String value1, String value2) { - addCriterion("job_class_name between", value1, value2, "jobClassName"); - return (Criteria) this; - } - - public Criteria andJobClassNameNotBetween(String value1, String value2) { - addCriterion("job_class_name not between", value1, value2, "jobClassName"); - return (Criteria) this; - } - - public Criteria andJobTypeIsNull() { - addCriterion("job_type is null"); - return (Criteria) this; - } - - public Criteria andJobTypeIsNotNull() { - addCriterion("job_type is not null"); - return (Criteria) this; - } - - public Criteria andJobTypeEqualTo(Integer value) { - addCriterion("job_type =", value, "jobType"); - return (Criteria) this; - } - - public Criteria andJobTypeNotEqualTo(Integer value) { - addCriterion("job_type <>", value, "jobType"); - return (Criteria) this; - } - - public Criteria andJobTypeGreaterThan(Integer value) { - addCriterion("job_type >", value, "jobType"); - return (Criteria) this; - } - - public Criteria andJobTypeGreaterThanOrEqualTo(Integer value) { - addCriterion("job_type >=", value, "jobType"); - return (Criteria) this; - } - - public Criteria andJobTypeLessThan(Integer value) { - addCriterion("job_type <", value, "jobType"); - return (Criteria) this; - } - - public Criteria andJobTypeLessThanOrEqualTo(Integer value) { - addCriterion("job_type <=", value, "jobType"); - return (Criteria) this; - } - - public Criteria andJobTypeIn(List values) { - addCriterion("job_type in", values, "jobType"); - return (Criteria) this; - } - - public Criteria andJobTypeNotIn(List values) { - addCriterion("job_type not in", values, "jobType"); - return (Criteria) this; - } - - public Criteria andJobTypeBetween(Integer value1, Integer value2) { - addCriterion("job_type between", value1, value2, "jobType"); - return (Criteria) this; - } - - public Criteria andJobTypeNotBetween(Integer value1, Integer value2) { - addCriterion("job_type not between", value1, value2, "jobType"); - return (Criteria) this; - } - - public Criteria andJobDataIsNull() { - addCriterion("job_data is null"); - return (Criteria) this; - } - - public Criteria andJobDataIsNotNull() { - addCriterion("job_data is not null"); - return (Criteria) this; - } - - public Criteria andJobDataEqualTo(String value) { - addCriterion("job_data =", value, "jobData"); - return (Criteria) this; - } - - public Criteria andJobDataNotEqualTo(String value) { - addCriterion("job_data <>", value, "jobData"); - return (Criteria) this; - } - - public Criteria andJobDataGreaterThan(String value) { - addCriterion("job_data >", value, "jobData"); - return (Criteria) this; - } - - public Criteria andJobDataGreaterThanOrEqualTo(String value) { - addCriterion("job_data >=", value, "jobData"); - return (Criteria) this; - } - - public Criteria andJobDataLessThan(String value) { - addCriterion("job_data <", value, "jobData"); - return (Criteria) this; - } - - public Criteria andJobDataLessThanOrEqualTo(String value) { - addCriterion("job_data <=", value, "jobData"); - return (Criteria) this; - } - - public Criteria andJobDataLike(String value) { - addCriterion("job_data like", value, "jobData"); - return (Criteria) this; - } - - public Criteria andJobDataNotLike(String value) { - addCriterion("job_data not like", value, "jobData"); - return (Criteria) this; - } - - public Criteria andJobDataIn(List values) { - addCriterion("job_data in", values, "jobData"); - return (Criteria) this; - } - - public Criteria andJobDataNotIn(List values) { - addCriterion("job_data not in", values, "jobData"); - return (Criteria) this; - } - - public Criteria andJobDataBetween(String value1, String value2) { - addCriterion("job_data between", value1, value2, "jobData"); - return (Criteria) this; - } - - public Criteria andJobDataNotBetween(String value1, String value2) { - addCriterion("job_data not between", value1, value2, "jobData"); - return (Criteria) this; - } - - public Criteria andIsOneTimeIsNull() { - addCriterion("is_one_time is null"); - return (Criteria) this; - } - - public Criteria andIsOneTimeIsNotNull() { - addCriterion("is_one_time is not null"); - return (Criteria) this; - } - - public Criteria andIsOneTimeEqualTo(Boolean value) { - addCriterion("is_one_time =", value, "isOneTime"); - return (Criteria) this; - } - - public Criteria andIsOneTimeNotEqualTo(Boolean value) { - addCriterion("is_one_time <>", value, "isOneTime"); - return (Criteria) this; - } - - public Criteria andIsOneTimeGreaterThan(Boolean value) { - addCriterion("is_one_time >", value, "isOneTime"); - return (Criteria) this; - } - - public Criteria andIsOneTimeGreaterThanOrEqualTo(Boolean value) { - addCriterion("is_one_time >=", value, "isOneTime"); - return (Criteria) this; - } - - public Criteria andIsOneTimeLessThan(Boolean value) { - addCriterion("is_one_time <", value, "isOneTime"); - return (Criteria) this; - } - - public Criteria andIsOneTimeLessThanOrEqualTo(Boolean value) { - addCriterion("is_one_time <=", value, "isOneTime"); - return (Criteria) this; - } - - public Criteria andIsOneTimeIn(List values) { - addCriterion("is_one_time in", values, "isOneTime"); - return (Criteria) this; - } - - public Criteria andIsOneTimeNotIn(List values) { - addCriterion("is_one_time not in", values, "isOneTime"); - return (Criteria) this; - } - - public Criteria andIsOneTimeBetween(Boolean value1, Boolean value2) { - addCriterion("is_one_time between", value1, value2, "isOneTime"); - return (Criteria) this; - } - - public Criteria andIsOneTimeNotBetween(Boolean value1, Boolean value2) { - addCriterion("is_one_time not between", value1, value2, "isOneTime"); - return (Criteria) this; - } - - public Criteria andNextFireTimeIsNull() { - addCriterion("next_fire_time is null"); - return (Criteria) this; - } - - public Criteria andNextFireTimeIsNotNull() { - addCriterion("next_fire_time is not null"); - return (Criteria) this; - } - - public Criteria andNextFireTimeEqualTo(Date value) { - addCriterion("next_fire_time =", value, "nextFireTime"); - return (Criteria) this; - } - - public Criteria andNextFireTimeNotEqualTo(Date value) { - addCriterion("next_fire_time <>", value, "nextFireTime"); - return (Criteria) this; - } - - public Criteria andNextFireTimeGreaterThan(Date value) { - addCriterion("next_fire_time >", value, "nextFireTime"); - return (Criteria) this; - } - - public Criteria andNextFireTimeGreaterThanOrEqualTo(Date value) { - addCriterion("next_fire_time >=", value, "nextFireTime"); - return (Criteria) this; - } - - public Criteria andNextFireTimeLessThan(Date value) { - addCriterion("next_fire_time <", value, "nextFireTime"); - return (Criteria) this; - } - - public Criteria andNextFireTimeLessThanOrEqualTo(Date value) { - addCriterion("next_fire_time <=", value, "nextFireTime"); - return (Criteria) this; - } - - public Criteria andNextFireTimeIn(List values) { - addCriterion("next_fire_time in", values, "nextFireTime"); - return (Criteria) this; - } - - public Criteria andNextFireTimeNotIn(List values) { - addCriterion("next_fire_time not in", values, "nextFireTime"); - return (Criteria) this; - } - - public Criteria andNextFireTimeBetween(Date value1, Date value2) { - addCriterion("next_fire_time between", value1, value2, "nextFireTime"); - return (Criteria) this; - } - - public Criteria andNextFireTimeNotBetween(Date value1, Date value2) { - addCriterion("next_fire_time not between", value1, value2, "nextFireTime"); - return (Criteria) this; - } - - public Criteria andPrevFireTimeIsNull() { - addCriterion("prev_fire_time is null"); - return (Criteria) this; - } - - public Criteria andPrevFireTimeIsNotNull() { - addCriterion("prev_fire_time is not null"); - return (Criteria) this; - } - - public Criteria andPrevFireTimeEqualTo(Date value) { - addCriterion("prev_fire_time =", value, "prevFireTime"); - return (Criteria) this; - } - - public Criteria andPrevFireTimeNotEqualTo(Date value) { - addCriterion("prev_fire_time <>", value, "prevFireTime"); - return (Criteria) this; - } - - public Criteria andPrevFireTimeGreaterThan(Date value) { - addCriterion("prev_fire_time >", value, "prevFireTime"); - return (Criteria) this; - } - - public Criteria andPrevFireTimeGreaterThanOrEqualTo(Date value) { - addCriterion("prev_fire_time >=", value, "prevFireTime"); - return (Criteria) this; - } - - public Criteria andPrevFireTimeLessThan(Date value) { - addCriterion("prev_fire_time <", value, "prevFireTime"); - return (Criteria) this; - } - - public Criteria andPrevFireTimeLessThanOrEqualTo(Date value) { - addCriterion("prev_fire_time <=", value, "prevFireTime"); - return (Criteria) this; - } - - public Criteria andPrevFireTimeIn(List values) { - addCriterion("prev_fire_time in", values, "prevFireTime"); - return (Criteria) this; - } - - public Criteria andPrevFireTimeNotIn(List values) { - addCriterion("prev_fire_time not in", values, "prevFireTime"); - return (Criteria) this; - } - - public Criteria andPrevFireTimeBetween(Date value1, Date value2) { - addCriterion("prev_fire_time between", value1, value2, "prevFireTime"); - return (Criteria) this; - } - - public Criteria andPrevFireTimeNotBetween(Date value1, Date value2) { - addCriterion("prev_fire_time not between", value1, value2, "prevFireTime"); - return (Criteria) this; - } - - public Criteria andTriggerStateIsNull() { - addCriterion("trigger_state is null"); - return (Criteria) this; - } - - public Criteria andTriggerStateIsNotNull() { - addCriterion("trigger_state is not null"); - return (Criteria) this; - } - - public Criteria andTriggerStateEqualTo(String value) { - addCriterion("trigger_state =", value, "triggerState"); - return (Criteria) this; - } - - public Criteria andTriggerStateNotEqualTo(String value) { - addCriterion("trigger_state <>", value, "triggerState"); - return (Criteria) this; - } - - public Criteria andTriggerStateGreaterThan(String value) { - addCriterion("trigger_state >", value, "triggerState"); - return (Criteria) this; - } - - public Criteria andTriggerStateGreaterThanOrEqualTo(String value) { - addCriterion("trigger_state >=", value, "triggerState"); - return (Criteria) this; - } - - public Criteria andTriggerStateLessThan(String value) { - addCriterion("trigger_state <", value, "triggerState"); - return (Criteria) this; - } - - public Criteria andTriggerStateLessThanOrEqualTo(String value) { - addCriterion("trigger_state <=", value, "triggerState"); - return (Criteria) this; - } - - public Criteria andTriggerStateLike(String value) { - addCriterion("trigger_state like", value, "triggerState"); - return (Criteria) this; - } - - public Criteria andTriggerStateNotLike(String value) { - addCriterion("trigger_state not like", value, "triggerState"); - return (Criteria) this; - } - - public Criteria andTriggerStateIn(List values) { - addCriterion("trigger_state in", values, "triggerState"); - return (Criteria) this; - } - - public Criteria andTriggerStateNotIn(List values) { - addCriterion("trigger_state not in", values, "triggerState"); - return (Criteria) this; - } - - public Criteria andTriggerStateBetween(String value1, String value2) { - addCriterion("trigger_state between", value1, value2, "triggerState"); - return (Criteria) this; - } - - public Criteria andTriggerStateNotBetween(String value1, String value2) { - addCriterion("trigger_state not between", value1, value2, "triggerState"); - return (Criteria) this; - } - - public Criteria andTriggerTypeIsNull() { - addCriterion("trigger_type is null"); - return (Criteria) this; - } - - public Criteria andTriggerTypeIsNotNull() { - addCriterion("trigger_type is not null"); - return (Criteria) this; - } - - public Criteria andTriggerTypeEqualTo(String value) { - addCriterion("trigger_type =", value, "triggerType"); - return (Criteria) this; - } - - public Criteria andTriggerTypeNotEqualTo(String value) { - addCriterion("trigger_type <>", value, "triggerType"); - return (Criteria) this; - } - - public Criteria andTriggerTypeGreaterThan(String value) { - addCriterion("trigger_type >", value, "triggerType"); - return (Criteria) this; - } - - public Criteria andTriggerTypeGreaterThanOrEqualTo(String value) { - addCriterion("trigger_type >=", value, "triggerType"); - return (Criteria) this; - } - - public Criteria andTriggerTypeLessThan(String value) { - addCriterion("trigger_type <", value, "triggerType"); - return (Criteria) this; - } - - public Criteria andTriggerTypeLessThanOrEqualTo(String value) { - addCriterion("trigger_type <=", value, "triggerType"); - return (Criteria) this; - } - - public Criteria andTriggerTypeLike(String value) { - addCriterion("trigger_type like", value, "triggerType"); - return (Criteria) this; - } - - public Criteria andTriggerTypeNotLike(String value) { - addCriterion("trigger_type not like", value, "triggerType"); - return (Criteria) this; - } - - public Criteria andTriggerTypeIn(List values) { - addCriterion("trigger_type in", values, "triggerType"); - return (Criteria) this; - } - - public Criteria andTriggerTypeNotIn(List values) { - addCriterion("trigger_type not in", values, "triggerType"); - return (Criteria) this; - } - - public Criteria andTriggerTypeBetween(String value1, String value2) { - addCriterion("trigger_type between", value1, value2, "triggerType"); - return (Criteria) this; - } - - public Criteria andTriggerTypeNotBetween(String value1, String value2) { - addCriterion("trigger_type not between", value1, value2, "triggerType"); - return (Criteria) this; - } - - public Criteria andStartTimeIsNull() { - addCriterion("start_time is null"); - return (Criteria) this; - } - - public Criteria andStartTimeIsNotNull() { - addCriterion("start_time is not null"); - return (Criteria) this; - } - - public Criteria andStartTimeEqualTo(Date value) { - addCriterion("start_time =", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotEqualTo(Date value) { - addCriterion("start_time <>", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeGreaterThan(Date value) { - addCriterion("start_time >", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeGreaterThanOrEqualTo(Date value) { - addCriterion("start_time >=", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeLessThan(Date value) { - addCriterion("start_time <", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeLessThanOrEqualTo(Date value) { - addCriterion("start_time <=", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeIn(List values) { - addCriterion("start_time in", values, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotIn(List values) { - addCriterion("start_time not in", values, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeBetween(Date value1, Date value2) { - addCriterion("start_time between", value1, value2, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotBetween(Date value1, Date value2) { - addCriterion("start_time not between", value1, value2, "startTime"); - return (Criteria) this; - } - - public Criteria andEndTimeIsNull() { - addCriterion("end_time is null"); - return (Criteria) this; - } - - public Criteria andEndTimeIsNotNull() { - addCriterion("end_time is not null"); - return (Criteria) this; - } - - public Criteria andEndTimeEqualTo(Date value) { - addCriterion("end_time =", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotEqualTo(Date value) { - addCriterion("end_time <>", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeGreaterThan(Date value) { - addCriterion("end_time >", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeGreaterThanOrEqualTo(Date value) { - addCriterion("end_time >=", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeLessThan(Date value) { - addCriterion("end_time <", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeLessThanOrEqualTo(Date value) { - addCriterion("end_time <=", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeIn(List values) { - addCriterion("end_time in", values, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotIn(List values) { - addCriterion("end_time not in", values, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeBetween(Date value1, Date value2) { - addCriterion("end_time between", value1, value2, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotBetween(Date value1, Date value2) { - addCriterion("end_time not between", value1, value2, "endTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-scheduler/accompany-scheduler-service/pom.xml b/accompany-scheduler/accompany-scheduler-service/pom.xml index 26a6577e0..c3334da98 100644 --- a/accompany-scheduler/accompany-scheduler-service/pom.xml +++ b/accompany-scheduler/accompany-scheduler-service/pom.xml @@ -13,11 +13,6 @@ jar - - com.accompany - accompany-scheduler-sdk - ${revision} - com.accompany accompany-business-service diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/exception/JobException.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/exception/JobException.java deleted file mode 100644 index 8ac5a3d09..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/exception/JobException.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.accompany.scheduler.exception; - -public class JobException extends RuntimeException { - public JobException() { - super(); - } - - public JobException(String message) { - super(message); - } - - public JobException(String message, Throwable cause) { - super(message, cause); - } - - public JobException(Throwable cause) { - super(cause); - } - - protected JobException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - } -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/job/CheckRoomExceptionJob.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/job/CheckRoomExceptionJob.java deleted file mode 100644 index 3672c2910..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/job/CheckRoomExceptionJob.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.accompany.scheduler.job; - -import com.accompany.core.model.Room; -import com.accompany.common.netease.ErBanNetEaseService; -import com.accompany.core.service.common.JedisService; -import com.accompany.business.service.room.RoomHotService; -import com.accompany.business.service.room.RoomService; -import com.accompany.business.vo.RoomVo; -import com.google.gson.Gson; -import com.accompany.common.constant.Constant; -import com.accompany.common.netease.neteaseacc.result.RoomUserListRet; -import com.accompany.common.redis.RedisKey; -import org.apache.commons.lang3.StringUtils; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.CollectionUtils; - -import java.util.*; -import java.util.Map.Entry; - -/** - * 定时检查房间是否异常关闭任务 - * - * @author yanghaoyu - */ -public class CheckRoomExceptionJob implements Job { - private static final Logger logger = LoggerFactory.getLogger(CheckRoomExceptionJob.class); - @Autowired - private RoomService roomService; - - @Autowired - private ErBanNetEaseService erBanNetEaseService; - - @Autowired - private JedisService jedisService; - - @Autowired - private RoomHotService roomHotService; - - private Gson gson = new Gson(); - - @Override - public void execute(JobExecutionContext arg0) throws JobExecutionException { - try { - logger.info("正在执行定时任务：查询异常退出房间数据"); - /* 从缓存中查询正在开播的房间id */ - List keepAliveRoomUids = roomHotService.getVipRoomListByCheckRoom(); - Map map = jedisService.hgetAll(RedisKey.room_running.getKey()); - List roomList = new ArrayList<>(); - if (map != null && map.size() > 0) { - Iterator> it = map.entrySet().iterator(); - while (it.hasNext()) { - Map.Entry entry = it.next(); - String key = entry.getKey(); - if (StringUtils.isNotEmpty(key)) { - String roomVoStr = jedisService.hget(RedisKey.room.getKey(), key.toString()); - RoomVo roomVo = gson.fromJson(roomVoStr, RoomVo.class); - roomList.add(roomVo); - } - } - } else { - roomList = roomService.getHomeRunningRoomList(); - } - for (RoomVo roomVo : roomList) { - /* 是否是开播状态 */ - if (roomVo!=null && roomVo.getValid()!= null && roomVo.getValid()) { - /* 是否是断开连接状态 */ - /* 查询房间信息 */ - if (!CollectionUtils.isEmpty(keepAliveRoomUids)) { - boolean flag = keepAliveRoomUids.contains(roomVo.getUid()); - if (flag) { - logger.info("当前房间是vip房间，不进行异常关闭检查.uid=" + roomVo.getUid()); - continue; - } - } - - if (roomVo.getIsExceptionClose()) { - /* 断开连接时间是否超过5分钟 */ - if ((System.currentTimeMillis() - roomVo.getExceptionCloseTime().getTime()) > 60000*10) { - logger.info("当前房间已经断开连接超过10分钟，判断是否重连:uid=" + roomVo.getUid()); - /* 判断是否重连 */ - /* 查询房间所有成员信息 */ - Room room = new Room(); - room.setUid(roomVo.getUid()); - //查询云信中当前房间的状态 - RoomUserListRet roomUserListRet = erBanNetEaseService - .getRoomMemberListInfo(roomVo.getRoomId(), roomVo.getUid()); - //房间没没有在线人员 关闭房间 - if (roomUserListRet == null) { - roomService.closeRoom(roomVo.getUid()); - continue; - } - //或者房间类型为陪伴房的时候 关闭房间 - if (roomUserListRet != null) { - if (null != roomVo.getType()) { - if (roomVo.getType().equals(Constant.RoomType.companion)) { - roomService.closeRoom(roomVo.getUid()); - continue; - } - } - } - for (Entry>> entry : roomUserListRet.getDesc() - .entrySet()) { - for (Entry entry2 : entry.getValue().get(0).entrySet()) { - if ("onlineStat".equals(entry2.getKey())) { - boolean onlineStat = (boolean) entry2.getValue(); - /* 是否在线，在线为true */ - if (onlineStat) { - logger.info("当前房间已经重连,uid:" + roomVo.getUid()); - /* 重新连接上 ，将异常信息改为false */ - room.setIsExceptionClose(false); - } else { - logger.info("当前房间未重连,正在关闭房间。uid:" + roomVo.getUid()); - /* 未重新链接，关闭房间 */ - roomService.closeRoom(roomVo.getUid()); - room.setValid(false); - room.setIsExceptionClose(false); - } - roomService.updateRunningRoom(room); - break; - } - } - } - } - } - } - } - } catch (Exception e) { - logger.error("定时任务：查询异常房间失败。", e); - } - } -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/job/HttpGetJobDetail.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/job/HttpGetJobDetail.java deleted file mode 100644 index f7e5cee3e..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/job/HttpGetJobDetail.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.accompany.scheduler.job; - -import com.accompany.scheduler.model.QuartzJob; -import com.accompany.scheduler.util.HttpUtils; -import lombok.extern.slf4j.Slf4j; -import org.quartz.Job; -import org.quartz.JobDataMap; -import org.quartz.JobExecutionContext; - -import java.io.IOException; - -/** - * Created by PaperCut on 2018/6/11. - * Http请求任务实体 - */ -@Slf4j -public class HttpGetJobDetail implements Job { - @Override - public void execute(JobExecutionContext jobExecutionContext) { - JobDataMap dataMap = jobExecutionContext.getMergedJobDataMap(); - QuartzJob job = (QuartzJob) dataMap.get("jobBean"); - String url = job.getJobData(); - log.info("Invoking http GET: {}", url); - try { - String resp = HttpUtils.get(null, url); - if (resp == null) { - log.error("Failed to request http get: {}, result is null", url); - } else { - log.info("Successful http get: {}", url); - } - } catch (IOException e) { - log.error("Failed to invoke http GET: {}, msg: {}", url, e.getMessage()); - } - } -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/job/JobFactory.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/job/JobFactory.java deleted file mode 100644 index b9e97ba50..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/job/JobFactory.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.accompany.scheduler.job; - -import org.quartz.spi.TriggerFiredBundle; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.config.AutowireCapableBeanFactory; -import org.springframework.scheduling.quartz.AdaptableJobFactory; -import org.springframework.stereotype.Service; - -/** - * - * @author yanghaoyu 将quartz中的job注入到spring容器中，交给他管理。 - */ -@Service("jobFactory") -public class JobFactory extends AdaptableJobFactory { - - @Autowired - private AutowireCapableBeanFactory capableBeanFactory; - - @Override - protected Object createJobInstance(TriggerFiredBundle bundle) throws Exception { - Object jobInstance = super.createJobInstance(bundle); - /* 进行注入 */ - capableBeanFactory.autowireBean(jobInstance); - return jobInstance; - } -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/job/RefreshRobotJob.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/job/RefreshRobotJob.java deleted file mode 100644 index e42d786b1..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/job/RefreshRobotJob.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.accompany.scheduler.job; - - -import com.accompany.business.service.RobotService; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; - - -public class RefreshRobotJob implements Job { - - private static final Logger LOGGER = LoggerFactory.getLogger(RefreshRobotJob.class); - - @Autowired - private RobotService robotService; - - @Override - public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { - - try { - robotService.addRobotToPermitRoom(); - } catch (Exception e) { - LOGGER.error("RefreshRobotJob error...",e); - } - } -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/job/SqlJobDetail.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/job/SqlJobDetail.java deleted file mode 100644 index db255b0c5..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/job/SqlJobDetail.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.accompany.scheduler.job; - -import com.accompany.core.base.SpringContextHolder; -import com.accompany.scheduler.model.QuartzJob; -import lombok.extern.slf4j.Slf4j; -import org.quartz.Job; -import org.quartz.JobDataMap; -import org.quartz.JobExecutionContext; -import org.springframework.jdbc.core.JdbcTemplate; - -/** Created by PaperCut on 2018/6/11. Sql任务实体 */ -@Slf4j -public class SqlJobDetail implements Job { - - @Override - public void execute(JobExecutionContext jobExecutionContext) { - long start = System.currentTimeMillis(); - JobDataMap dataMap = jobExecutionContext.getMergedJobDataMap(); - QuartzJob job = (QuartzJob) dataMap.get("jobBean"); - log.info("获取 jdbcTemplate"); - JdbcTemplate template = SpringContextHolder.getBean("jdbcTemplate"); - template.execute(job.getJobData()); - log.info(job.getJobName() + " executed in {} ms", System.currentTimeMillis() - start); - } -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/mapper/QuartzJobMapper.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/mapper/QuartzJobMapper.java deleted file mode 100644 index aa3054c33..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/mapper/QuartzJobMapper.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.accompany.scheduler.mapper; - -import com.accompany.scheduler.model.QuartzJob; -import com.accompany.scheduler.model.QuartzJobExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface QuartzJobMapper { - int countByExample(QuartzJobExample example); - - int deleteByExample(QuartzJobExample example); - - int deleteByPrimaryKey(Long id); - - int insert(QuartzJob record); - - int insertSelective(QuartzJob record); - - List selectByExample(QuartzJobExample example); - - QuartzJob selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") QuartzJob record, @Param("example") QuartzJobExample example); - - int updateByExample(@Param("record") QuartzJob record, @Param("example") QuartzJobExample example); - - int updateByPrimaryKeySelective(QuartzJob record); - - int updateByPrimaryKey(QuartzJob record); - - QuartzJob getPeriodic(String name); - - QuartzJob getOneTime(String name); - - String getJobNameById(Long id); - - int deleteByName(String name); - - QuartzJob getByName(String name); - - int countPeriodic(); - - int countOneTime(); - - List selectPeriodicByPage(@Param("start") int start, @Param("count") int count); - - List selectOneTimeByPage(@Param("start") int start, @Param("count") int count); -} \ No newline at end of file diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/repository/JdbcQuartzJobRepository.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/repository/JdbcQuartzJobRepository.java deleted file mode 100644 index 06c0462d7..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/repository/JdbcQuartzJobRepository.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.accompany.scheduler.repository; - -import com.accompany.scheduler.mapper.QuartzJobMapper; -import com.accompany.scheduler.model.QuartzJob; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * Created by PaperCut on 2018/6/11. - */ -@Component -public class JdbcQuartzJobRepository implements QuartzJobRepository { - @Autowired - QuartzJobMapper quartzJobMapper; - - @Override - public void add(QuartzJob job) { - quartzJobMapper.insert(job); - } - - @Override - public void update(QuartzJob job) { - quartzJobMapper.updateByPrimaryKey(job); - } - - @Override - public void delete(QuartzJob job) { - quartzJobMapper.deleteByPrimaryKey(job.getId()); - } - - @Override - public QuartzJob get(Long id) { - return quartzJobMapper.selectByPrimaryKey(id); - } - - @Override - public QuartzJob getByName(String name) { - return quartzJobMapper.getByName(name); - } - - @Override - public QuartzJob getPeriod(String name) { - return quartzJobMapper.getPeriodic(name); - } - - @Override - public QuartzJob getOneTime(String name) { - return quartzJobMapper.getOneTime(name); - } - - @Override - public List findPeriodByPage(Integer page, Integer pageSize) { - return quartzJobMapper.selectPeriodicByPage((page - 1) * pageSize, pageSize); - } - - @Override - public Integer countPeriod() { - return quartzJobMapper.countPeriodic(); - } - - @Override - public List findOneTimeByPage(Integer page, Integer pageSize) { - return quartzJobMapper.selectOneTimeByPage((page - 1) * pageSize, pageSize); - } - - @Override - public Integer countOneTime() { - return quartzJobMapper.countOneTime(); - } - -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/repository/QuartzJobRepository.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/repository/QuartzJobRepository.java deleted file mode 100644 index 363fd5b5a..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/repository/QuartzJobRepository.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.accompany.scheduler.repository; - -import com.accompany.scheduler.model.QuartzJob; - -import java.util.List; - -public interface QuartzJobRepository { - void add(QuartzJob job); - - void update(QuartzJob job); - - void delete(QuartzJob job); - - QuartzJob get(Long id); - - QuartzJob getByName(String name); - - QuartzJob getPeriod(String name); - - QuartzJob getOneTime(String name); - - List findPeriodByPage(Integer page, Integer pageSize); - - Integer countPeriod(); - - List findOneTimeByPage(Integer page, Integer pageSize); - - Integer countOneTime(); -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/AbstractQuartzJobService.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/AbstractQuartzJobService.java deleted file mode 100644 index feca7041e..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/AbstractQuartzJobService.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.accompany.scheduler.service; - -import com.accompany.scheduler.constant.QuartzJobType; -import com.accompany.scheduler.exception.JobException; -import com.accompany.scheduler.model.QuartzJob; -import com.accompany.scheduler.repository.QuartzJobRepository; -import lombok.extern.slf4j.Slf4j; -import org.quartz.*; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.Date; - -/** - * @author PaperCut - * Created by PaperCut on 2018/12/14. - * 抽象任务处理类 - */ -@Slf4j -public abstract class AbstractQuartzJobService implements QuartzJobService { - protected QuartzJobRepository quartzJobRepository; - protected Scheduler quartzScheduler; - - @Autowired - public AbstractQuartzJobService(QuartzJobRepository quartzJobRepository, Scheduler quartzScheduler) { - this.quartzJobRepository = quartzJobRepository; - this.quartzScheduler = quartzScheduler; - - // 执行初始化 - init(); - } - - public void init() { - try { - quartzScheduler.getListenerManager().addTriggerListener(new SimpleTriggerListener()); - } catch (SchedulerException e) { - log.error("Failed to initialize QuartJobService.", e); - } - } - - @Override - public QuartzJob add(QuartzJob job) throws Exception { - boolean isExists = exists(job.getJobName()); - if (isExists) { - throw new JobException("该任务名已存在"); - } - job.setCreateTime(new Date()); - quartzJobRepository.add(job); - schedule(job); - - return job; - } - - @Override - public QuartzJob update(QuartzJob job) throws Exception { - Trigger.TriggerState state = quartzScheduler.getTriggerState(getTriggerKey(job.getJobName())); - quartzScheduler.deleteJob(getJobKey(job.getJobName())); - - schedule(job); - if (state == Trigger.TriggerState.PAUSED) { - quartzScheduler.pauseJob(getJobKey(job.getJobName())); - } - job.setUpdateTime(new Date()); - quartzJobRepository.update(job); - - return job; - } - - @Override - public void delete(Long id) throws Exception { - QuartzJob job = quartzJobRepository.get(id); - if (job == null) { - throw new JobException("未找到该任务"); - } - quartzJobRepository.delete(job); - quartzScheduler.deleteJob(getJobKey(job.getJobName())); - } - - @Override - public void deleteByName(String name) throws Exception { - QuartzJob job = quartzJobRepository.getByName(name); - if (job == null) { - throw new JobException("未找到该任务"); - } - quartzJobRepository.delete(job); - quartzScheduler.deleteJob(getJobKey(job.getJobName())); - } - - @Override - public boolean exists(String name) throws Exception { - return quartzScheduler.checkExists(getJobKey(name)); - } - - @Override - public void resume(String name) throws JobException, SchedulerException { - JobDetail jobDetail = quartzScheduler.getJobDetail(getJobKey(name)); - TriggerKey triggerKey = getTriggerKey(name); - Trigger trigger = quartzScheduler.getTrigger(triggerKey); - if (trigger != null) { - QuartzJob jobEntity = quartzJobRepository.getPeriod(name); - CronTrigger newTrigger = TriggerBuilder.newTrigger() - .withIdentity(getTriggerKey(name)) - .forJob(jobDetail) - .withSchedule(CronScheduleBuilder.cronSchedule(jobEntity.getExpression())) - .build(); - quartzScheduler.rescheduleJob(triggerKey, newTrigger); - } - } - - @Override - public void pause(String name) throws Exception { - quartzScheduler.pauseJob(getJobKey(name)); - } - - protected JobFactory getFactory(QuartzJob job) { - Integer jobType = job.getJobType(); - if (jobType == QuartzJobType.SqlJob.value) { - return new SqlJobFactory(); - } else if (jobType == QuartzJobType.JavaJobClass.value) { - return new JavaJobFactory(); - } else if (jobType == QuartzJobType.HttpGetJob.value) { - return new HttpGetJobFactory(); - } else { - throw new IllegalArgumentException("Not found this job type for job factory."); - } - } - - abstract void schedule(QuartzJob job) throws Exception; - - abstract String getGroup(); - - abstract JobKey getJobKey(String name); - - abstract TriggerKey getTriggerKey(String name); -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/HttpGetJobFactory.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/HttpGetJobFactory.java deleted file mode 100644 index e56252db6..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/HttpGetJobFactory.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.accompany.scheduler.service; - -import com.accompany.scheduler.job.HttpGetJobDetail; -import com.accompany.scheduler.model.QuartzJob; -import org.quartz.JobBuilder; -import org.quartz.JobDataMap; -import org.quartz.JobDetail; - -/** - * Created by PaperCut on 2018/6/11. - * http请求类型任务 - */ -public class HttpGetJobFactory implements JobFactory { - @Override - public JobDetail create(QuartzJob job) throws ClassNotFoundException { - JobDataMap jobDataMap = new JobDataMap(); - jobDataMap.put("jobBean", job); - JobDetail jobDetail = JobBuilder.newJob(HttpGetJobDetail.class) - .withIdentity(job.getJobName()) - .withDescription(job.getDescription()) - .usingJobData(jobDataMap) - .build(); - return jobDetail; - } - - @Override - public JobDetail create(String group, QuartzJob job) { - JobDataMap jobDataMap = new JobDataMap(); - jobDataMap.put("jobBean", job); - JobDetail jobDetail = JobBuilder.newJob(HttpGetJobDetail.class) - .withIdentity(job.getJobName(), group) - .withDescription(job.getDescription()) - .usingJobData(jobDataMap) - .build(); - return jobDetail; - } -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/JavaJobFactory.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/JavaJobFactory.java deleted file mode 100644 index a23eef67f..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/JavaJobFactory.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.accompany.scheduler.service; - -import com.accompany.scheduler.model.QuartzJob; -import org.quartz.JobBuilder; -import org.quartz.JobDataMap; -import org.quartz.JobDetail; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * Created by PaperCut on 2018/6/11. - * Java类型任务 - */ -public class JavaJobFactory implements JobFactory { - private final Map clazzCache = new ConcurrentHashMap<>(); - - private Class findClass(String className) throws ClassNotFoundException { - Class instance = null; - if ((instance = clazzCache.get(className)) == null) { - Class clazz = Class.forName(className); - clazzCache.put(className, clazz); - instance = clazzCache.get(className); - } - return instance; - } - - @Override - public JobDetail create(QuartzJob job) throws ClassNotFoundException { - JobDataMap jobDataMap = new JobDataMap(); - jobDataMap.put("jobBean", job); - JobDetail jobDetail = JobBuilder.newJob(findClass(job.getJobClassName())) - .withIdentity(job.getJobName()) - .withDescription(job.getDescription()) - .usingJobData(jobDataMap) - .build(); - return jobDetail; - } - - @Override - public JobDetail create(String group, QuartzJob job) throws ClassNotFoundException { - JobDataMap jobDataMap = new JobDataMap(); - jobDataMap.put("jobBean", job); - JobDetail jobDetail = JobBuilder.newJob(findClass(job.getJobClassName())) - .withIdentity(job.getJobName(), group) - .withDescription(job.getDescription()) - .usingJobData(jobDataMap) - .build(); - return jobDetail; - } -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/JobFactory.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/JobFactory.java deleted file mode 100644 index 8eba6edd6..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/JobFactory.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.accompany.scheduler.service; - -import com.accompany.scheduler.model.QuartzJob; -import org.quartz.JobDetail; - -/** - * Created by PaperCut on 2018/12/14. - * Job工厂接口 - */ -public interface JobFactory { - JobDetail create(QuartzJob job) throws ClassNotFoundException; - - JobDetail create(String group, QuartzJob job) throws ClassNotFoundException; -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/PeriodQuartzJobService.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/PeriodQuartzJobService.java deleted file mode 100644 index 51176308e..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/PeriodQuartzJobService.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.accompany.scheduler.service; - -import com.accompany.scheduler.model.QuartzJob; -import com.accompany.scheduler.repository.QuartzJobRepository; -import org.quartz.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @author PaperaCut - * Created by PaperCut on 2018/12/14. - * 持久任务服务类 - */ -@Service -public class PeriodQuartzJobService extends AbstractQuartzJobService { - @Autowired - public PeriodQuartzJobService(QuartzJobRepository quartzJobRepository, Scheduler quartzScheduler) { - super(quartzJobRepository, quartzScheduler); - } - - @Override - String getGroup() { - return "CRON"; - } - - @Override - public JobKey getJobKey(String name) { - return new JobKey(name, getGroup()); - } - - @Override - public TriggerKey getTriggerKey(String name) { - return new TriggerKey(name + "_trigger", getGroup()); - } - - @Override - public void schedule(QuartzJob job) throws Exception { - JobDetail jobDetail = getFactory(job).create(getGroup(), job); - CronTrigger trigger = TriggerBuilder.newTrigger() - .withIdentity(getTriggerKey(job.getJobName())) - .withSchedule(CronScheduleBuilder.cronSchedule(job.getExpression())) - .build(); - quartzScheduler.scheduleJob(jobDetail, trigger); - } - - /** - * 分页获取周期性任务 - * - * @param page - * @param pageSize - * @return - */ - public List findPeriodByPage(Integer page, Integer pageSize) { - return quartzJobRepository.findPeriodByPage(page, pageSize); - } - - /** - * 统计获取周期性任务数量 - * - * @return - */ - public Integer countPeriod() { - return quartzJobRepository.countPeriod(); - } -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/QuartzJobService.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/QuartzJobService.java deleted file mode 100644 index 2d78ab659..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/QuartzJobService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.scheduler.service; - -import com.accompany.scheduler.model.QuartzJob; -import org.quartz.SchedulerException; - -/** - * Created by PaperCut on 2018/12/14. - * 任务管理接口 - */ -public interface QuartzJobService { - QuartzJob add(QuartzJob job) throws Exception; - - QuartzJob update(QuartzJob job) throws Exception; - - void delete(Long id) throws Exception; - - void deleteByName(String name) throws Exception; - - boolean exists(String name) throws Exception; - - void resume(String name) throws SchedulerException; - - void pause(String name) throws Exception; -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/QuartzPeriodJobService.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/QuartzPeriodJobService.java deleted file mode 100644 index 4e09b8f0d..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/QuartzPeriodJobService.java +++ /dev/null @@ -1,163 +0,0 @@ -package com.accompany.scheduler.service; - -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.scheduler.constant.QuartzJobType; -import com.accompany.scheduler.job.SqlJobDetail; -import com.accompany.scheduler.mapper.QuartzJobMapper; -import com.accompany.scheduler.model.QuartzJob; -import org.apache.commons.lang3.time.FastDateFormat; -import org.quartz.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.text.ParseException; -import java.util.Date; - -@Service -public class QuartzPeriodJobService { - private static final String GROUP_CRON = "CRON"; - private static final String GROUP_ONE_TIME = "ONE_TIME"; - - @Autowired - Scheduler quartzScheduler; - - @Autowired - QuartzJobMapper quartzJobMapper; - - public void add(QuartzJob job) throws SchedulerException, ClassNotFoundException { - boolean isExists = exists(job.getJobName()); - if (isExists) { - throw new SchedulerException("该任务名已存在"); - } - Date curDate = new Date(); - job.setCreateTime(curDate); - job.setUpdateTime(curDate); - schedulePeriodic(job); - } - - public void addOneTime(QuartzJob job) throws SchedulerException, ParseException, ClassNotFoundException { - boolean isExists = exists(job.getJobName()); - if (isExists) { - throw new SchedulerException("该任务名已存在"); - } - job.setIsOneTime(true); - job.setCreateTime(new Date()); - quartzJobMapper.insert(job); - - scheduleOneTime(job); - } - - private void scheduleOneTime(QuartzJob job) throws ClassNotFoundException, ParseException, SchedulerException { - JobDetail jobDetail = null; - JobDataMap dataMap = new JobDataMap(); - dataMap.put("jobBean", job); - - if (job.getJobType() == QuartzJobType.JavaJobClass.value) { - jobDetail = JobBuilder.newJob((Class) Class.forName(job.getJobClassName())) - .withIdentity(job.getJobName(), GROUP_CRON) - .withDescription(job.getDescription()).usingJobData(dataMap) - .build(); - } else if (job.getJobType() == QuartzJobType.SqlJob.value) { - jobDetail = JobBuilder.newJob(SqlJobDetail.class) - .withIdentity(job.getJobName(), GROUP_ONE_TIME) - .withDescription(job.getDescription()).usingJobData(dataMap) - .build(); - } - Date date = FastDateFormat.getInstance(DateTimeUtil.DEFAULT_DATE_PATTERN).parse(job.getExpression()); - SimpleTrigger trigger = (SimpleTrigger) TriggerBuilder.newTrigger() - .withIdentity(job.getJobName() + "_trigger", GROUP_ONE_TIME) - .startAt(date) // some Date - .forJob(jobDetail) - .build(); - - quartzScheduler.scheduleJob(jobDetail, trigger); - } - - private void schedulePeriodic(QuartzJob job) throws ClassNotFoundException, SchedulerException { - JobDetail jobDetail = null; - JobDataMap dataMap = new JobDataMap(); - dataMap.put("jobBean", job); - if (job.getJobType() == QuartzJobType.JavaJobClass.value) { - jobDetail = JobBuilder.newJob((Class) Class.forName(job.getJobClassName())) - .withIdentity(job.getJobName(), GROUP_CRON) - .withDescription(job.getDescription()).usingJobData(dataMap) - .build(); - } else if (job.getJobType() == QuartzJobType.SqlJob.value) { - jobDetail = JobBuilder.newJob(SqlJobDetail.class) - .withIdentity(job.getJobName(), GROUP_CRON) - .withDescription(job.getDescription()).usingJobData(dataMap) - .build(); - } - CronTrigger trigger = TriggerBuilder.newTrigger() - .withIdentity(job.getJobName() + "_trigger", GROUP_CRON) - .forJob(jobDetail) - .withSchedule(CronScheduleBuilder.cronSchedule(job.getExpression())) - .build(); - - quartzScheduler.scheduleJob(jobDetail, trigger); - } - - public void resume(String name) throws SchedulerException { - TriggerKey triggerKey = new TriggerKey(name + "_trigger", GROUP_CRON); - JobDetail jobDetail = quartzScheduler.getJobDetail(new JobKey(name, GROUP_CRON)); - Trigger oldTrigger = quartzScheduler.getTrigger(triggerKey); - if (oldTrigger != null) { - QuartzJob job = quartzJobMapper.getPeriodic(name); - CronTrigger newTrigger = TriggerBuilder.newTrigger() - .withIdentity(triggerKey) - .forJob(jobDetail) - .withSchedule(CronScheduleBuilder.cronSchedule(job.getExpression())) - .build(); - quartzScheduler.rescheduleJob(triggerKey, newTrigger); - } - } - - public void update(QuartzJob job) throws SchedulerException, ClassNotFoundException { - Trigger.TriggerState state = quartzScheduler.getTriggerState(new TriggerKey(job.getJobName() + "_trigger", GROUP_CRON)); - quartzScheduler.deleteJob(new JobKey(job.getJobName(), GROUP_CRON)); - - schedulePeriodic(job); - if (state == Trigger.TriggerState.PAUSED) { - quartzScheduler.pauseJob(new JobKey(job.getJobName(), GROUP_CRON)); - } - job.setUpdateTime(new Date()); - - quartzJobMapper.updateByPrimaryKey(job); - } - - public void pause(String name) throws SchedulerException { - quartzScheduler.pauseJob(new JobKey(name, GROUP_CRON)); - } - - public void runOnce(String name, boolean periodic) throws SchedulerException { - quartzScheduler.triggerJob(new JobKey(name, periodic ? GROUP_CRON : GROUP_ONE_TIME)); - } - - public boolean exists(String name) throws SchedulerException { - return quartzScheduler.checkExists(new JobKey(name, GROUP_CRON)); - } - - public void delete(Long id) throws SchedulerException { - String jobName = quartzJobMapper.getJobNameById(id); - quartzScheduler.deleteJob(new JobKey(jobName, GROUP_CRON)); - quartzJobMapper.deleteByPrimaryKey(id); - } - - public void deleteByOneTime(Long id) throws SchedulerException { - String jobName = quartzJobMapper.getJobNameById(id); - quartzScheduler.deleteJob(new JobKey(jobName, GROUP_ONE_TIME)); - quartzJobMapper.deleteByPrimaryKey(id); - } - - - public void deleteByName(String name) throws SchedulerException { - quartzScheduler.deleteJob(new JobKey(name, GROUP_CRON)); - quartzJobMapper.deleteByName(name); - } - - public void deleteByNameForOneTime(String name) throws SchedulerException { - quartzScheduler.deleteJob(new JobKey(name, GROUP_ONE_TIME)); - quartzJobMapper.deleteByName(name); - } -} - diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/SimpleQuartzJobService.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/SimpleQuartzJobService.java deleted file mode 100644 index f0acc14e3..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/SimpleQuartzJobService.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.accompany.scheduler.service; - -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.scheduler.model.QuartzJob; -import com.accompany.scheduler.repository.QuartzJobRepository; -import org.apache.commons.lang3.time.FastDateFormat; -import org.quartz.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -/** - * @author PaperCut - * @since 2020-03-20 - * 简单定时任务 - */ -@Service -public class SimpleQuartzJobService extends AbstractQuartzJobService { - - @Autowired - public SimpleQuartzJobService(QuartzJobRepository quartzJobRepository, Scheduler quartzScheduler) { - super(quartzJobRepository, quartzScheduler); - } - - @Override - String getGroup() { - return "ONE_TIME"; - } - - @Override - JobKey getJobKey(String name) { - return new JobKey(name, getGroup()); - } - - @Override - TriggerKey getTriggerKey(String name) { - return new TriggerKey(name + "_trigger", getGroup()); - } - - @Override - public void schedule(QuartzJob job) throws Exception { - Date date = FastDateFormat.getInstance(DateTimeUtil.DEFAULT_DATE_PATTERN).parse(job.getExpression()); - JobDetail jobDetail = getFactory(job).create(getGroup(), job); - SimpleTrigger trigger = (SimpleTrigger) TriggerBuilder.newTrigger() - .withIdentity(getTriggerKey(job.getJobName())) - .startAt(date) - .forJob(jobDetail) - .build(); - quartzScheduler.scheduleJob(jobDetail, trigger); - } - - /** - * 分页获取一次性任务 - * - * @param page - * @param pageSize - * @return - */ - public List findOneTimeByPage(Integer page, Integer pageSize) { - return quartzJobRepository.findOneTimeByPage(page, pageSize); - } - - /** - * 统计一次性任务数量 - * - * @return - */ - public Integer countOneTime() { - return quartzJobRepository.countOneTime(); - } -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/SimpleTriggerListener.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/SimpleTriggerListener.java deleted file mode 100644 index 3bc0a72ab..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/SimpleTriggerListener.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.scheduler.service; - -import lombok.extern.slf4j.Slf4j; -import org.quartz.JobExecutionContext; -import org.quartz.Trigger; -import org.quartz.listeners.TriggerListenerSupport; - -/** - * Created by PaperCut on 2018/6/12. - * 一次性任务触发器 - */ -@Slf4j -public class SimpleTriggerListener extends TriggerListenerSupport { - @Override - public String getName() { - return "SimpleTriggerListener"; - } - - @Override - public void triggerComplete(Trigger trigger, JobExecutionContext context, Trigger.CompletedExecutionInstruction triggerInstructionCode) { - log.info("Completed trigger..."); - super.triggerComplete(trigger, context, triggerInstructionCode); - } -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/SqlJobFactory.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/SqlJobFactory.java deleted file mode 100644 index a5679b248..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/service/SqlJobFactory.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.accompany.scheduler.service; - -import com.accompany.scheduler.job.SqlJobDetail; -import com.accompany.scheduler.model.QuartzJob; -import org.quartz.JobBuilder; -import org.quartz.JobDataMap; -import org.quartz.JobDetail; - -/** - * Created by PaperCut on 2018/12/14. - * Sql类型任务 - */ -public class SqlJobFactory implements JobFactory { - @Override - public JobDetail create(QuartzJob job) { - JobDataMap dataMap = new JobDataMap(); - dataMap.put("jobBean", job); - JobDetail jobDetail = JobBuilder.newJob(SqlJobDetail.class) - .withIdentity(job.getJobName()) - .withDescription(job.getDescription()) - .usingJobData(dataMap) - .build(); - return jobDetail; - } - - @Override - public JobDetail create(String group, QuartzJob job) { - JobDataMap dataMap = new JobDataMap(); - dataMap.put("jobBean", job); - JobDetail jobDetail = JobBuilder.newJob(SqlJobDetail.class) - .withIdentity(job.getJobName(), group) - .withDescription(job.getDescription()) - .usingJobData(dataMap) - .build(); - return jobDetail; - } -} diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/resources/mapper/QuartzJobMapper.xml b/accompany-scheduler/accompany-scheduler-service/src/main/resources/mapper/QuartzJobMapper.xml deleted file mode 100644 index c86128f84..000000000 --- a/accompany-scheduler/accompany-scheduler-service/src/main/resources/mapper/QuartzJobMapper.xml +++ /dev/null @@ -1,291 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - qj.job_name as jobName - - - - delete from quartz_job - where id = #{id,jdbcType=BIGINT} - - - - SELECT LAST_INSERT_ID() - - insert into quartz_job (expression, description, job_name, - job_class_name, job_type, job_data, - is_one_time, next_fire_time, prev_fire_time, - trigger_state, trigger_type, start_time, - end_time, create_time, update_time - ) - values (#{expression,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{jobName,jdbcType=VARCHAR}, - #{jobClassName,jdbcType=VARCHAR}, #{jobType,jdbcType=INTEGER}, #{jobData,jdbcType=VARCHAR}, - #{isOneTime,jdbcType=BIT}, #{nextFireTime,jdbcType=TIMESTAMP}, #{prevFireTime,jdbcType=TIMESTAMP}, - #{triggerState,jdbcType=VARCHAR}, #{triggerType,jdbcType=VARCHAR}, #{startTime,jdbcType=TIMESTAMP}, - #{endTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} - ) - - - - SELECT LAST_INSERT_ID() - - insert into quartz_job - - - expression, - - - description, - - - job_name, - - - job_class_name, - - - job_type, - - - job_data, - - - is_one_time, - - - next_fire_time, - - - prev_fire_time, - - - trigger_state, - - - trigger_type, - - - start_time, - - - end_time, - - - create_time, - - - update_time, - - - - - #{expression,jdbcType=VARCHAR}, - - - #{description,jdbcType=VARCHAR}, - - - #{jobName,jdbcType=VARCHAR}, - - - #{jobClassName,jdbcType=VARCHAR}, - - - #{jobType,jdbcType=INTEGER}, - - - #{jobData,jdbcType=VARCHAR}, - - - #{isOneTime,jdbcType=BIT}, - - - #{nextFireTime,jdbcType=TIMESTAMP}, - - - #{prevFireTime,jdbcType=TIMESTAMP}, - - - #{triggerState,jdbcType=VARCHAR}, - - - #{triggerType,jdbcType=VARCHAR}, - - - #{startTime,jdbcType=TIMESTAMP}, - - - #{endTime,jdbcType=TIMESTAMP}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - update quartz_job - - - expression = #{expression,jdbcType=VARCHAR}, - - - description = #{description,jdbcType=VARCHAR}, - - - job_name = #{jobName,jdbcType=VARCHAR}, - - - job_class_name = #{jobClassName,jdbcType=VARCHAR}, - - - job_type = #{jobType,jdbcType=INTEGER}, - - - job_data = #{jobData,jdbcType=VARCHAR}, - - - is_one_time = #{isOneTime,jdbcType=BIT}, - - - next_fire_time = #{nextFireTime,jdbcType=TIMESTAMP}, - - - prev_fire_time = #{prevFireTime,jdbcType=TIMESTAMP}, - - - trigger_state = #{triggerState,jdbcType=VARCHAR}, - - - trigger_type = #{triggerType,jdbcType=VARCHAR}, - - - start_time = #{startTime,jdbcType=TIMESTAMP}, - - - end_time = #{endTime,jdbcType=TIMESTAMP}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=BIGINT} - - - update quartz_job - set expression = #{expression,jdbcType=VARCHAR}, - description = #{description,jdbcType=VARCHAR}, - job_name = #{jobName,jdbcType=VARCHAR}, - job_class_name = #{jobClassName,jdbcType=VARCHAR}, - job_type = #{jobType,jdbcType=INTEGER}, - job_data = #{jobData,jdbcType=VARCHAR}, - is_one_time = #{isOneTime,jdbcType=BIT}, - next_fire_time = #{nextFireTime,jdbcType=TIMESTAMP}, - prev_fire_time = #{prevFireTime,jdbcType=TIMESTAMP}, - trigger_state = #{triggerState,jdbcType=VARCHAR}, - trigger_type = #{triggerType,jdbcType=VARCHAR}, - start_time = #{startTime,jdbcType=TIMESTAMP}, - end_time = #{endTime,jdbcType=TIMESTAMP}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=BIGINT} - - - - - - - delete from quartz_job where job_name = #{_parameter} - - - - - - - - - \ No newline at end of file diff --git a/accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/controller/PublicApiController.java b/accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/controller/PublicApiController.java deleted file mode 100644 index ba6266ae1..000000000 --- a/accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/controller/PublicApiController.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.accompany.scheduler.controller; - -import com.accompany.common.result.BusiResult; -import com.accompany.scheduler.constant.QuartzJobType; -import com.accompany.scheduler.job.HttpGetJobDetail; -import com.accompany.scheduler.job.SqlJobDetail; -import com.accompany.scheduler.model.QuartzJob; -import com.accompany.scheduler.service.PeriodQuartzJobService; -import com.accompany.scheduler.service.SimpleQuartzJobService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author yangming - * @since 2020-03-30 - * 定时任务 - */ -@RestController -@RequestMapping("scheduler/api") -@Slf4j -public class PublicApiController { - @Autowired - private PeriodQuartzJobService periodQuartzJobService; - @Autowired - private SimpleQuartzJobService simpleQuartzJobService; - - /** - * 删除一次性任务 - * - * @param taskId - */ - @RequestMapping(value = "/cancelSimple") - public BusiResult cancelSimple(@RequestParam("taskId") Long taskId) throws Exception{ - simpleQuartzJobService.delete(taskId); - return new BusiResult(true); - } - - /** - * 删除周期性任务 - * - * @param taskId - */ - @RequestMapping(value = "/cancelPeriod") - public BusiResult cancelPeriod(@RequestParam("taskId") Long taskId) throws Exception{ - periodQuartzJobService.delete(taskId); - return new BusiResult(true); - } - - /** - * 添加周期性任务 - */ - @RequestMapping(value = "periodic") - public BusiResult periodic(@RequestParam("jobType") String jobType, - @RequestParam("jobParams") String jobParams, - @RequestParam("triggerValue") String triggerValue, - String className) throws Exception{ - - QuartzJob job = buildJob(false, jobType, jobParams, triggerValue, className); - job = periodQuartzJobService.add(job); - return new BusiResult(job.getId()); - } - - /** - * 添加一次性任务 - */ - @RequestMapping(value = "simple") - public BusiResult simple(@RequestParam("jobType") String jobType, - @RequestParam("jobParams") String jobParams, - @RequestParam("triggerValue") String triggerValue, - String className) throws Exception{ - - QuartzJob job = buildJob(true, jobType, jobParams, triggerValue, className); - job = simpleQuartzJobService.add(job); - return new BusiResult(job.getId()); - - } - - /** - * 根据参数构造任务对象 - * - * @param isOneTime - * @param jobType - * @param jobParams - * @param scheduleExpression - * @param className - * @return - */ - public QuartzJob buildJob(boolean isOneTime, String jobType, String jobParams, String scheduleExpression, String className) { - QuartzJob job = new QuartzJob(); - if (jobType.equalsIgnoreCase("SqlJob")) { - job.setJobName("SqlJob_" + System.currentTimeMillis()); - job.setJobClassName(SqlJobDetail.class.getName()); - job.setIsOneTime(isOneTime); - job.setJobType(QuartzJobType.SqlJob.value); - job.setJobData(jobParams); - job.setExpression(scheduleExpression); - job.setDescription("SqlJob"); - } else if (jobType.equalsIgnoreCase("JavaJob")) { - job.setJobName("JavaJob_" + System.currentTimeMillis()); - job.setJobClassName(className); - job.setIsOneTime(isOneTime); - job.setJobType(QuartzJobType.JavaJobClass.value); - job.setExpression(scheduleExpression); - job.setJobData(jobParams); - job.setDescription("JavaJobClass"); - } else if (jobType.equalsIgnoreCase("HttpGetJob")) { - job.setJobName("HttpGetJob_" + System.currentTimeMillis()); - job.setJobClassName(HttpGetJobDetail.class.getName()); - job.setIsOneTime(isOneTime); - job.setJobType(QuartzJobType.HttpGetJob.value); - job.setJobData(jobParams); - job.setExpression(scheduleExpression); - job.setDescription("HttpGetJob"); - } else { - throw new IllegalArgumentException("Unrecognized job type."); - } - return job; - } -} diff --git a/accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/controller/QuartzSchedulerController.java b/accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/controller/QuartzSchedulerController.java deleted file mode 100644 index a3f64ffc5..000000000 --- a/accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/controller/QuartzSchedulerController.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.accompany.scheduler.controller; - -import com.accompany.common.result.BusiResult; -import com.accompany.scheduler.model.QuartzJob; -import com.accompany.scheduler.service.PeriodQuartzJobService; -import com.accompany.scheduler.service.SimpleQuartzJobService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @author yangming - * @date 2020-03-30 - */ -@RestController -@RequestMapping("scheduler/quartz") -@Slf4j -public class QuartzSchedulerController { - @Autowired - PeriodQuartzJobService periodQuartzJobService; - @Autowired - SimpleQuartzJobService simpleQuartzJobService; - - @RequestMapping(value = "periodList", method = RequestMethod.GET) - public BusiResult periodList(@RequestParam("page") Integer page, - @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) { - if (page == null || page <= 0) { - page = 1; - } - List jobList = periodQuartzJobService.findPeriodByPage(page, pageSize); - return new BusiResult(jobList); - } - - @RequestMapping(value = "oneTimeList", method = RequestMethod.GET) - public BusiResult oneTimeList(@RequestParam("page") Integer page, - @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) { - if (page == null || page <= 0) { - page = 1; - } - List jobList = simpleQuartzJobService.findOneTimeByPage(page, pageSize); - return new BusiResult(jobList); - } -} diff --git a/accompany-scheduler/pom.xml b/accompany-scheduler/pom.xml index f2b68b95b..f6f20f40d 100644 --- a/accompany-scheduler/pom.xml +++ b/accompany-scheduler/pom.xml @@ -13,7 +13,6 @@ accompany-scheduler pom - accompany-scheduler-sdk accompany-scheduler-service accompany-scheduler-web