From 931111fc851fd74b6024c8cc640b5b9a9fc1ea82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 22 Sep 2025 16:23:08 +0800 Subject: [PATCH] =?UTF-8?q?feat(OaAssets):=20=E6=B7=BB=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E5=AD=97=E6=AE=B5=E7=9A=84=20JsonFormat=20=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=E4=BB=A5=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为多个资产实体类中的 startTime 和 endTime 字段添加 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") 注解，确保日期时间格式统一，提升接口数据可读性。涉及实体类包括：OaAssets、OaAssetsDomain、OaAssetsEmail、 OaAssetsMysql、OaAssetsSoftwareCert、OaAssetsSsl、 OaAssetsTrademark、OaAssetsVhost。 同时引入 com.fasterxml.jackson.annotation.JsonFormat 包。 --- src/main/java/com/gxwebsoft/oa/entity/OaAssets.java | 3 +++ src/main/java/com/gxwebsoft/oa/entity/OaAssetsDomain.java | 3 +++ src/main/java/com/gxwebsoft/oa/entity/OaAssetsEmail.java | 3 +++ src/main/java/com/gxwebsoft/oa/entity/OaAssetsMysql.java | 4 +++- .../java/com/gxwebsoft/oa/entity/OaAssetsSoftwareCert.java | 4 +++- src/main/java/com/gxwebsoft/oa/entity/OaAssetsSsl.java | 4 +++- src/main/java/com/gxwebsoft/oa/entity/OaAssetsTrademark.java | 4 +++- src/main/java/com/gxwebsoft/oa/entity/OaAssetsVhost.java | 3 +++ 8 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gxwebsoft/oa/entity/OaAssets.java b/src/main/java/com/gxwebsoft/oa/entity/OaAssets.java index 935c69f..d4afe3e 100644 --- a/src/main/java/com/gxwebsoft/oa/entity/OaAssets.java +++ b/src/main/java/com/gxwebsoft/oa/entity/OaAssets.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -97,9 +98,11 @@ public class OaAssets implements Serializable { private String content; @Schema(description = "购买时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; @Schema(description = "到期时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; @Schema(description = "置顶状态") diff --git a/src/main/java/com/gxwebsoft/oa/entity/OaAssetsDomain.java b/src/main/java/com/gxwebsoft/oa/entity/OaAssetsDomain.java index f6f3aae..5943d6a 100644 --- a/src/main/java/com/gxwebsoft/oa/entity/OaAssetsDomain.java +++ b/src/main/java/com/gxwebsoft/oa/entity/OaAssetsDomain.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -52,9 +53,11 @@ public class OaAssetsDomain implements Serializable { private BigDecimal price; @Schema(description = "购买时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; @Schema(description = "到期时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; @Schema(description = "置顶状态") diff --git a/src/main/java/com/gxwebsoft/oa/entity/OaAssetsEmail.java b/src/main/java/com/gxwebsoft/oa/entity/OaAssetsEmail.java index 93b5700..a0e805b 100644 --- a/src/main/java/com/gxwebsoft/oa/entity/OaAssetsEmail.java +++ b/src/main/java/com/gxwebsoft/oa/entity/OaAssetsEmail.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -52,9 +53,11 @@ public class OaAssetsEmail implements Serializable { private String content; @Schema(description = "购买时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; @Schema(description = "到期时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; @Schema(description = "置顶状态") diff --git a/src/main/java/com/gxwebsoft/oa/entity/OaAssetsMysql.java b/src/main/java/com/gxwebsoft/oa/entity/OaAssetsMysql.java index 5999a3e..b39315c 100644 --- a/src/main/java/com/gxwebsoft/oa/entity/OaAssetsMysql.java +++ b/src/main/java/com/gxwebsoft/oa/entity/OaAssetsMysql.java @@ -4,11 +4,11 @@ import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -58,9 +58,11 @@ public class OaAssetsMysql implements Serializable { private BigDecimal price; @Schema(description = "购买时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; @Schema(description = "到期时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; @Schema(description = "置顶状态") diff --git a/src/main/java/com/gxwebsoft/oa/entity/OaAssetsSoftwareCert.java b/src/main/java/com/gxwebsoft/oa/entity/OaAssetsSoftwareCert.java index 10963f0..78e2938 100644 --- a/src/main/java/com/gxwebsoft/oa/entity/OaAssetsSoftwareCert.java +++ b/src/main/java/com/gxwebsoft/oa/entity/OaAssetsSoftwareCert.java @@ -4,11 +4,11 @@ import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -52,9 +52,11 @@ public class OaAssetsSoftwareCert implements Serializable { private String certUrl; @Schema(description = "购买时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; @Schema(description = "到期时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; @Schema(description = "置顶状态") diff --git a/src/main/java/com/gxwebsoft/oa/entity/OaAssetsSsl.java b/src/main/java/com/gxwebsoft/oa/entity/OaAssetsSsl.java index 5e16bc6..b89e837 100644 --- a/src/main/java/com/gxwebsoft/oa/entity/OaAssetsSsl.java +++ b/src/main/java/com/gxwebsoft/oa/entity/OaAssetsSsl.java @@ -4,11 +4,11 @@ import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -61,9 +61,11 @@ public class OaAssetsSsl implements Serializable { private String certCrt; @Schema(description = "购买时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; @Schema(description = "到期时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; @Schema(description = "置顶状态") diff --git a/src/main/java/com/gxwebsoft/oa/entity/OaAssetsTrademark.java b/src/main/java/com/gxwebsoft/oa/entity/OaAssetsTrademark.java index 20bd3de..2b52097 100644 --- a/src/main/java/com/gxwebsoft/oa/entity/OaAssetsTrademark.java +++ b/src/main/java/com/gxwebsoft/oa/entity/OaAssetsTrademark.java @@ -4,11 +4,11 @@ import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -52,9 +52,11 @@ public class OaAssetsTrademark implements Serializable { private String certUrl; @Schema(description = "购买时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; @Schema(description = "到期时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; @Schema(description = "置顶状态") diff --git a/src/main/java/com/gxwebsoft/oa/entity/OaAssetsVhost.java b/src/main/java/com/gxwebsoft/oa/entity/OaAssetsVhost.java index 36a640d..43d8628 100644 --- a/src/main/java/com/gxwebsoft/oa/entity/OaAssetsVhost.java +++ b/src/main/java/com/gxwebsoft/oa/entity/OaAssetsVhost.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -57,9 +58,11 @@ public class OaAssetsVhost implements Serializable { private String ssl; @Schema(description = "购买时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; @Schema(description = "到期时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; @Schema(description = "置顶状态")