From adeb5670816cb4bfe2d9e5a84d8e1990a152ccb9 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 29 Dec 2020 16:03:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/resi/group/dto/topic/form/FileDTO.java    |  5 +++++
 .../dto/topic/result/DraftDetailResultDTO.java      |  5 +++--
 .../topic/service/impl/TopicDraftServiceImpl.java   | 13 +++++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/FileDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/FileDTO.java
index eb187299e0..1288ebeac1 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/FileDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/FileDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.resi.group.dto.topic.form;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -15,10 +16,14 @@ import java.io.Serializable;
 public class FileDTO implements Serializable {
 
 	private static final long serialVersionUID = -3930520724652521552L;
+	@JsonIgnore
 	private String name;
 	private String url;
+	@JsonIgnore
 	private String type;
+	@JsonIgnore
 	private String format;
+	@JsonIgnore
 	private Integer size;
 	private Integer duration;
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/DraftDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/DraftDetailResultDTO.java
index cd0772719d..b21ed3c51b 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/DraftDetailResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/DraftDetailResultDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.resi.group.dto.topic.result;
 
+import com.epmet.resi.group.dto.topic.form.FileDTO;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -54,6 +55,6 @@ public class DraftDetailResultDTO implements Serializable {
 	/**
 	 * 音频附件集合
 	 */
-	private List<String> voiceList;
-	private List<String> videoList;
+	private List<FileDTO> voiceList;
+	private List<FileDTO> videoList;
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
index 5db696e85c..23f30e2584 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
@@ -570,6 +570,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         result.setReleaseTime(new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE).format(entity.getCreatedTime()));
         result.setTopicContent(entity.getTopicContent());
         result.setReleaseAddress(entity.getAddress());
+        result.setReason(entity.getDraftReason());
         if (TopicConstant.AUDITING.equals(entity.getDraftStatus()) || TopicConstant.REVIEW.equals(entity.getDraftStatus())) {
             result.setStatus(TopicConstant.AUDITING);
         } else if (TopicConstant.BLOCK.equals(entity.getDraftStatus()) || TopicConstant.REJECTED.equals(entity.getDraftStatus())) {
@@ -581,7 +582,13 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         result.setImageList(imageUrls);
 
         //3.查询话题音频附件
-        List<String> voiceUrls = topicDraftAttachmentService.getFileList(formDTO.getTopicDraftId(), TopicConstant.VOICE).stream().map(TopicDraftAttachmentDTO::getAttachmentUrl).collect(Collectors.toList());
+        List<FileDTO> voiceUrls =
+                topicDraftAttachmentService.getFileList(formDTO.getTopicDraftId(), TopicConstant.VOICE).stream().map(item ->{
+                    FileDTO fileDTO = new FileDTO();
+                    fileDTO.setUrl(item.getAttachmentUrl());
+                    fileDTO.setDuration(item.getDuration());
+                    return fileDTO;
+                }).collect(Collectors.toList());
         result.setVoiceList(voiceUrls);
 
         //3.拿取用户信息
@@ -654,7 +661,9 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
                 breviary.append("\"");
                 breviary.append(draft.getTopicContent().length() > NumConstant.TEN ?  (draft.getTopicContent().substring(NumConstant.TEN) + "…") : draft.getTopicContent());
                 breviary.append("\"");
-            }else breviary.append("语音话题");
+            }else {
+                breviary.append("语音话题");
+            }
             sendMqMsg(draft.getCreatedBy(), draft.getCustomerId(),draft.getCreatedTime(),resiGroupRedis.get(draft.getGroupId()).getGroupName(),breviary.toString());
         }
         //记录操作记录