居民端话题详情接口修改，添加屏蔽信息

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicClosingMsgResultDTO.java

@@ -29,4 +29,9 @@ public class ResiTopicClosingMsgResultDTO implements Serializable {
      * */
     private String closeReason;
 
+    /**
+     * 关闭人头像（11-19新增）
+     * */
+    private String closeUserHeadPhoto;
+
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java

@@ -76,5 +76,8 @@ public class ResiTopicIncludeIssueDetailResultDTO implements Serializable {
      */
     private List<String> badgeList;
 
-
+    /**
+     * 话题被屏蔽详情
+     */
+    private TopicHiddenDetailDTO hiddenDetail;
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicHiddenDetailDTO.java

@@ -0,0 +1,35 @@
+package com.epmet.resi.group.dto.topic.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 屏蔽详情（11-19新增）
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/11/19 16:44
+ */
+@Data
+public class TopicHiddenDetailDTO implements Serializable {
+    private static final long serialVersionUID = -2038917156628406348L;
+    @JsonIgnore
+    private String operateUserId;
+    /**
+     * 屏蔽操作人，其实就是组长
+     * */
+    private String operateUserName;
+    /**
+     * 屏蔽操作人的头像
+     * */
+    private String operateUserHeadPhoto;
+    /**
+     * 屏蔽时间
+     * */
+    private Long hiddenDateTime;
+    /**
+     * 屏蔽理由
+     * */
+    private String hiddenReason;
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -78,9 +79,9 @@ import com.epmet.resi.group.dto.topic.TopicInfoDTO;
 import com.epmet.resi.group.dto.topic.form.CheckTopicPublisherFormDTO;
 import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO;
 import com.epmet.resi.group.dto.topic.form.*;
-import com.epmet.resi.group.dto.topic.result.*;
 import com.epmet.resi.group.dto.topic.result.CheckTopicPublisherResultDTO;
 import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO;
+import com.epmet.resi.group.dto.topic.result.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -666,6 +667,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         closeDetail.setCloseReason(ModuleConstant.EMPTY_STR);
         closeDetail.setCloseUserName(ModuleConstant.EMPTY_STR);
         closeDetail.setCloseDateTime(NumConstant.MINUS_ONE_L);
+        closeDetail.setCloseUserHeadPhoto(StrConstant.EPMETY_STR);
         if(StringUtils.equals(ModuleConstant.TOPIC_STATUS_CLOSED,topicDetail.getStatus())){
             QueryWrapper<ResiTopicOperationEntity> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR);
@@ -685,11 +687,37 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                         resiGroupMemberRedis.get(topicDetail.getGroupId(),records.get(0).getCreatedBy());
                 if(null != closedBy){
                     closeDetail.setCloseUserName(closedBy.getUserShowName());
+                    closeDetail.setCloseUserHeadPhoto(closedBy.getUserHeadPhoto());
                 }
             }
         }
         resultDTO.setCloseDetail(closeDetail);
+        //话题屏蔽详情
+        if(StringUtils.equals(TopicConstant.HIDDEN,topicDetail.getStatus())){
+            TopicHiddenDetailDTO hiddenDetailDTO=new TopicHiddenDetailDTO();
+            hiddenDetailDTO.setHiddenDateTime(NumConstant.MINUS_ONE_L);
+            hiddenDetailDTO.setHiddenReason(StrConstant.EPMETY_STR);
+            hiddenDetailDTO.setOperateUserName(StrConstant.EPMETY_STR);
 
+            QueryWrapper<ResiTopicOperationEntity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR);
+            queryWrapper.eq(ModuleConstant.FILED_TOPIC_ID,topicDetail.getId());
+            queryWrapper.eq(ModuleConstant.FIELD_OPERATION_TYPE,TopicConstant.HIDDEN);
+            queryWrapper.orderByDesc(FieldConstant.CREATED_TIME);
+            List<ResiTopicOperationEntity> records =
+                    resiTopicOperationDao.selectList(queryWrapper);
+            if(null != records && records.size() > NumConstant.ZERO){
+                hiddenDetailDTO.setHiddenReason(records.get(0).getOperationReason());
+                hiddenDetailDTO.setHiddenDateTime(records.get(0).getCreatedTime().getTime()/NumConstant.ONE_THOUSAND);
+                ResiGroupMemberInfoRedisDTO hiddenBy =
+                        resiGroupMemberRedis.get(topicDetail.getGroupId(),records.get(0).getCreatedBy());
+                if (null != hiddenBy && StringUtils.isNotBlank(hiddenBy.getUserShowName())) {
+                    hiddenDetailDTO.setOperateUserName(hiddenBy.getUserShowName());
+                    hiddenDetailDTO.setOperateUserHeadPhoto(hiddenBy.getUserHeadPhoto());
+                }
+                resultDTO.setHiddenDetail(hiddenDetailDTO);
+            }
+        }
         //4.获取用户徽章的信息
         List<String> userId = new LinkedList<>();userId.add(topicDetail.getCreatedBy());
         String customerId;