议事厅-表决中越来越乱

epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/TopicInfoDTO.java

@@ -30,6 +30,11 @@ public class TopicInfoDTO implements Serializable {
      */
     private List<String> topicImgs;
 
+    /**
+     * 话题语音-2022.10.10
+     */
+    private List<String> topicVoices;
+
     /**
      * 话题发表人（山东路168-尹女士）
      */

epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/HallIcEventDTO.java

@@ -0,0 +1,17 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/10/10 14:47
+ */
+@Data
+public class HallIcEventDTO implements Serializable {
+    private static final long serialVersionUID = -6245586010939647194L;
+    //     todo
+}
+

epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.epmet.dto.TopicInfoDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -41,10 +42,11 @@ public class VotingIssueListResultDTO implements Serializable {
     private String sourceId;
 
     /**
-     * 来源类型 话题：resi_topic；直接立议题：issue；
+     * 来源类型 话题：resi_topic；直接立议题：issue；事件：ic_event
      */
     private String sourceType;
 
+    //最开始 那一版，话题的东西，是放在下面这几列的，做事件转议题时， 单独出来了topicInfoDTO，icEventInfo
     /**
      * 话题图片列表
      */
@@ -67,4 +69,13 @@ public class VotingIssueListResultDTO implements Serializable {
 
     private String longitude;
     private String latitude;
+
+    /**
+     * 话题信息-2022.10.10
+     */
+    private TopicInfoDTO topicInfoDTO;
+    /**
+     * 事件信息-2022.10.10
+     */
+    private HallIcEventDTO icEventInfo;
 }

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java

@@ -179,7 +179,7 @@ public class IssueController {
     }
 
     /**
-     * @Description 获取表决中议题列表
+     * @Description 居民端议事厅-获取表决中议题列表
      * @param issueListFormDTO
      * @return Result<List<VotingIssueListResultDTO>>
      * @author wangc

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java

@@ -118,6 +118,11 @@ public interface IssueService {
      **/
     PublishSuggestionResultDTO publisSuggestion(PublishSuggestionFormDTO formDTO);
 
+    /**
+     * 居民端议事厅-表决中议题列表
+     * @param issueListFormDTO
+     * @return
+     */
     List<VotingIssueListResultDTO> listVotingIssues(CommonIssueListFormDTO issueListFormDTO);
 
     /**

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -405,31 +405,44 @@ public class IssueServiceImpl implements IssueService {
         return govIssueFeignClient.processList(issueId).getData();
     }
 
+    /**
+     * 居民端议事厅-表决中议题列表
+     * @param issueListFormDTO
+     * @return
+     */
     @Override
     public List<VotingIssueListResultDTO> listVotingIssues(CommonIssueListFormDTO issueListFormDTO) {
+        //1、查询表决中的议题列表，issue.created_time降序
         Result<List<VotingIssueListResultDTO>> votingIssueListResult = govIssueFeignClient.votingList(issueListFormDTO);
         if (!votingIssueListResult.success()) {
             throw new RenException(String.format("调用gov-issue查询表决中列表失败"));
         }
         List<VotingIssueListResultDTO> votingIssueList = votingIssueListResult.getData();
         if (votingIssueList != null && !CollectionUtils.isEmpty(votingIssueList)) {
-            List<String> topicIds = votingIssueList.stream().map(i -> i.getSourceId()).collect(Collectors.toList());
+            // 来源于话题的
-            TopicDetailBatchFormDTO form = new TopicDetailBatchFormDTO();
+            List<String> topicIds = votingIssueList.stream().filter(t -> t.getSourceType().equals("resi_topic")).map(i -> i.getSourceId()).collect(Collectors.toList());
-            form.setTopicIdList(topicIds);
+            if (!CollectionUtils.isEmpty(topicIds)) {
-            Result<List<ResiTopicDetailResultDTO>> topicDetailsResult = resiGroupOpenFeignClient.listTopicDetailsByIds(form);
+                TopicDetailBatchFormDTO form = new TopicDetailBatchFormDTO();
-            if (!topicDetailsResult.success()) {
+                form.setTopicIdList(topicIds);
-                logger.error("调用resi-group批量查询详情失败");
+                Result<List<ResiTopicDetailResultDTO>> topicDetailsResult = resiGroupOpenFeignClient.listTopicDetailsByIds(form);
-            } else {
                 List<ResiTopicDetailResultDTO> topicDetails = topicDetailsResult.getData();
-                HashMap<String, ResiTopicDetailResultDTO> rtm = convertTopicDetailList2Map(topicDetails);
+                if (!CollectionUtils.isEmpty(topicDetails)) {
-                votingIssueList.forEach(vi -> {
+                    HashMap<String, ResiTopicDetailResultDTO> rtm = convertTopicDetailList2Map(topicDetails);
-                    ResiTopicDetailResultDTO rr = rtm.get(vi.getSourceId());
+                    votingIssueList.forEach(vi -> {
-                    vi.setTopicImgs(rr == null ? null : rr.getTopicImgs());
+                        ResiTopicDetailResultDTO rr = rtm.get(vi.getSourceId());
-                    vi.setTopicVoices(rr == null ? null : rr.getTopicImgs());
+                        vi.setTopicImgs(rr == null ? null : rr.getTopicImgs());
-                    vi.setTopicContent(rr == null ? "" : rr.getTopicContent());
+                        vi.setTopicVoices(rr == null ? null : rr.getTopicImgs());
-                    vi.setLongitude(rr == null ? "" : rr.getLongitude());
+                        vi.setTopicContent(rr == null ? "" : rr.getTopicContent());
-                    vi.setLatitude(rr == null ? "" : rr.getLatitude());
+                        vi.setLongitude(rr == null ? "" : rr.getLongitude());
-                });
+                        vi.setLatitude(rr == null ? "" : rr.getLatitude());
+                        // todo 赋值话题详情
+                    });
+                }
+            }
+            //来源于事件的
+            List<String> icEventIds = votingIssueList.stream().filter(t -> t.getSourceType().equals("ic_event")).map(i -> i.getSourceId()).collect(Collectors.toList());
+            if(!CollectionUtils.isEmpty(icEventIds)){
+                // todo 查询事件详情
             }
         }
         return votingIssueList;