|
@@ -2,6 +2,10 @@ package com.xy.dto;
|
|
|
|
|
|
import com.alibaba.excel.annotation.ExcelProperty;
|
|
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
|
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
|
|
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
|
|
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
|
|
|
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
|
|
|
import com.xy.annotate.DictFormat;
|
|
|
import com.xy.consts.DictConsts;
|
|
|
import com.xy.convert.DictConvert;
|
|
@@ -307,7 +311,8 @@ public class DeviceInfoDto {
|
|
|
@DictFormat(DictConsts.DEVICE_ACTIVE_STATUS)
|
|
|
@ApiModelProperty("激活状态")
|
|
|
private Integer activeState;
|
|
|
-
|
|
|
+ @JsonDeserialize(using = LocalDateTimeDeserializer.class)
|
|
|
+ @JsonSerialize(using = LocalDateTimeSerializer.class)
|
|
|
@ApiModelProperty("激活时间")
|
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
|
private LocalDateTime activeTime;
|
|
@@ -335,11 +340,13 @@ public class DeviceInfoDto {
|
|
|
@DictFormat(DictConsts.DEVICE_FAULT_LEVEL)
|
|
|
@ApiModelProperty("故障等级")
|
|
|
private Integer faultLevel;
|
|
|
-
|
|
|
+ @JsonDeserialize(using = LocalDateTimeDeserializer.class)
|
|
|
+ @JsonSerialize(using = LocalDateTimeSerializer.class)
|
|
|
@ApiModelProperty("创建时间")
|
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
|
private LocalDateTime createTime;
|
|
|
-
|
|
|
+ @JsonDeserialize(using = LocalDateTimeDeserializer.class)
|
|
|
+ @JsonSerialize(using = LocalDateTimeSerializer.class)
|
|
|
@ApiModelProperty("更新时间")
|
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
|
private LocalDateTime updateTime;
|