Commit f08ffcd710a307daadad425dbb6c6bb072ac2b96
1 parent
4fccb519
feat: 修改返回日期信息
Showing
6 changed files
with
23 additions
and
4 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java
| @@ -6,9 +6,12 @@ import com.baomidou.mybatisplus.annotation.TableId; | @@ -6,9 +6,12 @@ import com.baomidou.mybatisplus.annotation.TableId; | ||
| 6 | import com.baomidou.mybatisplus.annotation.TableName; | 6 | import com.baomidou.mybatisplus.annotation.TableName; |
| 7 | import java.io.Serializable; | 7 | import java.io.Serializable; |
| 8 | import java.util.Date; | 8 | import java.util.Date; |
| 9 | + | ||
| 10 | +import com.fasterxml.jackson.annotation.JsonFormat; | ||
| 9 | import lombok.Data; | 11 | import lombok.Data; |
| 10 | import lombok.EqualsAndHashCode; | 12 | import lombok.EqualsAndHashCode; |
| 11 | import lombok.ToString; | 13 | import lombok.ToString; |
| 14 | +import org.springframework.format.annotation.DateTimeFormat; | ||
| 12 | 15 | ||
| 13 | /** | 16 | /** |
| 14 | * 匹配处理场所人员表 | 17 | * 匹配处理场所人员表 |
| @@ -57,12 +60,16 @@ public class GarOrderMatchAsk implements Serializable { | @@ -57,12 +60,16 @@ public class GarOrderMatchAsk implements Serializable { | ||
| 57 | * | 60 | * |
| 58 | */ | 61 | */ |
| 59 | @TableField(fill = FieldFill.INSERT) | 62 | @TableField(fill = FieldFill.INSERT) |
| 63 | + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") | ||
| 64 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") | ||
| 60 | private Date garCreateTime; | 65 | private Date garCreateTime; |
| 61 | 66 | ||
| 62 | /** | 67 | /** |
| 63 | * | 68 | * |
| 64 | */ | 69 | */ |
| 65 | @TableField(fill = FieldFill.INSERT_UPDATE) | 70 | @TableField(fill = FieldFill.INSERT_UPDATE) |
| 71 | + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") | ||
| 72 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") | ||
| 66 | private Date garUpdateTime; | 73 | private Date garUpdateTime; |
| 67 | 74 | ||
| 68 | /** | 75 | /** |
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/AddressDto.java
| 1 | package com.trash.garbage.pojo.dto; | 1 | package com.trash.garbage.pojo.dto; |
| 2 | 2 | ||
| 3 | import lombok.Data; | 3 | import lombok.Data; |
| 4 | +import lombok.EqualsAndHashCode; | ||
| 5 | +import lombok.ToString; | ||
| 4 | 6 | ||
| 5 | import javax.validation.constraints.NotBlank; | 7 | import javax.validation.constraints.NotBlank; |
| 6 | import javax.validation.constraints.NotEmpty; | 8 | import javax.validation.constraints.NotEmpty; |
| @@ -9,7 +11,8 @@ import javax.validation.constraints.NotNull; | @@ -9,7 +11,8 @@ import javax.validation.constraints.NotNull; | ||
| 9 | /** | 11 | /** |
| 10 | * @author 20412 | 12 | * @author 20412 |
| 11 | */ | 13 | */ |
| 12 | -@Data | 14 | +@EqualsAndHashCode |
| 15 | +@ToString | ||
| 13 | public class AddressDto { | 16 | public class AddressDto { |
| 14 | private String garAddressId; | 17 | private String garAddressId; |
| 15 | @NotBlank(message = "所在地区不能为空") | 18 | @NotBlank(message = "所在地区不能为空") |
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/LoginDto.java
| 1 | package com.trash.garbage.pojo.dto; | 1 | package com.trash.garbage.pojo.dto; |
| 2 | 2 | ||
| 3 | import lombok.Data; | 3 | import lombok.Data; |
| 4 | +import lombok.EqualsAndHashCode; | ||
| 5 | +import lombok.ToString; | ||
| 4 | 6 | ||
| 5 | /** | 7 | /** |
| 6 | * @author 20412 | 8 | * @author 20412 |
| 7 | */ | 9 | */ |
| 8 | -@Data | 10 | +@ToString |
| 11 | +@EqualsAndHashCode | ||
| 9 | public class LoginDto { | 12 | public class LoginDto { |
| 10 | private String tel; | 13 | private String tel; |
| 11 | private String code; | 14 | private String code; |
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderWebDto.java
| 1 | package com.trash.garbage.pojo.dto; | 1 | package com.trash.garbage.pojo.dto; |
| 2 | 2 | ||
| 3 | +import lombok.EqualsAndHashCode; | ||
| 3 | import lombok.ToString; | 4 | import lombok.ToString; |
| 4 | 5 | ||
| 5 | import javax.validation.constraints.NotEmpty; | 6 | import javax.validation.constraints.NotEmpty; |
| 6 | 7 | ||
| 7 | @ToString | 8 | @ToString |
| 9 | +@EqualsAndHashCode | ||
| 8 | public class OrderWebDto { | 10 | public class OrderWebDto { |
| 9 | /** | 11 | /** |
| 10 | * 公司名称 | 12 | * 公司名称 |
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/UploadDto.java
| 1 | package com.trash.garbage.pojo.dto; | 1 | package com.trash.garbage.pojo.dto; |
| 2 | 2 | ||
| 3 | import lombok.Data; | 3 | import lombok.Data; |
| 4 | +import lombok.EqualsAndHashCode; | ||
| 5 | +import lombok.ToString; | ||
| 4 | 6 | ||
| 5 | import java.util.List; | 7 | import java.util.List; |
| 6 | 8 | ||
| 7 | /** | 9 | /** |
| 8 | * @author 20412 | 10 | * @author 20412 |
| 9 | */ | 11 | */ |
| 10 | -@Data | 12 | +@ToString |
| 13 | +@EqualsAndHashCode | ||
| 11 | public class UploadDto { | 14 | public class UploadDto { |
| 12 | private String garOrderId; | 15 | private String garOrderId; |
| 13 | private Integer type; | 16 | private Integer type; |