From 1973866e3daa5415ed6432f228440c0fa39440a5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 18 Dec 2020 13:33:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E8=AF=9D=E9=A2=98=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E8=AF=AD=E9=9F=B3=E6=88=96=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E9=99=84=E4=BB=B6=E7=9A=84=E6=97=B6=E9=95=BF=EF=BC=8C?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=98=AF=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/group/dto/topic/ResiTopicAttachmentDTO.java | 10 ++++++++++ .../resi/group/dto/topic/TopicDraftAttachmentDTO.java | 5 +++++ .../topic/entity/ResiTopicAttachmentEntity.java | 5 +++++ .../topic/entity/TopicDraftAttachmentEntity.java | 5 +++++ .../modules/topic/excel/TopicDraftAttachmentExcel.java | 3 +++ .../migration/V0.0.9__alter_resi_topic_attachment.sql | 3 +++ 6 files changed, 31 insertions(+) create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.9__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 1b57a93f72..60d086d6fc 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 @@ -63,6 +63,16 @@ public class ResiTopicAttachmentDTO implements Serializable { */ private String attachmentUrl; + /** + * 排序字段，解决多张图片的createdTime相同时的排序问题 + * */ + private Integer sort; + + /** + * 语音或视频时长，秒 + * */ + private Integer duration; + /** * 删除标记 0：未删除，1：已删除 */ diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftAttachmentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftAttachmentDTO.java index 35ec1d69ee..d6e3337904 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftAttachmentDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftAttachmentDTO.java @@ -84,6 +84,11 @@ public class TopicDraftAttachmentDTO implements Serializable { */ private String status; + /** + * 语音或视频时长，秒 + * */ + private Integer duration; + /** * 删除标记 0：未删除，1：已删除 */ 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 ca5980cffc..6b63177921 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 @@ -68,4 +68,9 @@ public class ResiTopicAttachmentEntity extends BaseEpmetEntity { * */ private Integer sort; + /** + * 语音或视频时长，秒 + * */ + private Integer duration; + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftAttachmentEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftAttachmentEntity.java index 0929f7adba..f29df3c174 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftAttachmentEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftAttachmentEntity.java @@ -84,4 +84,9 @@ public class TopicDraftAttachmentEntity extends BaseEpmetEntity { */ private String status; + /** + * 语音或视频时长，秒 + * */ + private Integer duration; + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/excel/TopicDraftAttachmentExcel.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/excel/TopicDraftAttachmentExcel.java index bf2dfe4460..f16f960fb4 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/excel/TopicDraftAttachmentExcel.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/excel/TopicDraftAttachmentExcel.java @@ -59,6 +59,9 @@ public class TopicDraftAttachmentExcel { "block: 结果违规；rejected：人工审核驳回;approved：人工审核通过）现在图片是同步审核的，所以图片只有auto_passed一种状态") private String status; + @Excel(name = "语音或视频时长，秒") + private Integer duration; + @Excel(name = "删除标记 0：未删除，1：已删除") private String delFlag; diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.9__alter_resi_topic_attachment.sql b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.9__alter_resi_topic_attachment.sql new file mode 100644 index 0000000000..938161ca0e --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.9__alter_resi_topic_attachment.sql @@ -0,0 +1,3 @@ +ALTER TABLE `resi_topic_attachment` +MODIFY COLUMN `SORT` int(1) NOT NULL COMMENT '排序字段' AFTER `ATTACHMENT_URL`, +ADD COLUMN `DURATION` int(11) UNSIGNED ZEROFILL NULL DEFAULT 0 COMMENT '语音或视频时长，秒' AFTER `SORT`;