diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java index 0658d8f..74e7961 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java @@ -31,11 +31,14 @@ import java.text.DecimalFormat; @Api(value="定时任务",description = "定时任务") public class TaskTime extends BaseBean { - @Column(name="NAME") @ApiParam(value ="名称") private String name; - + + @Column(name="GROUP_NAME") + @ApiParam(value ="名称") + private String groupName; + @Column(name="TIME_ID") @ApiParam(value ="时间表达式ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -52,47 +55,47 @@ public class TaskTime extends BaseBean { @Column(name="RED_TIME_NAME") @ApiParam(value ="时间表达式名称") private String redTimeName; - + @Column(name="RED_TIME_EXPRESSION") @ApiParam(value ="时间表达式") private String redTimeExpression; - + @Column(name="TASK_START_DATE_TIME") @ApiParam(value ="任务开始时间") private String taskStartDateTime; - + @Column(name="TASK_END_DATE_TIME") @ApiParam(value ="任务结束时间") private String taskEndDateTime; - + @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_ID") @ApiParam(value ="任务类型(枚举:1.定时任务)" , example ="-1") private Integer taskTypeId; - + @Column(name="TASK_METHOD") @ApiParam(value ="执行方法") private String taskMethod; - + @Column(name="TASK_METHOD_TYPE_ID") @ApiParam(value ="任务执行类型" ,example = "-1") private Integer taskMethodTypeId; - + @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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeExpression.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeExpression.java index 5339240..c354c91 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeExpression.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeExpression.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -26,20 +27,32 @@ import java.text.DecimalFormat; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="TASK_TIME_EXPRESSION") -@Api(value="系统时间表达式",description = "系统时间表达式") +@Api(value="任务表达式",description = "任务表达式") public class TaskTimeExpression extends BaseBean { - @Column(name="NAME") @ApiParam(value ="名称") private String name; - - @Column(name="TIME_EXPRESSION") + + @Column(name="GROUP_NAME") + @ApiParam(value ="组名称") + private String groupName; + + @Column(name="EXPRESSION_CONTENT") @ApiParam(value ="表达式内容") - private String timeExpression; - + private String expressionContent; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Column(name="expression_start_date") + @ApiParam(value ="开始时间") + private String expressionStartDatetime; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Column(name="expression_end_date") + @ApiParam(value ="结束时间") + private String expressionEndDatetime; + @Column(name="TIME_DESCRIPTION") @ApiParam(value ="表达式描述") - private String timeDescription; - + private String expressionDescription; }