diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyNewsListExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyNewsListExe.java index 01d27d18..b5a6e880 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyNewsListExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyNewsListExe.java @@ -3,17 +3,13 @@ package com.red.circle.other.app.command.family; import com.red.circle.framework.dto.PageResult; import com.red.circle.other.app.dto.clientobject.family.FamilyNewsCO; import com.red.circle.other.app.dto.cmd.family.FamilyNewsListCmd; -import com.red.circle.other.infra.database.rds.entity.family.FamilyMemberInfo; import com.red.circle.other.infra.database.rds.entity.family.FamilyNews; -import com.red.circle.other.infra.database.rds.service.family.FamilyMemberInfoService; import com.red.circle.other.infra.database.rds.service.family.FamilyNewsService; +import com.red.circle.other.infra.utils.ZonedDateTimeUtils; import com.red.circle.tool.core.collection.CollectionUtils; -import com.red.circle.tool.core.date.TimestampUtils; -import java.text.SimpleDateFormat; -import java.time.LocalDateTime; import java.util.List; -import java.util.Objects; + import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -64,6 +60,6 @@ public class FamilyNewsListExe { .setTargetUserId(news.getTargetUserId()) .setTargetUserName(news.getTargetUserName()) .setContent(news.getContent()) - .setCreateTime(news.getCreateTime().toString()); + .setCreateTime(ZonedDateTimeUtils.toTimestamp(news.getCreateTime())); } } diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyNewsCO.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyNewsCO.java index 6a4da5ae..844faf9d 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyNewsCO.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyNewsCO.java @@ -3,6 +3,8 @@ package com.red.circle.other.app.dto.clientobject.family; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import java.io.Serializable; +import java.sql.Timestamp; + import lombok.Data; import lombok.experimental.Accessors; @@ -56,6 +58,6 @@ public class FamilyNewsCO implements Serializable { /** * 创建时间 */ - private String createTime; + private Timestamp createTime; }