From 1d4231a21d432f4775bd439ab29ce71b11fbfdf7 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 23 Dec 2020 17:05:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E9=99=84=E4=BB=B6=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/TopicAttachmentResultDTO.java      |  6 ++---
 .../dto/topic/result/TopicFileResultDTO.java  | 26 +++++++++++++++++++
 .../service/impl/ResiTopicServiceImpl.java    | 15 ++++++-----
 3 files changed, 38 insertions(+), 9 deletions(-)
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicFileResultDTO.java

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicAttachmentResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicAttachmentResultDTO.java
index 0b28664ce0..fa4bb92fdb 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicAttachmentResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicAttachmentResultDTO.java
@@ -17,14 +17,14 @@ public class TopicAttachmentResultDTO implements Serializable {
     /**
      * 文件附件Url集合
      */
-    private LinkedList<String> docList;
+    private LinkedList<TopicFileResultDTO> docList;
     /**
      * 语音附件Url集合
      */
-    private LinkedList<String> voiceList;
+    private LinkedList<TopicFileResultDTO> voiceList;
     /**
      * 视频附件Url集合
      */
-    private LinkedList<String> videoList;
+    private LinkedList<TopicFileResultDTO> videoList;
 
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicFileResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicFileResultDTO.java
new file mode 100644
index 0000000000..88a3a0061c
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicFileResultDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.resi.group.dto.topic.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+
+/**
+ * @Author sun
+ * @Description 获取话题附件信息-接口返参
+ */
+@Data
+public class TopicFileResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -8606257390921799432L;
+
+    /**
+     * 文件Url
+     */
+    private String url;
+    /**
+     * 语音或视频文件的时长，单位毫秒
+     */
+    private Integer duration;
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 0dfd79c075..dedf0a4bf3 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -1869,18 +1869,21 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             return resultDTO;
         }
         //2.封装数据并返回
-        LinkedList<String> docList = new LinkedList<>();
-        LinkedList<String> voiceList = new LinkedList<>();
-        LinkedList<String> videoList = new LinkedList<>();
+        LinkedList<TopicFileResultDTO> docList = new LinkedList<>();
+        LinkedList<TopicFileResultDTO> voiceList = new LinkedList<>();
+        LinkedList<TopicFileResultDTO> videoList = new LinkedList<>();
         list.forEach(l->{
+            TopicFileResultDTO dto = new TopicFileResultDTO();
+            dto.setUrl(l.getAttachmentUrl());
+            dto.setDuration(l.getDuration());
             if(TopicConstant.FILE_DOC.equals(l.getAttachmentType())){
-                docList.add(l.getAttachmentUrl());
+                docList.add(dto);
             }
             if(TopicConstant.FILE_VOICE.equals(l.getAttachmentType())){
-                voiceList.add(l.getAttachmentUrl());
+                voiceList.add(dto);
             }
             if(TopicConstant.FILE_VIDEO.equals(l.getAttachmentType())){
-                videoList.add(l.getAttachmentUrl());
+                videoList.add(dto);
             }
         });
         resultDTO.setDocList(docList);