From 7096d9bd9715c37aa77df58b782a11a82cf4fb64 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 27 Dec 2023 09:18:01 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=9B=BD=E7=BD=91=E4=B8=8A=E9=80=81=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/device/pms/pojo/vo/gw/OtherUserDto.java | 6 +++--- .../com/njcn/device/pms/pojo/vo/gw/PhotovoltaicDto.java | 6 +++--- .../com/njcn/device/pms/pojo/vo/gw/SensitiveUserDto.java | 6 +++--- .../com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java | 6 +++--- .../java/com/njcn/device/pms/pojo/vo/gw/WindSourceDto.java | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/OtherUserDto.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/OtherUserDto.java index 6d9a7e7c5..a1d0e9f0f 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/OtherUserDto.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/OtherUserDto.java @@ -2,7 +2,7 @@ package com.njcn.device.pms.pojo.vo.gw; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; import java.math.BigDecimal; @@ -138,12 +138,12 @@ public class OtherUserDto { * 创建时间 是否必填:否 */ @ExcelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JSONField(format = "yyyy-MM-dd") private LocalDateTime createTime; /** * 更新时间 是否必填:否 */ @ExcelProperty(value = "更新时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JSONField(format = "yyyy-MM-dd") private LocalDateTime updateTime; } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/PhotovoltaicDto.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/PhotovoltaicDto.java index dc5ccda7c..06f1b4f28 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/PhotovoltaicDto.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/PhotovoltaicDto.java @@ -2,7 +2,7 @@ package com.njcn.device.pms.pojo.vo.gw; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; import java.math.BigDecimal; @@ -128,13 +128,13 @@ public class PhotovoltaicDto extends Unit { * 创建时间 是否必填: */ @ExcelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JSONField(format = "yyyy-MM-dd") private LocalDateTime createTime; /** * 更新时间 是否必填: */ @ExcelProperty(value = "更新时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JSONField(format = "yyyy-MM-dd") private LocalDateTime updateTime; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/SensitiveUserDto.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/SensitiveUserDto.java index 7dfb04f2c..f4cd6ef7d 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/SensitiveUserDto.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/SensitiveUserDto.java @@ -2,7 +2,7 @@ package com.njcn.device.pms.pojo.vo.gw; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; import java.math.BigDecimal; @@ -146,11 +146,11 @@ public class SensitiveUserDto extends Unit { private String runStatus; /*创建时间 是否必填：*/ @ExcelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JSONField(format = "yyyy-MM-dd") private LocalDateTime createTime; /*更新时间 是否必填：*/ @ExcelProperty(value = "更新时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JSONField(format = "yyyy-MM-dd") private LocalDateTime updateTime; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java index 36c224e31..32cf01acf 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java @@ -2,7 +2,7 @@ package com.njcn.device.pms.pojo.vo.gw; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; import java.math.BigDecimal; @@ -115,13 +115,13 @@ public class TractionStationDTO extends Unit { private BigDecimal triphaseVvNameplateCapacity; /*上报日期 是否必填：否*/ @ExcelProperty(value = "上报日期") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(format = "yyyy-MM-dd") private LocalDateTime uploadDate; /*运行状态 是否必填：是*/ @ExcelProperty(value = "运行状态") private String runStatus; /*更新时间 是否必填：否*/ @ExcelProperty(value = "更新时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JSONField(format = "yyyy-MM-dd") private LocalDateTime updateTime; } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/WindSourceDto.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/WindSourceDto.java index 86f73b3d5..82a48dff7 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/WindSourceDto.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/WindSourceDto.java @@ -2,7 +2,7 @@ package com.njcn.device.pms.pojo.vo.gw; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.fastjson.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -117,12 +117,12 @@ public class WindSourceDto extends Unit { private String runStatus; @ApiModelProperty(name = "createTime", value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JSONField(format = "yyyy-MM-dd") @ExcelProperty(value = "创建时间") private LocalDateTime createTime; @ApiModelProperty(name = "updateTime", value = "更新时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JSONField(format = "yyyy-MM-dd") @ExcelProperty(value = "更新时间") private LocalDateTime updateTime; }