From eb863ab50321a968481f630a1e23a702803965ab Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 24 Dec 2020 14:18:44 +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

---
 .../dto/topic/form/CreateTopicFormDTO.java    |  8 ++---
 .../resi/group/dto/topic/form/FileDTO.java    | 24 +++++++++++++
 .../service/impl/TopicDraftServiceImpl.java   | 36 +++++++++++++------
 3 files changed, 53 insertions(+), 15 deletions(-)
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/FileDTO.java

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateTopicFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateTopicFormDTO.java
index a53a8f36db..9369470945 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateTopicFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateTopicFormDTO.java
@@ -62,17 +62,17 @@ public class CreateTopicFormDTO implements Serializable {
 	/**
 	 * 图片附件
 	 */
-	private List<String> imageList;
+	private List<FileDTO> imageList;
 	/**
 	 * 文件附件
 	 */
-	private List<String> docList;
+	private List<FileDTO> docList;
 	/**
 	 * 语音附件
 	 */
-	private List<String> voiceList;
+	private List<FileDTO> voiceList;
 	/**
 	 * 视频附件
 	 */
-	private List<String> videoList;
+	private List<FileDTO> videoList;
 }
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
new file mode 100644
index 0000000000..eb187299e0
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/FileDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.resi.group.dto.topic.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/12/24 14:09
+ */
+@NoArgsConstructor
+@Data
+public class FileDTO implements Serializable {
+
+	private static final long serialVersionUID = -3930520724652521552L;
+	private String name;
+	private String url;
+	private String type;
+	private String format;
+	private Integer size;
+	private Integer duration;
+}
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 bbe765d0de..098c05e3b1 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
@@ -279,18 +279,18 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         if(CollectionUtils.isNotEmpty(formDTO.getImageList())){
             TopicDraftAttachmentDTO attachment = new TopicDraftAttachmentDTO();
             int sort = 0;
-            for(String url : formDTO.getImageList()){
-                attachment.setAttachmentUrl(url);
+            for(FileDTO file : formDTO.getImageList()){
+                attachment.setAttachmentUrl(file.getUrl());
                 attachment.setTopicDraftId(topic.getId());
                 attachment.setCreatedBy(tokenDto.getUserId());
-                attachment.setAttachmentFormat(url.substring(url.lastIndexOf(".") + NumConstant.ONE).toLowerCase());
+                attachment.setAttachmentFormat(file.getUrl().substring(file.getUrl().lastIndexOf(".") + NumConstant.ONE).toLowerCase());
                 attachment.setSort(sort++);
                 attachment.setAttachmentType("image");
                 topicDraftAttachmentService.save(attachment);
 
                 ImgTaskDTO task = new ImgTaskDTO();
                 task.setDataId(attachment.getId());
-                task.setUrl(url);
+                task.setUrl(file.getUrl());
                 imageDTOList.add(task);
             }
         }
@@ -298,18 +298,18 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         if(CollectionUtils.isNotEmpty(formDTO.getVideoList())){
             TopicDraftAttachmentDTO attachment = new TopicDraftAttachmentDTO();
             int sort = 0;
-            for(String url : formDTO.getVideoList()){
-                attachment.setAttachmentUrl(url);
+            for(FileDTO file : formDTO.getVideoList()){
+                attachment.setAttachmentUrl(file.getUrl());
                 attachment.setTopicDraftId(topic.getId());
                 attachment.setCreatedBy(tokenDto.getUserId());
-                attachment.setAttachmentFormat(url.substring(url.lastIndexOf(".") + NumConstant.ONE).toLowerCase());
+                attachment.setAttachmentFormat(file.getUrl().substring(file.getUrl().lastIndexOf(".") + NumConstant.ONE).toLowerCase());
                 attachment.setSort(sort++);
                 attachment.setAttachmentType("voice");
                 topicDraftAttachmentService.save(attachment);
 
                 VoiceTaskDTO task = new VoiceTaskDTO();
                 task.setDataId(attachment.getId());
-                task.setUrl(url);
+                task.setUrl(file.getUrl());
                 voiceDTOList.add(task);
             }
         }
@@ -671,17 +671,31 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         if(CollectionUtils.isNotEmpty(formDTO.getImageList())){
             ResiTopicAttachmentEntity attachment = new ResiTopicAttachmentEntity();
             int sort = 0;
-            for(String url : formDTO.getImageList()){
-                attachment.setAttachmentUrl(url);
+            for(FileDTO file : formDTO.getImageList()){
+                attachment.setAttachmentUrl(file.getUrl());
                 attachment.setTopicId(topic.getId());
                 attachment.setCreatedBy(tokenDto.getUserId());
-                attachment.setAttachmentFormat(url.substring(url.lastIndexOf(".") + NumConstant.ONE).toLowerCase());
+                attachment.setAttachmentFormat(file.getUrl().substring(file.getUrl().lastIndexOf(".") + NumConstant.ONE).toLowerCase());
                 attachment.setSort(sort++);
                 attachment.setAttachmentType("image");
                 resiTopicAttachmentDao.insertOne(attachment);
             }
         }
 
+        if(CollectionUtils.isNotEmpty(formDTO.getVoiceList())){
+            ResiTopicAttachmentEntity attachment = new ResiTopicAttachmentEntity();
+            int sort = 0;
+            for(FileDTO file : formDTO.getVoiceList()){
+                attachment.setAttachmentUrl(file.getUrl());
+                attachment.setTopicId(topic.getId());
+                attachment.setCreatedBy(tokenDto.getUserId());
+                attachment.setAttachmentFormat(file.getUrl().substring(file.getUrl().lastIndexOf(".") + NumConstant.ONE).toLowerCase());
+                attachment.setSort(sort++);
+                attachment.setAttachmentType("voice");
+                resiTopicAttachmentDao.insertOne(attachment);
+            }
+        }
+
         //3.话题操作记录
         ResiTopicOperationEntity operation = new ResiTopicOperationEntity();
         operation.setTopicId(topic.getId());