From 9bcd84636e3ea3ca67fcf1fbccc1d113cb1f8d5b Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 17 Dec 2020 11:15:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=AF=9D=E9=A2=98=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E8=A1=A8=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java    | 2 +-
 .../epmet/modules/topic/entity/ResiTopicAttachmentEntity.java | 2 +-
 .../modules/topic/service/impl/ResiTopicServiceImpl.java      | 1 +
 .../db/migration/V0.0.8__alter_resi_topic_attachment.sql      | 4 ++++
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.8__alter_resi_topic_attachment.sql

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java
index 2a6afb9d90..1b57a93f72 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java
@@ -54,7 +54,7 @@ public class ResiTopicAttachmentDTO implements Serializable {
 	private String attachmentFormat;
 
     /**
-     * 附件类型（（图片 - figure、 视频 - video、 语音 - voice、 文档 - doc））
+     * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
      */
 	private String attachmentType;
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java
index 16138229bf..ca5980cffc 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java
@@ -54,7 +54,7 @@ public class ResiTopicAttachmentEntity extends BaseEpmetEntity {
 	private String attachmentFormat;
 
     /**
-     * 附件类型（（图片 - figure、 视频 - video、 语音 - voice、 文档 - doc））
+     * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
      */
 	private String attachmentType;
 
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 a2fc3925b0..9b0d2cf52f 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
@@ -315,6 +315,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 attachment.setCreatedBy(tokenDto.getUserId());
                 attachment.setAttachmentFormat(url.substring(url.lastIndexOf(".") + NumConstant.ONE).toLowerCase());
                 attachment.setSort(sort++);
+                attachment.setAttachmentType("image");
                 resiTopicAttachmentDao.insertOne(attachment);
             }
         }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.8__alter_resi_topic_attachment.sql b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.8__alter_resi_topic_attachment.sql
new file mode 100644
index 0000000000..b632949988
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.8__alter_resi_topic_attachment.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `resi_topic_attachment`
+MODIFY COLUMN `ATTACHMENT_TYPE`  varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））' AFTER `ATTACHMENT_FORMAT`;
+
+UPDATE resi_topic_attachment SET ATTACHMENT_TYPE = 'image';
\ No newline at end of file