去掉date序列化,采用@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss"),因为有的接口返回的是yyyy-mm-dd

segment2.0
linrf 2 years ago
parent e59fee9445
commit fd5c7adb48

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.docus.server.enums.StateEnum; import com.docus.server.enums.StateEnum;
import com.docus.server.util.DateSpiltUtil; import com.docus.server.util.DateSpiltUtil;
import com.docus.server.util.PeriodTime; import com.docus.server.util.PeriodTime;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -46,12 +47,14 @@ public class TaskConfig {
* *
*/ */
@ApiModelProperty(value = "数据起始时间范围") @ApiModelProperty(value = "数据起始时间范围")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime; private Date startTime;
/** /**
* *
*/ */
@ApiModelProperty(value = "数据结束时间范围") @ApiModelProperty(value = "数据结束时间范围")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime; private Date endTime;
@ -59,6 +62,7 @@ public class TaskConfig {
* *
*/ */
@ApiModelProperty(value = "指针时间,当前全量任务的任务执行到的时间") @ApiModelProperty(value = "指针时间,当前全量任务的任务执行到的时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date allPointerTime; private Date allPointerTime;
/** /**
* *
@ -86,6 +90,7 @@ public class TaskConfig {
* *
*/ */
@ApiModelProperty(value = "指针时间,当前增量任务的执行到的时间") @ApiModelProperty(value = "指针时间,当前增量任务的执行到的时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date incPointerTime; private Date incPointerTime;
/** /**
* *
@ -106,10 +111,12 @@ public class TaskConfig {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@TableField("create_time") @TableField("create_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
@TableField("update_time") @TableField("update_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime; private Date updateTime;
@ApiModelProperty(value = "是否有重试详情日志") @ApiModelProperty(value = "是否有重试详情日志")

@ -5,10 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.docus.server.enums.StateEnum; import com.docus.server.enums.StateEnum;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
@ -28,90 +29,111 @@ public class TaskConfigRetryLog implements Serializable {
* - bigint(20) * - bigint(20)
*/ */
@TableId(value = "id", type = IdType.ASSIGN_UUID) @TableId(value = "id", type = IdType.ASSIGN_UUID)
@ApiModelProperty(value = "主键")
private Long id; private Long id;
/** /**
* - bigint(20) * - bigint(20)
*/ */
@TableField("message_id") @TableField("message_id")
@ApiModelProperty(value = "重试消息主键")
private Long messageId; private Long messageId;
/** /**
* - varchar(255) * - varchar(255)
*/ */
@TableField("name") @TableField("name")
@ApiModelProperty(value = "任务名字")
private String name; private String name;
/** /**
* deptuser.... - varchar(255) * deptuser.... - varchar(255)
*/ */
@TableField("type") @TableField("type")
@ApiModelProperty(value = "任务类型")
private String type; private String type;
/** /**
* - datetime * - datetime
*/ */
@TableField("start_time") @TableField("start_time")
private LocalDateTime startTime; @ApiModelProperty(value = "数据起始时间范围")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/** /**
* - datetime * - datetime
*/ */
@TableField("end_time") @TableField("end_time")
private LocalDateTime endTime; @ApiModelProperty(value = "数据结束时间范围")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/** /**
* - datetime * - datetime
*/ */
@TableField("all_pointer_time") @TableField("all_pointer_time")
private LocalDateTime allPointerTime; @ApiModelProperty(value = "指针时间,当前全量任务的任务执行到的时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date allPointerTime;
/** /**
* - double * - double
*/ */
@TableField("page_size") @TableField("page_size")
private Double pageSize; @ApiModelProperty(value = "每页大小")
private int pageSize;
/** /**
* - varchar(255) * - varchar(255)
*/ */
@TableField("spilt_period") @TableField("spilt_period")
@ApiModelProperty(value = "时间分割周期,把起始时间结束时间进行分割,单位为秒")
private String spiltPeriod; private String spiltPeriod;
/** /**
* - datetime * - datetime
*/ */
@TableField("inc_pointer_time") @TableField("inc_pointer_time")
private LocalDateTime incPointerTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "指针时间,当前增量任务的执行到的时间")
private Date incPointerTime;
/** /**
* - varchar(500) * - varchar(500)
*/ */
@TableField("param") @TableField("param")
@ApiModelProperty(value = "任务其他参数配置")
private String param; private String param;
/** /**
* 01: - int(11) * 01: - int(11)
*/ */
@TableField("state") @TableField("state")
@ApiModelProperty(value = " 执行状态0成功1:失败")
private StateEnum state; private StateEnum state;
/** /**
* - varchar(5000) * - varchar(5000)
*/ */
@TableField("last_error_msg") @TableField("last_error_msg")
@ApiModelProperty(value = "上回失败信息 ")
private String lastErrorMsg; private String lastErrorMsg;
/** /**
* - datetime * - datetime
*/ */
@TableField("create_time") @TableField("create_time")
@ApiModelProperty(value = "入库时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
/** /**
* - datetime * - datetime
*/ */
@TableField("update_time") @TableField("update_time")
@ApiModelProperty(value = "入库更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime; private Date updateTime;

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.docus.server.enums.CollectTypeEnum; import com.docus.server.enums.CollectTypeEnum;
import com.docus.server.enums.StateEnum; import com.docus.server.enums.StateEnum;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -67,10 +68,12 @@ public class TaskMessage implements Serializable {
@ApiModelProperty(value = "入库时间") @ApiModelProperty(value = "入库时间")
@TableField("create_time") @TableField("create_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
@ApiModelProperty(value = "入库更新时间") @ApiModelProperty(value = "入库更新时间")
@TableField("update_time") @TableField("update_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime; private Date updateTime;

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.docus.server.enums.CollectTypeEnum; import com.docus.server.enums.CollectTypeEnum;
import com.docus.server.enums.StateEnum; import com.docus.server.enums.StateEnum;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -71,10 +72,12 @@ public class TaskMessageRetryLog implements Serializable {
@ApiModelProperty(value = "入库时间") @ApiModelProperty(value = "入库时间")
@TableField("create_time") @TableField("create_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
@ApiModelProperty(value = "入库更新时间") @ApiModelProperty(value = "入库更新时间")
@TableField("update_time") @TableField("update_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime; private Date updateTime;

Loading…
Cancel
Save