BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 02bc9d28deaab50b156280899ca0c77fea9a168c

Authored by YunaiV
1 parent 3dd273a3

解决 MapStruct 的时区问题

Inline Side-by-side
Showing 18 changed files with 37 additions and 33 deletions
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/vo/record/AppCombinationRecordRespVO.java
  View file @02bc9d2
... ... @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record;
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5 5  
6   -import java.util.Date;
  6 +import java.time.LocalDateTime;
7 7  
8 8 @Schema(description = "用户 App - 拼团记录 Response VO")
9 9 @Data
... ... @@ -22,7 +22,7 @@ public class AppCombinationRecordRespVO {
22 22 private String avatar;
23 23  
24 24 @Schema(description = "过期时间", requiredMode = Schema.RequiredMode.REQUIRED)
25   - private Date expireTime;
  25 + private LocalDateTime expireTime;
26 26  
27 27 @Schema(description = "可参团人数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
28 28 private Integer userSize;
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
  View file @02bc9d2
... ... @@ -21,7 +21,7 @@ public class AppTradeOrderDetailRespVO {
21 21 private String no;
22 22  
23 23 @Schema(description = "下单时间", requiredMode = Schema.RequiredMode.REQUIRED)
24   - private Date createTime;
  24 + private LocalDateTime createTime;
25 25  
26 26 @Schema(description = "用户备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
27 27 private String userRemark;
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
  View file @02bc9d2
... ... @@ -4,7 +4,7 @@ import cn.iocoder.yudao.module.trade.controller.app.order.vo.item.AppTradeOrderI
4 4 import io.swagger.v3.oas.annotations.media.Schema;
5 5 import lombok.Data;
6 6  
7   -import java.util.Date;
  7 +import java.time.LocalDateTime;
8 8 import java.util.List;
9 9  
10 10 @Schema(description = "用户 App - 订单交易的分页项 Response VO")
... ... @@ -30,7 +30,7 @@ public class AppTradeOrderPageItemRespVO {
30 30 private Boolean commentStatus;
31 31  
32 32 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
33   - private Date createTime;
  33 + private LocalDateTime createTime;
34 34  
35 35 // ========== 价格 + 支付基本信息 ==========
36 36  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
  View file @02bc9d2
... ... @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
4 4 import cn.hutool.core.util.StrUtil;
5 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 6 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
7   -import cn.iocoder.yudao.framework.common.util.date.DateUtils;
8 7 import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
9 8 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
10 9 import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
... ... @@ -45,7 +44,7 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
45 44 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMultiMap;
46 45 import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.addTime;
47 46  
48   -@Mapper(uses = DateUtils.class)
  47 +@Mapper
49 48 public interface TradeOrderConvert {
50 49  
51 50 TradeOrderConvert INSTANCE = Mappers.getMapper(TradeOrderConvert.class);
... ...
yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/account/vo/MpAccountRespVO.java
  View file @02bc9d2
... ... @@ -5,7 +5,7 @@ import lombok.Data;
5 5 import lombok.EqualsAndHashCode;
6 6 import lombok.ToString;
7 7  
8   -import java.util.Date;
  8 +import java.time.LocalDateTime;
9 9  
10 10 @Schema(description = "管理后台 - 公众号账号 Response VO")
11 11 @Data
... ... @@ -20,6 +20,6 @@ public class MpAccountRespVO extends MpAccountBaseVO {
20 20 private String qrCodeUrl;
21 21  
22 22 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
23   - private Date createTime;
  23 + private LocalDateTime createTime;
24 24  
25 25 }
... ...
yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/material/vo/MpMaterialRespVO.java
  View file @02bc9d2
... ... @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.mp.controller.admin.material.vo;
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5 5  
6   -import java.util.Date;
  6 +import java.time.LocalDateTime;
7 7  
8 8 @Schema(description = "管理后台 - 公众号素材 Response VO")
9 9 @Data
... ... @@ -42,6 +42,6 @@ public class MpMaterialRespVO {
42 42 private String introduction;
43 43  
44 44 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
45   - private Date createTime;
  45 + private LocalDateTime createTime;
46 46  
47 47 }
... ...
yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/menu/vo/MpMenuRespVO.java
  View file @02bc9d2
... ... @@ -5,7 +5,7 @@ import lombok.Data;
5 5 import lombok.EqualsAndHashCode;
6 6 import lombok.ToString;
7 7  
8   -import java.util.Date;
  8 +import java.time.LocalDateTime;
9 9  
10 10 @Schema(description = "管理后台 - 公众号菜单 Response VO")
11 11 @Data
... ... @@ -23,6 +23,6 @@ public class MpMenuRespVO extends MpMenuBaseVO {
23 23 private String appId;
24 24  
25 25 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
26   - private Date createTime;
  26 + private LocalDateTime createTime;
27 27  
28 28 }
... ...
yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/message/vo/autoreply/MpAutoReplyRespVO.java
  View file @02bc9d2
... ... @@ -5,7 +5,7 @@ import lombok.Data;
5 5 import lombok.EqualsAndHashCode;
6 6 import lombok.ToString;
7 7  
8   -import java.util.Date;
  8 +import java.time.LocalDateTime;
9 9  
10 10 @Schema(description = "管理后台 - 公众号自动回复 Response VO")
11 11 @Data
... ... @@ -22,6 +22,6 @@ public class MpAutoReplyRespVO extends MpAutoReplyBaseVO {
22 22 private String appId;
23 23  
24 24 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
25   - private Date createTime;
  25 + private LocalDateTime createTime;
26 26  
27 27 }
... ...
yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/message/vo/message/MpMessageRespVO.java
  View file @02bc9d2
... ... @@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
6 6 import lombok.Data;
7 7 import me.chanjar.weixin.common.api.WxConsts;
8 8  
  9 +import java.time.LocalDateTime;
9 10 import java.util.Date;
10 11 import java.util.List;
11 12  
... ... @@ -96,6 +97,6 @@ public class MpMessageRespVO {
96 97 private String eventKey;
97 98  
98 99 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
99   - private Date createTime;
  100 + private LocalDateTime createTime;
100 101  
101 102 }
... ...
yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/statistics/vo/MpStatisticsInterfaceSummaryRespVO.java
  View file @02bc9d2
... ... @@ -3,14 +3,14 @@ package cn.iocoder.yudao.module.mp.controller.admin.statistics.vo;
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5 5  
6   -import java.util.Date;
  6 +import java.time.LocalDateTime;
7 7  
8 8 @Schema(description = "管理后台 - 某一天的接口分析数据 Response VO")
9 9 @Data
10 10 public class MpStatisticsInterfaceSummaryRespVO {
11 11  
12 12 @Schema(description = "日期", requiredMode = Schema.RequiredMode.REQUIRED)
13   - private Date refDate;
  13 + private LocalDateTime refDate;
14 14  
15 15 @Schema(description = "通过服务器配置地址获得消息后，被动回复粉丝消息的次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
16 16 private Integer callbackCount;
... ...
yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/statistics/vo/MpStatisticsUpstreamMessageRespVO.java
  View file @02bc9d2
... ... @@ -3,14 +3,14 @@ package cn.iocoder.yudao.module.mp.controller.admin.statistics.vo;
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5 5  
6   -import java.util.Date;
  6 +import java.time.LocalDateTime;
7 7  
8 8 @Schema(description = "管理后台 - 某一天的粉丝增减数据 Response VO")
9 9 @Data
10 10 public class MpStatisticsUpstreamMessageRespVO {
11 11  
12 12 @Schema(description = "日期", requiredMode = Schema.RequiredMode.REQUIRED)
13   - private Date refDate;
  13 + private LocalDateTime refDate;
14 14  
15 15 @Schema(description = "上行发送了（向公众号发送了）消息的粉丝数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
16 16 private Integer messageUser;
... ...
yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/statistics/vo/MpStatisticsUserCumulateRespVO.java
  View file @02bc9d2
... ... @@ -3,14 +3,14 @@ package cn.iocoder.yudao.module.mp.controller.admin.statistics.vo;
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5 5  
6   -import java.util.Date;
  6 +import java.time.LocalDateTime;
7 7  
8 8 @Schema(description = "管理后台 - 某一天的消息发送概况数据 Response VO")
9 9 @Data
10 10 public class MpStatisticsUserCumulateRespVO {
11 11  
12 12 @Schema(description = "日期", requiredMode = Schema.RequiredMode.REQUIRED)
13   - private Date refDate;
  13 + private LocalDateTime refDate;
14 14  
15 15 @Schema(description = "累计粉丝量", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
16 16 private Integer cumulateUser;
... ...
yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/statistics/vo/MpStatisticsUserSummaryRespVO.java
  View file @02bc9d2
... ... @@ -3,14 +3,14 @@ package cn.iocoder.yudao.module.mp.controller.admin.statistics.vo;
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5 5  
6   -import java.util.Date;
  6 +import java.time.LocalDateTime;
7 7  
8 8 @Schema(description = "管理后台 - 某一天的粉丝增减数据 Response VO")
9 9 @Data
10 10 public class MpStatisticsUserSummaryRespVO {
11 11  
12 12 @Schema(description = "日期", requiredMode = Schema.RequiredMode.REQUIRED)
13   - private Date refDate;
  13 + private LocalDateTime refDate;
14 14  
15 15 @Schema(description = "粉丝来源", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
16 16 private Integer userSource;
... ...
yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/tag/vo/MpTagRespVO.java
  View file @02bc9d2
... ... @@ -5,7 +5,7 @@ import lombok.Data;
5 5 import lombok.EqualsAndHashCode;
6 6 import lombok.ToString;
7 7  
8   -import java.util.Date;
  8 +import java.time.LocalDateTime;
9 9  
10 10 @Schema(description = "管理后台 - 公众号标签 Response VO")
11 11 @Data
... ... @@ -20,6 +20,6 @@ public class MpTagRespVO extends MpTagBaseVO {
20 20 private Integer count;
21 21  
22 22 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
23   - private Date createTime;
  23 + private LocalDateTime createTime;
24 24  
25 25 }
... ...
yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/user/vo/MpUserRespVO.java
  View file @02bc9d2
... ... @@ -48,6 +48,6 @@ public class MpUserRespVO {
48 48 private String appId;
49 49  
50 50 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
51   - private Date createTime;
  51 + private LocalDateTime createTime;
52 52  
53 53 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java
  View file @02bc9d2
1 1 package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4   -import lombok.*;
5   -import java.util.*;
  4 +import lombok.Data;
  5 +import lombok.EqualsAndHashCode;
  6 +import lombok.ToString;
  7 +
  8 +import java.time.LocalDateTime;
6 9  
7 10 @Schema(description = "管理后台 - 站内信 Response VO")
8 11 @Data
... ... @@ -14,6 +17,6 @@ public class NotifyMessageRespVO extends NotifyMessageBaseVO {
14 17 private Long id;
15 18  
16 19 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
17   - private Date createTime;
  20 + private LocalDateTime createTime;
18 21  
19 22 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java
  View file @02bc9d2
... ... @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.*;
  5 +
  6 +import java.time.LocalDateTime;
5 7 import java.util.*;
6 8  
7 9 @Schema(description = "管理后台 - 站内信模版 Response VO")
... ... @@ -17,6 +19,6 @@ public class NotifyTemplateRespVO extends NotifyTemplateBaseVO {
17 19 private List<String> params;
18 20  
19 21 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
20   - private Date createTime;
  22 + private LocalDateTime createTime;
21 23  
22 24 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvert.java
  View file @02bc9d2
1 1 package cn.iocoder.yudao.module.system.convert.notify;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4   -import cn.iocoder.yudao.framework.common.util.date.DateUtils;
5 4 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO;
6 5 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
7 6 import org.mapstruct.Mapper;
... ... @@ -14,7 +13,7 @@ import java.util.List;
14 13 *
15 14 * @author xrcoder
16 15 */
17   -@Mapper(uses = DateUtils.class)
  16 +@Mapper
18 17 public interface NotifyMessageConvert {
19 18  
20 19 NotifyMessageConvert INSTANCE = Mappers.getMapper(NotifyMessageConvert.class);
... ...