From 804dc29508a3ae3f8aba5261e4756b813f58528f Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 30 Apr 2020 13:45:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E8=AF=9D=E9=A2=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=8E=BB=E6=8E=89=E8=AF=9D=E9=A2=98=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/ResiTopicController.java | 3 +- .../com/epmet/service/ResiTopicService.java | 3 +- .../service/impl/ResiTopicServiceImpl.java | 10 ++-- .../result/GovHiddenTopicInfoResultDTO.java | 51 +++++++++++++++++++ 4 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovHiddenTopicInfoResultDTO.java diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java index 890c15008b..f821df15c9 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java @@ -8,6 +8,7 @@ import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO; import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; +import com.epmet.resi.group.dto.topic.result.GovHiddenTopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.GovTopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; import com.epmet.service.ResiTopicService; @@ -34,7 +35,7 @@ public class ResiTopicController { * @Date 2020.04.01 16:45 **/ @PostMapping("hiddenlist") - Result> hiddenList(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){ + Result> hiddenList(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){ topicPageFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(topicPageFormDTO); return resiTopicService.hiddenList(topicPageFormDTO); diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiTopicService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiTopicService.java index b98abc1fc7..ac12a9fcfe 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiTopicService.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiTopicService.java @@ -5,6 +5,7 @@ import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO; import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; +import com.epmet.resi.group.dto.topic.result.GovHiddenTopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.GovTopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; @@ -20,7 +21,7 @@ public interface ResiTopicService { * @Author wangc * @Date 2020.04.01 16:45 **/ - Result> hiddenList(ResiTopicPageFormDTO topicPageFormDTO); + Result> hiddenList(ResiTopicPageFormDTO topicPageFormDTO); /** * @Description 政府端群组管理-查看历史话题(分页,允许状态筛选) 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 2df8a3d933..9d5318b595 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 @@ -8,6 +8,7 @@ import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO; import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; +import com.epmet.resi.group.dto.topic.result.GovHiddenTopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.GovTopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; @@ -33,14 +34,14 @@ public class ResiTopicServiceImpl implements ResiTopicService { * @Date 2020.04.01 16:45 **/ @Override - public Result> hiddenList(ResiTopicPageFormDTO topicPageFormDTO) { + public Result> hiddenList(ResiTopicPageFormDTO topicPageFormDTO) { topicPageFormDTO.setPageNo(NumConstant.ONE); topicPageFormDTO.setPageSize(NumConstant.MAX); Result> topics = resiGroupFeignClient.getHiddenTopicGov(topicPageFormDTO); - List topicsResult = new ArrayList<>(); + List topicsResult = new ArrayList<>(); if(topics.success() && null != topics.getData() && topics.getData().size() > NumConstant.ZERO) { topics.getData().forEach(top -> { - GovTopicInfoResultDTO govTopic = new GovTopicInfoResultDTO(); + GovHiddenTopicInfoResultDTO govTopic = new GovHiddenTopicInfoResultDTO(); govTopic.setTopicContent(top.getTopicContent()); govTopic.setUserId(top.getUserId()); govTopic.setUserHeadPhoto(top.getReleaseUserHeadPhoto()); @@ -51,7 +52,7 @@ public class ResiTopicServiceImpl implements ResiTopicService { topicsResult.add(govTopic); }); } - return new Result>().ok(topicsResult); + return new Result>().ok(topicsResult); } @@ -77,6 +78,7 @@ public class ResiTopicServiceImpl implements ResiTopicService { govTopic.setTopicId(top.getTopicId()); govTopic.setTopicRealseTime(top.getReleaseTime().getTime()); 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 new file mode 100644 index 0000000000..ad5bcf4f61 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovHiddenTopicInfoResultDTO.java @@ -0,0 +1,51 @@ +package com.epmet.resi.group.dto.topic.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @ClassName GovHiddenTopicInfoResultDTO + * @Auth wangc + * @Date 2020-04-30 13:42 + */ +@Data +public class GovHiddenTopicInfoResultDTO implements Serializable { + private static final long serialVersionUID = 6993547275260814680L; + + /** + * 作者的Id + * */ + private String userId; + + /** + * 用户头像 + * */ + private String userHeadPhoto; + + /** + * 用户昵称 + * */ + private String userNickName; + + /** + * 话题Id + * */ + private String topicId; + + /** + * 话题内容 + * */ + private String topicContent; + + /** + * 话题发布时间 时间戳 + * */ + private Long topicRealseTime; + + /** + * 话题的第一张图片地址 + * */ + private String topicFirstPhoto; +}