I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

定时任务修改

Browse Source
yun-zuoyi
yunhao.wang 6 years ago
parent 6ef7931692
commit ea621d14f8
11 changed files with 191 additions and 136 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
Unescape Escape View File

@ -87,7 +87,7 @@ public class ImppEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TASK_METHOD_TYPE{
TYPE_GROUP(1,"类方法","Java Class 方法");
CLASS_METHOD(1,"类方法","Java Class 方法");
// TYPE_COMPANY(2,"链接","Http URL"),
// TYPE_FACTORY(3,"权限CODE","权限CODE");

24
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefExpressionTrigger.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java
Unescape Escape View File

@ -26,20 +26,20 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_REF_EXPRESSION_TRIGGER")
@Api(value="关系-表达式与触发器",description = "关系-表达式与触发器")
public class SysRefExpressionTrigger extends BaseBean {
@Table(name="SYS_REF_TASK_CYCLE_PLAN")
@Api(value="关系-任务周期与计划",description = "关系-任务周期与计划")
public class SysRefTaskCyclePlan extends BaseBean {
@Column(name="EXPRESSION_ID")
@ApiParam(value ="表达式_ID" ,example = "-1")
@Column(name="TASK_CYCLE_ID")
@ApiParam(value ="任务周期id" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long expressionId;
private Long taskCycleId;
@Column(name="TRIGGER_NAME")
@ApiParam(value ="触发器名称")
private String triggerName;
@Column(name="TASK_PLAN_NAME")
@ApiParam(value ="任务计划名称")
private String taskPlanName;
@Column(name="TRIGGER_GROUP_NAME")
@ApiParam(value ="触发器名称")
private String triggerGroupName;
@Column(name="TASK_PLAN_GROUP_NAME")
@ApiParam(value ="任务计划组名称")
private String taskPlanGroupName;
}

46
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java
Unescape Escape View File

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 任务
* @Reference :
* @Author : yunhao
* @CreateDate : 2018-12-26 20:00
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_TASK")
@Api(value="任务",description = "任务")
public class SysTask extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;
@Column(name="TASK_PACKAGE")
@ApiParam(value ="任务包名")
private String taskPackage;
@Column(name="TASK_CLASS")
@ApiParam(value ="任务类名")
private String taskClass;
@Column(name="TASK_DESCRIPTION")
@ApiParam(value ="任务描述" , access ="任务描述")
private String taskDescription;
}

26
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeExpression.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskCycle.java
Unescape Escape View File

@ -14,7 +14,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 定时任务时间表达式
* @Description : 任务周期
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 16:58:43.801
@ -25,29 +25,29 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_TASK_TIME_EXPRESSION")
@Api(value="任务表达式",description = "任务表达式")
public class SysTaskTimeExpression extends BaseBean {
@Table(name="SYS_TASK_CYCLE")
@Api(value="任务周期",description = "任务周期")
public class SysTaskCycle extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;
@Column(name="EXPRESSION_CONTENT")
@Column(name="TASK_CYCLE_EXPS")
@ApiParam(value ="表达式内容")
private String expressionContent;
private String taskCycleExps;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name="expression_start_date")
@Column(name="TASK_CYCLE_START_DATE")
@ApiParam(value ="开始时间")
private String expressionStartDatetime;
private String taskCycleStartDatetime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name="expression_end_date")
@Column(name="TASK_CYCLE_END_DATE")
@ApiParam(value ="结束时间")
private String expressionEndDatetime;
private String taskCycleEndDatetime;
@Column(name="TIME_DESCRIPTION")
@ApiParam(value ="表达式描述")
private String expressionDescription;
@Column(name="TASK_CYCLE_DESCRIPTION")
@ApiParam(value ="描述")
private String taskCycleDescription;
}

92
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java
Unescape Escape View File

@ -0,0 +1,92 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 任务计划
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 16:58:43.952
* @Modify :
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_TASK_PLAN")
@Api(value="任务计划",description = "任务计划")
public class SysTaskPlan extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;
@Column(name="GROUP_NAME")
@ApiParam(value ="组名称")
private String groupName;
@Column(name="TASK_CYCLE_ID")
@ApiParam(value ="任务周期ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskCycleId;
@Column(name="TASK_CYCLE_NAME_RDD")
@ApiParam(value ="任务周期名称")
private String taskCycleNameRdd;
@Column(name="TASK_CYCLE_EXPS_RDD")
@ApiParam(value ="任务周期表达式")
private String taskCycleExpsRdd;
@Column(name="TASK_PLAN_EXEC_NUM")
@ApiParam(value ="定时任务运行次数" , example ="0")
private Integer taskPlanExecNum;
// 枚举 ImppEnumUtil.TASK_METHOD_TYPE.CLASS_METHOD
@Column(name="TASK_METHOD_TYPE")
@ApiParam(value ="任务执行类型" ,example = "-1")
private Integer taskMethodType;
@Column(name="TASK_ID")
@ApiParam(value ="定时任务id")
private Long taskId;
@Column(name="TASK_NAME_RDD")
@ApiParam(value ="定时任务名称")
private String taskNameRdd;
@Column(name="TASK_CYCLE_START_DATE_TIME_RDD")
@ApiParam(value ="任务开始时间")
private String taskCycleStartDateTimeRdd;
@Column(name="TASK_CYCLE_END_DATE_TIME_RDD")
@ApiParam(value ="任务结束时间")
private String taskCycleEndDateTimeRdd;
@Column(name="TASK_PLAN_DESCRIPTION")
@ApiParam(value ="任务计划描述" , access ="任务计划描述")
private String taskPlanDescription;
@Column(name="TASK_PLAN_STATUS")
@ApiParam(value ="任务状态（1.正常，2.禁用）" , example ="1")
private Integer taskPlanStatus;
@Column(name="LAST_RUN_DATE_TIME")
@ApiParam(value ="最后运行时间" , access ="最后运行时间")
private String lastRunDateTime;
}

97
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTime.java
Unescape Escape View File

@ -1,97 +0,0 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 定时任务
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 16:58:43.952
* @Modify :
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_TASK_TIME")
@Api(value="定时任务",description = "定时任务")
public class SysTaskTime extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;
@Column(name="GROUP_NAME")
@ApiParam(value ="名称")
private String groupName;
@Column(name="TIME_EXPRESSION_ID")
@ApiParam(value ="时间表达式ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long timeExpressionId;
@Column(name="TIME_NAME_Rdd")
@ApiParam(value ="时间表达式名称")
private String timeExpressionNameRdd;
@Column(name="TIME_EXPRESSION_CONTENT_RDD")
@ApiParam(value ="时间表达式")
private String timeExpressionContentRdd;
@Column(name="TASK_NUM_SUM")
@ApiParam(value ="执行总次数" , example ="0")
private Integer taskNumSum;
@Column(name="TASK_NUM_RUN")
@ApiParam(value ="执行次数" , example ="0")
private Integer taskNumRun;
@Column(name="TASK_TYPE")
@ApiParam(value ="任务类型（枚举：1.定时任务）" , example ="-1")
private Integer taskType;
@Column(name="TASK_METHOD_TYPE")
@ApiParam(value ="任务执行类型" ,example = "-1")
private Integer taskMethodType;
@Column(name="TASK_PACKAGE")
@ApiParam(value ="任务包名")
private String taskPackage;
@Column(name="TASK_CLASS")
@ApiParam(value ="任务类名")
private String taskClass;
@Column(name="TASK_START_DATE_TIME_RDD")
@ApiParam(value ="任务开始时间")
private String taskStartDateTimeRdd;
@Column(name="TASK_END_DATE_TIME_RDD")
@ApiParam(value ="任务结束时间")
private String taskEndDateTimeRdd;
@Column(name="TASK_DESCRIPTION")
@ApiParam(value ="任务描述" , access ="任务描述")
private String taskDescription;
@Column(name="TASK_STATUS")
@ApiParam(value ="任务状态（1.正常，2.禁用）" , example ="1")
private Integer taskStatus;
@Column(name="LAST_RUN_DATE_TIME")
@ApiParam(value ="最后运行时间" , access ="最后运行时间")
private String lastRunDateTime;
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefExpressionTriggerRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefTaskCyclePlanRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysRefExpressionTrigger;
import cn.estsh.i3plus.pojo.platform.bean.SysRefTaskCyclePlan;
/**
* @Description : 关系-表达式与触发器
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.SysRefExpressionTrigger;
* @CreateDate : 2018-11-14 13:36
* @Modify:
**/
public interface SysRefExpressionTriggerRepository extends BaseRepository<SysRefExpressionTrigger, Long> {
public interface SysRefTaskCyclePlanRepository extends BaseRepository<SysRefTaskCyclePlan, Long> {
}

6
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeExpressionRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskCycleRepository.java
Unescape Escape View File

@ -1,14 +1,14 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle;
/**
* @Description : 定时任务时间表达式
* @Description : 任务周期
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 12:03:01.252
* @Modify :
**/
public interface SysTaskTimeExpressionRepository extends BaseRepository<SysTaskTimeExpression, Long> {
public interface SysTaskCycleRepository extends BaseRepository<SysTaskCycle, Long> {
}

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskPlanRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan;
/**
* @Description : 任务计划
* @Reference :
* @Author : yunhao
* @CreateDate : 2018-12-26 21:13
* @Modify:
**/
public interface SysTaskPlanRepository extends BaseRepository<SysTaskPlan, Long> {
}

6
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskRepository.java
Unescape Escape View File

@ -1,14 +1,14 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskTime;
import cn.estsh.i3plus.pojo.platform.bean.SysTask;
/**
* @Description : 定时任务
* @Description : 任务
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 12:03:01.372
* @Modify :
**/
public interface SysTaskTimeRepository extends BaseRepository<SysTaskTime, Long> {
public interface SysTaskRepository extends BaseRepository<SysTask, Long> {
}

10
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -286,11 +286,11 @@ public class CoreHqlPack {
}
/**
* 任务表达式复杂查询
* 任务周期复杂查询
* @param taskTimeExpression
* @return
*/
public static String packHqlSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression) {
public static String packHqlSysTaskCycle(SysTaskCycle taskTimeExpression) {
StringBuffer result = new StringBuffer();
// hql拼接
@ -304,13 +304,13 @@ public class CoreHqlPack {
* @param taskTime
* @return
*/
public static String packHqlSysTaskTime(SysTaskTime taskTime){
public static String packHqlSysTaskPlan(SysTaskPlan taskTime){
StringBuffer result = new StringBuffer();
// hql拼接
HqlPack.getStringLikerPack(taskTime.getName(),"name",result);
HqlPack.getNumEqualPack(taskTime.getTaskStatus(),"taskStatus",result);
HqlPack.getNumEqualPack(taskTime.getTimeExpressionId(),"timeExpressionId",result);
HqlPack.getNumEqualPack(taskTime.getTaskPlanStatus(),"taskPlanStatus",result);
HqlPack.getNumEqualPack(taskTime.getTaskCycleId(),"taskCycleId",result);
return result.toString();
}

Write Preview
Loading…
Cancel
Save