diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/TaskConfig.java b/docus-client-interface/src/main/java/com/docus/server/entity/TaskConfig.java index 6ebc5de..ffd60c4 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/TaskConfig.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/TaskConfig.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.docus.server.enums.StateEnum; import com.docus.server.util.DateSpiltUtil; import com.docus.server.util.PeriodTime; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -46,12 +47,14 @@ public class TaskConfig { * 数据起始时间范围 */ @ApiModelProperty(value = "数据起始时间范围") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; /** * 数据结束时间范围 */ @ApiModelProperty(value = "数据结束时间范围") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; @@ -59,6 +62,7 @@ public class TaskConfig { * 指针时间,当前全量任务的任务执行到的时间 */ @ApiModelProperty(value = "指针时间,当前全量任务的任务执行到的时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date allPointerTime; /** * 偏移量 @@ -86,6 +90,7 @@ public class TaskConfig { * 指针时间,当前增量任务的执行到的时间 */ @ApiModelProperty(value = "指针时间,当前增量任务的执行到的时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date incPointerTime; /** * 任务其他参数配置 @@ -106,10 +111,12 @@ public class TaskConfig { @ApiModelProperty(value = "创建时间") @TableField("create_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; @ApiModelProperty(value = "更新时间") @TableField("update_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; @ApiModelProperty(value = "是否有重试详情日志") diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/TaskConfigRetryLog.java b/docus-client-interface/src/main/java/com/docus/server/entity/TaskConfigRetryLog.java index 321a9e3..a9d00c3 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/TaskConfigRetryLog.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/TaskConfigRetryLog.java @@ -5,10 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.docus.server.enums.StateEnum; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.time.LocalDateTime; import java.util.Date; @@ -28,90 +29,111 @@ public class TaskConfigRetryLog implements Serializable { * - bigint(20) */ @TableId(value = "id", type = IdType.ASSIGN_UUID) + @ApiModelProperty(value = "主键") private Long id; /** * 重试消息主键 - bigint(20) */ @TableField("message_id") + @ApiModelProperty(value = "重试消息主键") private Long messageId; /** * 任务名字 - varchar(255) */ @TableField("name") + @ApiModelProperty(value = "任务名字") private String name; /** * 任务类型。 dept,user.... - varchar(255) */ @TableField("type") + @ApiModelProperty(value = "任务类型") private String type; /** * 数据起始时间范围 - datetime */ @TableField("start_time") - private LocalDateTime startTime; + @ApiModelProperty(value = "数据起始时间范围") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date startTime; /** * 数据结束时间范围 - datetime */ @TableField("end_time") - private LocalDateTime endTime; + @ApiModelProperty(value = "数据结束时间范围") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endTime; /** * 指针时间,当前全量任务的任务执行到的时间 - datetime */ @TableField("all_pointer_time") - private LocalDateTime allPointerTime; + @ApiModelProperty(value = "指针时间,当前全量任务的任务执行到的时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date allPointerTime; /** * 每页大小 - double */ @TableField("page_size") - private Double pageSize; + @ApiModelProperty(value = "每页大小") + private int pageSize; /** * 时间分割周期,把起始时间结束时间进行分割,单位为秒 - varchar(255) */ @TableField("spilt_period") + @ApiModelProperty(value = "时间分割周期,把起始时间结束时间进行分割,单位为秒") private String spiltPeriod; /** * 指针时间,当前增量任务的执行到的时间 - datetime */ @TableField("inc_pointer_time") - private LocalDateTime incPointerTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "指针时间,当前增量任务的执行到的时间") + private Date incPointerTime; /** * 任务其他参数配置 - varchar(500) */ @TableField("param") + @ApiModelProperty(value = "任务其他参数配置") private String param; /** * 执行状态0:成功,1:失败 - int(11) */ @TableField("state") + @ApiModelProperty(value = " 执行状态0:成功,1:失败") private StateEnum state; /** * 上回失败信息 - varchar(5000) */ @TableField("last_error_msg") + @ApiModelProperty(value = "上回失败信息 ") private String lastErrorMsg; /** * 入库时间 - datetime */ @TableField("create_time") + @ApiModelProperty(value = "入库时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; /** * 入库更新时间 - datetime */ @TableField("update_time") + @ApiModelProperty(value = "入库更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/TaskMessage.java b/docus-client-interface/src/main/java/com/docus/server/entity/TaskMessage.java index 1b6fc04..ee15a74 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/TaskMessage.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/TaskMessage.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.docus.server.enums.CollectTypeEnum; import com.docus.server.enums.StateEnum; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -67,10 +68,12 @@ public class TaskMessage implements Serializable { @ApiModelProperty(value = "入库时间") @TableField("create_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; @ApiModelProperty(value = "入库更新时间") @TableField("update_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/TaskMessageRetryLog.java b/docus-client-interface/src/main/java/com/docus/server/entity/TaskMessageRetryLog.java index 12e1a54..d79280b 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/TaskMessageRetryLog.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/TaskMessageRetryLog.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.docus.server.enums.CollectTypeEnum; import com.docus.server.enums.StateEnum; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -71,10 +72,12 @@ public class TaskMessageRetryLog implements Serializable { @ApiModelProperty(value = "入库时间") @TableField("create_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; @ApiModelProperty(value = "入库更新时间") @TableField("update_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime;