diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java index 9d5318b595..23dbd83fe9 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java @@ -47,7 +47,7 @@ public class ResiTopicServiceImpl implements ResiTopicService { govTopic.setUserHeadPhoto(top.getReleaseUserHeadPhoto()); govTopic.setUserNickName(top.getReleaseUserName()); govTopic.setTopicId(top.getTopicId()); - govTopic.setTopicRealseTime(top.getReleaseTime().getTime()); + govTopic.setTopicRealseTime(top.getReleaseTime()); govTopic.setTopicFirstPhoto(top.getFirstPhoto()); topicsResult.add(govTopic); }); @@ -76,7 +76,7 @@ public class ResiTopicServiceImpl implements ResiTopicService { govTopic.setUserHeadPhoto(top.getReleaseUserHeadPhoto()); govTopic.setUserNickName(top.getReleaseUserName()); govTopic.setTopicId(top.getTopicId()); - govTopic.setTopicRealseTime(top.getReleaseTime().getTime()); + govTopic.setTopicRealseTime(top.getReleaseTime()); govTopic.setTopicFirstPhoto(top.getFirstPhoto()); govTopic.setTopicState(top.getStatus()); topicsResult.add(govTopic); diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovHiddenTopicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovHiddenTopicInfoResultDTO.java index ad5bcf4f61..6008f6c0eb 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovHiddenTopicInfoResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovHiddenTopicInfoResultDTO.java @@ -1,8 +1,10 @@ package com.epmet.resi.group.dto.topic.result; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * @Description @@ -40,9 +42,10 @@ public class GovHiddenTopicInfoResultDTO implements Serializable { private String topicContent; /** - * 话题发布时间 时间戳 + * 话题发布时间 * */ - private Long topicRealseTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date topicRealseTime; /** * 话题的第一张图片地址 diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicInfoResultDTO.java index 296f4fcc36..d60a24382d 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicInfoResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicInfoResultDTO.java @@ -1,8 +1,11 @@ package com.epmet.resi.group.dto.topic.result; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.util.Date; + /** * @Description @@ -40,9 +43,10 @@ public class GovTopicInfoResultDTO implements Serializable { private String topicContent; /** - * 话题发布时间 时间戳 + * 话题发布时间 * */ - private Long topicRealseTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date topicRealseTime; /** * 话题的第一张图片地址