diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java index 0cc76b0c..d3ea9d3c 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java @@ -10,9 +10,9 @@ import lombok.Setter; import org.apache.commons.lang3.builder.ToStringBuilder; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.LastModifiedBy; +import org.springframework.format.annotation.DateTimeFormat; import java.lang.reflect.Field; -import java.sql.Date; -import java.sql.Timestamp; +import java.util.Date; @Getter @@ -33,11 +33,13 @@ public class MyEntity extends MyObject { @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true) @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; @TableField(fill = FieldFill.INSERT_UPDATE) @ApiModelProperty(value = "更新时间: yyyy-MM-dd HH:mm:ss", hidden = true) @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; /* 分组校验 */ diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyLogicEntity.java b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyLogicEntity.java index 10e433e6..c857dda7 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyLogicEntity.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyLogicEntity.java @@ -13,7 +13,6 @@ import org.springframework.data.annotation.LastModifiedBy; import org.springframework.format.annotation.DateTimeFormat; import java.lang.reflect.Field; import java.sql.Date; -import java.sql.Timestamp; /** * 逻辑删除通用模型 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/job/QuartzLog.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/job/QuartzLog.java index 8f463d50..7bc6f80c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/job/QuartzLog.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/job/QuartzLog.java @@ -1,6 +1,7 @@ package cn.odboy.core.dal.dataobject.job; import cn.odboy.base.MyObject; +import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -9,7 +10,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.sql.Timestamp; +import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; @Data @TableName("system_quartz_log") @@ -46,5 +48,7 @@ public class QuartzLog extends MyObject { @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) - private Timestamp createTime; + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/QiniuContent.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/QiniuContent.java index 4da5b7ae..49de535e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/QiniuContent.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/QiniuContent.java @@ -1,6 +1,7 @@ package cn.odboy.core.dal.dataobject.tools; import cn.odboy.base.MyObject; +import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -9,7 +10,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.sql.Timestamp; +import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; /** * 上传成功后,存储结果 @@ -44,5 +46,7 @@ public class QiniuContent extends MyObject { @TableField(fill = FieldFill.INSERT_UPDATE) @ApiModelProperty(value = "创建或更新时间") - private Timestamp updateTime; + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryDeptRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryDeptRequest.java index 2079734d..6f358817 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryDeptRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryDeptRequest.java @@ -1,8 +1,10 @@ package cn.odboy.core.service.system.dto; +import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.sql.Timestamp; +import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; import java.util.List; @Data @@ -24,5 +26,7 @@ public class QueryDeptRequest { private Boolean pidIsNull; @ApiModelProperty(value = "创建时间") - private List createTime; -} \ No newline at end of file + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private List createTime; +} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryJobRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryJobRequest.java index 301b3975..98c802bb 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryJobRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryJobRequest.java @@ -1,9 +1,11 @@ package cn.odboy.core.service.system.dto; +import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; -import java.sql.Timestamp; +import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; import java.util.List; @@ -18,11 +20,13 @@ public class QueryJobRequest { private Boolean enabled; @ApiModelProperty(value = "创建时间") - private List createTime; + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private List createTime; @ApiModelProperty(value = "页码", example = "1") private Integer page = 1; @ApiModelProperty(value = "每页数据量", example = "10") private Integer size = 10; -} \ No newline at end of file +} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryMenuRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryMenuRequest.java index 2fd473c8..5bcf3934 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryMenuRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryMenuRequest.java @@ -1,8 +1,10 @@ package cn.odboy.core.service.system.dto; +import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.sql.Timestamp; +import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; import java.util.List; @@ -13,7 +15,9 @@ public class QueryMenuRequest { private String blurry; @ApiModelProperty(value = "创建时间") - private List createTime; + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private List createTime; @ApiModelProperty(value = "PID为空查询") private Boolean pidIsNull; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryQuartzJobRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryQuartzJobRequest.java index b403700a..34c684fe 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryQuartzJobRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryQuartzJobRequest.java @@ -1,8 +1,10 @@ package cn.odboy.core.service.system.dto; +import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.sql.Timestamp; +import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; import java.util.List; @@ -16,7 +18,9 @@ public class QueryQuartzJobRequest { private Boolean isSuccess; @ApiModelProperty(value = "创建时间") - private List createTime; + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private List createTime; @ApiModelProperty(value = "页码", example = "1") private Integer page = 1; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryRoleRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryRoleRequest.java index 5efda8d7..5d9db664 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryRoleRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryRoleRequest.java @@ -1,8 +1,10 @@ package cn.odboy.core.service.system.dto; +import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.sql.Timestamp; +import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; import java.util.List; @@ -13,7 +15,9 @@ public class QueryRoleRequest { private String blurry; @ApiModelProperty(value = "创建时间") - private List createTime; + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private List createTime; @ApiModelProperty(value = "页码", example = "1") private Integer page = 1; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryUserRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryUserRequest.java index 6b84699c..355aca7b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryUserRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryUserRequest.java @@ -1,10 +1,12 @@ package cn.odboy.core.service.system.dto; import cn.odboy.base.MyObject; +import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.sql.Timestamp; +import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -29,7 +31,9 @@ public class QueryUserRequest extends MyObject { private Long deptId; @ApiModelProperty(value = "创建时间") - private List createTime; + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private List createTime; @ApiModelProperty(value = "页码", example = "1") private Integer page = 1; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryLocalStorageRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryLocalStorageRequest.java index 6115ee38..d1297022 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryLocalStorageRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryLocalStorageRequest.java @@ -1,8 +1,10 @@ package cn.odboy.core.service.tools.dto; +import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.sql.Timestamp; +import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; import java.util.List; @@ -13,11 +15,13 @@ public class QueryLocalStorageRequest { private String blurry; @ApiModelProperty(value = "创建时间") - private List createTime; + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private List createTime; @ApiModelProperty(value = "页码", example = "1") private Integer page = 1; @ApiModelProperty(value = "每页数据量", example = "10") private Integer size = 10; -} \ No newline at end of file +} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryQiniuRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryQiniuRequest.java index 96052f94..4d223c44 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryQiniuRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryQiniuRequest.java @@ -1,8 +1,10 @@ package cn.odboy.core.service.tools.dto; +import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.sql.Timestamp; +import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; import java.util.List; @@ -13,7 +15,9 @@ public class QueryQiniuRequest { private String key; @ApiModelProperty(value = "创建时间") - private List createTime; + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private List createTime; @ApiModelProperty(value = "页码", example = "1") private Integer page = 1;