diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeRecording.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java similarity index 61% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeRecording.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index bf5520e..a865858 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeRecording.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.platform.bean; +package cn.estsh.i3plus.pojo.platform.platbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -26,46 +26,41 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_TASK_TIME_RECORDING") -@Api(value="定时任务执行记录",description = "定时任务执行记录") -public class SysTaskTimeRecording extends BaseBean { +@Table(name="SYS_LOG_TASK_TIME") +@Api(value="定时任务执行日志",description = "定时任务执行记录") +public class SysLogTaskTime extends BaseBean { @Column(name="NAME") @ApiParam(value ="任务名称") private String name; - + + @Column(name="GROUP_NAME") + @ApiParam(value ="任务组名称") + private String groupName; + @Column(name="TIME_TASK_ID") @ApiParam(value ="任务编号" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long timeTaskId; - @Column(name="TIME_ID") - @ApiParam(value ="时间表达式ID" , example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long timeId; + @Column(name="TIME_EXPRESSION_NAME_Rdd") + @ApiParam(value ="时间表达式名称") + private String timeExpressionNameRdd; - @Column(name="TIME_EXPRESSION_RDD") + @Column(name="TIME_EXPRESSION_CONTENT_RDD") @ApiParam(value ="时间表达式") - private String timeExpressionRdd; - - @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_STATUS_ID") + private String timeExpressionContentRdd; + + @Column(name="EXECUTE_TIME") + @ApiParam(value ="执行耗时") + @JsonSerialize(using = ToStringSerializer.class) + private Long executeTime; + + @Column(name="TASK_STATUS") @ApiParam(value ="任务完成情况(枚举:1正常,2失败)") - private Integer taskStatusId; - - @Column(name="TASK_LOG") - @ApiParam(value ="任务日志") - private String taskLog; - + private Integer taskStatus; + @Column(name="TASK_LOG_ERROR") @ApiParam(value ="任务异常日志") private String taskLogError; - } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java new file mode 100644 index 0000000..1ce1eef --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.platrepositorymongo; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-12-20 22:35 + * @Modify: + **/ +public interface SysLogTaskTimeRepository extends BaseMongoRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java index 67c93ae..749dd25 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java @@ -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.SysTaskTimeRecording; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; /** * @Description : 定时任务执行记录 @@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeRecording; * @Date : 2018-10-22 12:03:01.409 * @Modify : **/ -public interface SysTaskTimeRecordingRepository extends BaseRepository { +public interface SysTaskTimeRecordingRepository extends BaseRepository { }