refactor(system): 优化时间格式处理
- 替换 Timestamp 类型为 Date 类型 - 添加 @JSONField 和 @DateTimeFormat 注解以统一时间格式 - 更新相关实体类和 DTO 类中的时间字段
This commit is contained in:
@@ -10,9 +10,9 @@ import lombok.Setter;
|
|||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
import org.springframework.data.annotation.CreatedBy;
|
import org.springframework.data.annotation.CreatedBy;
|
||||||
import org.springframework.data.annotation.LastModifiedBy;
|
import org.springframework.data.annotation.LastModifiedBy;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.sql.Date;
|
import java.util.Date;
|
||||||
import java.sql.Timestamp;
|
|
||||||
|
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@@ -33,11 +33,13 @@ public class MyEntity extends MyObject {
|
|||||||
@TableField(fill = FieldFill.INSERT)
|
@TableField(fill = FieldFill.INSERT)
|
||||||
@ApiModelProperty(value = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true)
|
@ApiModelProperty(value = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true)
|
||||||
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
|
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date createTime;
|
private Date createTime;
|
||||||
|
|
||||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||||
@ApiModelProperty(value = "更新时间: yyyy-MM-dd HH:mm:ss", hidden = true)
|
@ApiModelProperty(value = "更新时间: yyyy-MM-dd HH:mm:ss", hidden = true)
|
||||||
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
|
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date updateTime;
|
private Date updateTime;
|
||||||
|
|
||||||
/* 分组校验 */
|
/* 分组校验 */
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ import org.springframework.data.annotation.LastModifiedBy;
|
|||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.sql.Date;
|
import java.sql.Date;
|
||||||
import java.sql.Timestamp;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 逻辑删除通用模型
|
* 逻辑删除通用模型
|
||||||
|
|||||||
+6
-2
@@ -1,6 +1,7 @@
|
|||||||
package cn.odboy.core.dal.dataobject.job;
|
package cn.odboy.core.dal.dataobject.job;
|
||||||
|
|
||||||
import cn.odboy.base.MyObject;
|
import cn.odboy.base.MyObject;
|
||||||
|
import com.alibaba.fastjson2.annotation.JSONField;
|
||||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
import com.baomidou.mybatisplus.annotation.IdType;
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
@@ -9,7 +10,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
|
|||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import java.sql.Timestamp;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@TableName("system_quartz_log")
|
@TableName("system_quartz_log")
|
||||||
@@ -46,5 +48,7 @@ public class QuartzLog extends MyObject {
|
|||||||
|
|
||||||
@TableField(fill = FieldFill.INSERT)
|
@TableField(fill = FieldFill.INSERT)
|
||||||
@ApiModelProperty(value = "创建时间", hidden = true)
|
@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;
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-2
@@ -1,6 +1,7 @@
|
|||||||
package cn.odboy.core.dal.dataobject.tools;
|
package cn.odboy.core.dal.dataobject.tools;
|
||||||
|
|
||||||
import cn.odboy.base.MyObject;
|
import cn.odboy.base.MyObject;
|
||||||
|
import com.alibaba.fastjson2.annotation.JSONField;
|
||||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
import com.baomidou.mybatisplus.annotation.IdType;
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
@@ -9,7 +10,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
|
|||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
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)
|
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||||
@ApiModelProperty(value = "创建或更新时间")
|
@ApiModelProperty(value = "创建或更新时间")
|
||||||
private Timestamp updateTime;
|
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private Date updateTime;
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-2
@@ -1,8 +1,10 @@
|
|||||||
package cn.odboy.core.service.system.dto;
|
package cn.odboy.core.service.system.dto;
|
||||||
|
|
||||||
|
import com.alibaba.fastjson2.annotation.JSONField;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import java.sql.Timestamp;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@@ -24,5 +26,7 @@ public class QueryDeptRequest {
|
|||||||
private Boolean pidIsNull;
|
private Boolean pidIsNull;
|
||||||
|
|
||||||
@ApiModelProperty(value = "创建时间")
|
@ApiModelProperty(value = "创建时间")
|
||||||
private List<Timestamp> createTime;
|
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private List<Date> createTime;
|
||||||
}
|
}
|
||||||
+6
-2
@@ -1,9 +1,11 @@
|
|||||||
package cn.odboy.core.service.system.dto;
|
package cn.odboy.core.service.system.dto;
|
||||||
|
|
||||||
|
import com.alibaba.fastjson2.annotation.JSONField;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import java.sql.Timestamp;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
@@ -18,7 +20,9 @@ public class QueryJobRequest {
|
|||||||
private Boolean enabled;
|
private Boolean enabled;
|
||||||
|
|
||||||
@ApiModelProperty(value = "创建时间")
|
@ApiModelProperty(value = "创建时间")
|
||||||
private List<Timestamp> createTime;
|
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private List<Date> createTime;
|
||||||
|
|
||||||
@ApiModelProperty(value = "页码", example = "1")
|
@ApiModelProperty(value = "页码", example = "1")
|
||||||
private Integer page = 1;
|
private Integer page = 1;
|
||||||
|
|||||||
+6
-2
@@ -1,8 +1,10 @@
|
|||||||
package cn.odboy.core.service.system.dto;
|
package cn.odboy.core.service.system.dto;
|
||||||
|
|
||||||
|
import com.alibaba.fastjson2.annotation.JSONField;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import java.sql.Timestamp;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
@@ -13,7 +15,9 @@ public class QueryMenuRequest {
|
|||||||
private String blurry;
|
private String blurry;
|
||||||
|
|
||||||
@ApiModelProperty(value = "创建时间")
|
@ApiModelProperty(value = "创建时间")
|
||||||
private List<Timestamp> createTime;
|
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private List<Date> createTime;
|
||||||
|
|
||||||
@ApiModelProperty(value = "PID为空查询")
|
@ApiModelProperty(value = "PID为空查询")
|
||||||
private Boolean pidIsNull;
|
private Boolean pidIsNull;
|
||||||
|
|||||||
+6
-2
@@ -1,8 +1,10 @@
|
|||||||
package cn.odboy.core.service.system.dto;
|
package cn.odboy.core.service.system.dto;
|
||||||
|
|
||||||
|
import com.alibaba.fastjson2.annotation.JSONField;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import java.sql.Timestamp;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
@@ -16,7 +18,9 @@ public class QueryQuartzJobRequest {
|
|||||||
private Boolean isSuccess;
|
private Boolean isSuccess;
|
||||||
|
|
||||||
@ApiModelProperty(value = "创建时间")
|
@ApiModelProperty(value = "创建时间")
|
||||||
private List<Timestamp> createTime;
|
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private List<Date> createTime;
|
||||||
|
|
||||||
@ApiModelProperty(value = "页码", example = "1")
|
@ApiModelProperty(value = "页码", example = "1")
|
||||||
private Integer page = 1;
|
private Integer page = 1;
|
||||||
|
|||||||
+6
-2
@@ -1,8 +1,10 @@
|
|||||||
package cn.odboy.core.service.system.dto;
|
package cn.odboy.core.service.system.dto;
|
||||||
|
|
||||||
|
import com.alibaba.fastjson2.annotation.JSONField;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import java.sql.Timestamp;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
@@ -13,7 +15,9 @@ public class QueryRoleRequest {
|
|||||||
private String blurry;
|
private String blurry;
|
||||||
|
|
||||||
@ApiModelProperty(value = "创建时间")
|
@ApiModelProperty(value = "创建时间")
|
||||||
private List<Timestamp> createTime;
|
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private List<Date> createTime;
|
||||||
|
|
||||||
@ApiModelProperty(value = "页码", example = "1")
|
@ApiModelProperty(value = "页码", example = "1")
|
||||||
private Integer page = 1;
|
private Integer page = 1;
|
||||||
|
|||||||
+6
-2
@@ -1,10 +1,12 @@
|
|||||||
package cn.odboy.core.service.system.dto;
|
package cn.odboy.core.service.system.dto;
|
||||||
|
|
||||||
import cn.odboy.base.MyObject;
|
import cn.odboy.base.MyObject;
|
||||||
|
import com.alibaba.fastjson2.annotation.JSONField;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import java.sql.Timestamp;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@@ -29,7 +31,9 @@ public class QueryUserRequest extends MyObject {
|
|||||||
private Long deptId;
|
private Long deptId;
|
||||||
|
|
||||||
@ApiModelProperty(value = "创建时间")
|
@ApiModelProperty(value = "创建时间")
|
||||||
private List<Timestamp> createTime;
|
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private List<Date> createTime;
|
||||||
|
|
||||||
@ApiModelProperty(value = "页码", example = "1")
|
@ApiModelProperty(value = "页码", example = "1")
|
||||||
private Integer page = 1;
|
private Integer page = 1;
|
||||||
|
|||||||
+6
-2
@@ -1,8 +1,10 @@
|
|||||||
package cn.odboy.core.service.tools.dto;
|
package cn.odboy.core.service.tools.dto;
|
||||||
|
|
||||||
|
import com.alibaba.fastjson2.annotation.JSONField;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import java.sql.Timestamp;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
@@ -13,7 +15,9 @@ public class QueryLocalStorageRequest {
|
|||||||
private String blurry;
|
private String blurry;
|
||||||
|
|
||||||
@ApiModelProperty(value = "创建时间")
|
@ApiModelProperty(value = "创建时间")
|
||||||
private List<Timestamp> createTime;
|
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private List<Date> createTime;
|
||||||
|
|
||||||
@ApiModelProperty(value = "页码", example = "1")
|
@ApiModelProperty(value = "页码", example = "1")
|
||||||
private Integer page = 1;
|
private Integer page = 1;
|
||||||
|
|||||||
+6
-2
@@ -1,8 +1,10 @@
|
|||||||
package cn.odboy.core.service.tools.dto;
|
package cn.odboy.core.service.tools.dto;
|
||||||
|
|
||||||
|
import com.alibaba.fastjson2.annotation.JSONField;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import java.sql.Timestamp;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
@@ -13,7 +15,9 @@ public class QueryQiniuRequest {
|
|||||||
private String key;
|
private String key;
|
||||||
|
|
||||||
@ApiModelProperty(value = "创建时间")
|
@ApiModelProperty(value = "创建时间")
|
||||||
private List<Timestamp> createTime;
|
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private List<Date> createTime;
|
||||||
|
|
||||||
@ApiModelProperty(value = "页码", example = "1")
|
@ApiModelProperty(value = "页码", example = "1")
|
||||||
private Integer page = 1;
|
private Integer page = 1;
|
||||||
|
|||||||
Reference in New Issue
Block a user