解决 MapStruct 的时区问题
This commit is contained in:
parent
3dd273a30d
commit
02bc9d28de
|
@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Schema(description = "用户 App - 拼团记录 Response VO")
|
@Schema(description = "用户 App - 拼团记录 Response VO")
|
||||||
@Data
|
@Data
|
||||||
|
@ -22,7 +22,7 @@ public class AppCombinationRecordRespVO {
|
||||||
private String avatar;
|
private String avatar;
|
||||||
|
|
||||||
@Schema(description = "过期时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "过期时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private Date expireTime;
|
private LocalDateTime expireTime;
|
||||||
|
|
||||||
@Schema(description = "可参团人数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
|
@Schema(description = "可参团人数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
|
||||||
private Integer userSize;
|
private Integer userSize;
|
||||||
|
|
|
@ -21,7 +21,7 @@ public class AppTradeOrderDetailRespVO {
|
||||||
private String no;
|
private String no;
|
||||||
|
|
||||||
@Schema(description = "下单时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "下单时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private Date createTime;
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
@Schema(description = "用户备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
|
@Schema(description = "用户备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
|
||||||
private String userRemark;
|
private String userRemark;
|
||||||
|
|
|
@ -4,7 +4,7 @@ import cn.iocoder.yudao.module.trade.controller.app.order.vo.item.AppTradeOrderI
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Schema(description = "用户 App - 订单交易的分页项 Response VO")
|
@Schema(description = "用户 App - 订单交易的分页项 Response VO")
|
||||||
|
@ -30,7 +30,7 @@ public class AppTradeOrderPageItemRespVO {
|
||||||
private Boolean commentStatus;
|
private Boolean commentStatus;
|
||||||
|
|
||||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private Date createTime;
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
// ========== 价格 + 支付基本信息 ==========
|
// ========== 价格 + 支付基本信息 ==========
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
|
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
|
||||||
import cn.iocoder.yudao.framework.common.util.date.DateUtils;
|
|
||||||
import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
|
import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
|
||||||
import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
|
import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
|
||||||
import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
|
import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
|
||||||
|
@ -45,7 +44,7 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
|
||||||
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMultiMap;
|
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMultiMap;
|
||||||
import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.addTime;
|
import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.addTime;
|
||||||
|
|
||||||
@Mapper(uses = DateUtils.class)
|
@Mapper
|
||||||
public interface TradeOrderConvert {
|
public interface TradeOrderConvert {
|
||||||
|
|
||||||
TradeOrderConvert INSTANCE = Mappers.getMapper(TradeOrderConvert.class);
|
TradeOrderConvert INSTANCE = Mappers.getMapper(TradeOrderConvert.class);
|
||||||
|
|
|
@ -5,7 +5,7 @@ import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import lombok.ToString;
|
import lombok.ToString;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Schema(description = "管理后台 - 公众号账号 Response VO")
|
@Schema(description = "管理后台 - 公众号账号 Response VO")
|
||||||
@Data
|
@Data
|
||||||
|
@ -20,6 +20,6 @@ public class MpAccountRespVO extends MpAccountBaseVO {
|
||||||
private String qrCodeUrl;
|
private String qrCodeUrl;
|
||||||
|
|
||||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private Date createTime;
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.mp.controller.admin.material.vo;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Schema(description = "管理后台 - 公众号素材 Response VO")
|
@Schema(description = "管理后台 - 公众号素材 Response VO")
|
||||||
@Data
|
@Data
|
||||||
|
@ -42,6 +42,6 @@ public class MpMaterialRespVO {
|
||||||
private String introduction;
|
private String introduction;
|
||||||
|
|
||||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private Date createTime;
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@ import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import lombok.ToString;
|
import lombok.ToString;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Schema(description = "管理后台 - 公众号菜单 Response VO")
|
@Schema(description = "管理后台 - 公众号菜单 Response VO")
|
||||||
@Data
|
@Data
|
||||||
|
@ -23,6 +23,6 @@ public class MpMenuRespVO extends MpMenuBaseVO {
|
||||||
private String appId;
|
private String appId;
|
||||||
|
|
||||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private Date createTime;
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@ import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import lombok.ToString;
|
import lombok.ToString;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Schema(description = "管理后台 - 公众号自动回复 Response VO")
|
@Schema(description = "管理后台 - 公众号自动回复 Response VO")
|
||||||
@Data
|
@Data
|
||||||
|
@ -22,6 +22,6 @@ public class MpAutoReplyRespVO extends MpAutoReplyBaseVO {
|
||||||
private String appId;
|
private String appId;
|
||||||
|
|
||||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private Date createTime;
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import me.chanjar.weixin.common.api.WxConsts;
|
import me.chanjar.weixin.common.api.WxConsts;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -96,6 +97,6 @@ public class MpMessageRespVO {
|
||||||
private String eventKey;
|
private String eventKey;
|
||||||
|
|
||||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private Date createTime;
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,14 +3,14 @@ package cn.iocoder.yudao.module.mp.controller.admin.statistics.vo;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Schema(description = "管理后台 - 某一天的接口分析数据 Response VO")
|
@Schema(description = "管理后台 - 某一天的接口分析数据 Response VO")
|
||||||
@Data
|
@Data
|
||||||
public class MpStatisticsInterfaceSummaryRespVO {
|
public class MpStatisticsInterfaceSummaryRespVO {
|
||||||
|
|
||||||
@Schema(description = "日期", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "日期", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private Date refDate;
|
private LocalDateTime refDate;
|
||||||
|
|
||||||
@Schema(description = "通过服务器配置地址获得消息后,被动回复粉丝消息的次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
|
@Schema(description = "通过服务器配置地址获得消息后,被动回复粉丝消息的次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
|
||||||
private Integer callbackCount;
|
private Integer callbackCount;
|
||||||
|
|
|
@ -3,14 +3,14 @@ package cn.iocoder.yudao.module.mp.controller.admin.statistics.vo;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Schema(description = "管理后台 - 某一天的粉丝增减数据 Response VO")
|
@Schema(description = "管理后台 - 某一天的粉丝增减数据 Response VO")
|
||||||
@Data
|
@Data
|
||||||
public class MpStatisticsUpstreamMessageRespVO {
|
public class MpStatisticsUpstreamMessageRespVO {
|
||||||
|
|
||||||
@Schema(description = "日期", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "日期", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private Date refDate;
|
private LocalDateTime refDate;
|
||||||
|
|
||||||
@Schema(description = "上行发送了(向公众号发送了)消息的粉丝数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
|
@Schema(description = "上行发送了(向公众号发送了)消息的粉丝数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
|
||||||
private Integer messageUser;
|
private Integer messageUser;
|
||||||
|
|
|
@ -3,14 +3,14 @@ package cn.iocoder.yudao.module.mp.controller.admin.statistics.vo;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Schema(description = "管理后台 - 某一天的消息发送概况数据 Response VO")
|
@Schema(description = "管理后台 - 某一天的消息发送概况数据 Response VO")
|
||||||
@Data
|
@Data
|
||||||
public class MpStatisticsUserCumulateRespVO {
|
public class MpStatisticsUserCumulateRespVO {
|
||||||
|
|
||||||
@Schema(description = "日期", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "日期", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private Date refDate;
|
private LocalDateTime refDate;
|
||||||
|
|
||||||
@Schema(description = "累计粉丝量", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
|
@Schema(description = "累计粉丝量", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
|
||||||
private Integer cumulateUser;
|
private Integer cumulateUser;
|
||||||
|
|
|
@ -3,14 +3,14 @@ package cn.iocoder.yudao.module.mp.controller.admin.statistics.vo;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Schema(description = "管理后台 - 某一天的粉丝增减数据 Response VO")
|
@Schema(description = "管理后台 - 某一天的粉丝增减数据 Response VO")
|
||||||
@Data
|
@Data
|
||||||
public class MpStatisticsUserSummaryRespVO {
|
public class MpStatisticsUserSummaryRespVO {
|
||||||
|
|
||||||
@Schema(description = "日期", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "日期", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private Date refDate;
|
private LocalDateTime refDate;
|
||||||
|
|
||||||
@Schema(description = "粉丝来源", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
|
@Schema(description = "粉丝来源", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
|
||||||
private Integer userSource;
|
private Integer userSource;
|
||||||
|
|
|
@ -5,7 +5,7 @@ import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import lombok.ToString;
|
import lombok.ToString;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Schema(description = "管理后台 - 公众号标签 Response VO")
|
@Schema(description = "管理后台 - 公众号标签 Response VO")
|
||||||
@Data
|
@Data
|
||||||
|
@ -20,6 +20,6 @@ public class MpTagRespVO extends MpTagBaseVO {
|
||||||
private Integer count;
|
private Integer count;
|
||||||
|
|
||||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private Date createTime;
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,6 +48,6 @@ public class MpUserRespVO {
|
||||||
private String appId;
|
private String appId;
|
||||||
|
|
||||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private Date createTime;
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
|
package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
|
||||||
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.Data;
|
||||||
import java.util.*;
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.ToString;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Schema(description = "管理后台 - 站内信 Response VO")
|
@Schema(description = "管理后台 - 站内信 Response VO")
|
||||||
@Data
|
@Data
|
||||||
|
@ -14,6 +17,6 @@ public class NotifyMessageRespVO extends NotifyMessageBaseVO {
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private Date createTime;
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
|
||||||
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
@Schema(description = "管理后台 - 站内信模版 Response VO")
|
@Schema(description = "管理后台 - 站内信模版 Response VO")
|
||||||
|
@ -17,6 +19,6 @@ public class NotifyTemplateRespVO extends NotifyTemplateBaseVO {
|
||||||
private List<String> params;
|
private List<String> params;
|
||||||
|
|
||||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private Date createTime;
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package cn.iocoder.yudao.module.system.convert.notify;
|
package cn.iocoder.yudao.module.system.convert.notify;
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
import cn.iocoder.yudao.framework.common.util.date.DateUtils;
|
|
||||||
import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO;
|
import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO;
|
||||||
import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
|
import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
|
||||||
import org.mapstruct.Mapper;
|
import org.mapstruct.Mapper;
|
||||||
|
@ -14,7 +13,7 @@ import java.util.List;
|
||||||
*
|
*
|
||||||
* @author xrcoder
|
* @author xrcoder
|
||||||
*/
|
*/
|
||||||
@Mapper(uses = DateUtils.class)
|
@Mapper
|
||||||
public interface NotifyMessageConvert {
|
public interface NotifyMessageConvert {
|
||||||
|
|
||||||
NotifyMessageConvert INSTANCE = Mappers.getMapper(NotifyMessageConvert.class);
|
NotifyMessageConvert INSTANCE = Mappers.getMapper(NotifyMessageConvert.class);
|
||||||
|
|
Loading…
Reference in New Issue