屏蔽话题列表去掉话题状态属性

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<List<GovTopicInfoResultDTO>> hiddenList(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){
+    Result<List<GovHiddenTopicInfoResultDTO>> hiddenList(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){
         topicPageFormDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(topicPageFormDTO);
         return resiTopicService.hiddenList(topicPageFormDTO);

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<List<GovTopicInfoResultDTO>> hiddenList(ResiTopicPageFormDTO topicPageFormDTO);
+    Result<List<GovHiddenTopicInfoResultDTO>> hiddenList(ResiTopicPageFormDTO topicPageFormDTO);
 
     /**
      * @Description 政府端群组管理-查看历史话题(分页,允许状态筛选)

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<List<GovTopicInfoResultDTO>> hiddenList(ResiTopicPageFormDTO topicPageFormDTO) {
+    public Result<List<GovHiddenTopicInfoResultDTO>> hiddenList(ResiTopicPageFormDTO topicPageFormDTO) {
         topicPageFormDTO.setPageNo(NumConstant.ONE);
         topicPageFormDTO.setPageSize(NumConstant.MAX);
         Result<List<ResiTopicInfoResultDTO>> topics =  resiGroupFeignClient.getHiddenTopicGov(topicPageFormDTO);
-        List<GovTopicInfoResultDTO> topicsResult = new ArrayList<>();
+        List<GovHiddenTopicInfoResultDTO> 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<List<GovTopicInfoResultDTO>>().ok(topicsResult);
+        return new Result<List<GovHiddenTopicInfoResultDTO>>().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);
             });
         }

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;
+}