diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java index 4f0e1f1ff0..0ba4733a75 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result; +import com.epmet.commons.tools.dto.form.FileCommonDTO; import com.epmet.dto.EventProjectInfoDTO; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; @@ -79,7 +80,7 @@ public class EventDetailResultDTO implements Serializable { /** * 语音附件url集合 */ - private List voiceList; + private List voiceList; /** * 事件附件 */ @@ -127,5 +128,10 @@ public class EventDetailResultDTO implements Serializable { * 附件类型 */ private String type; + + /** + * 附件类型 + */ + private Integer duration; } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventAttachmentEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventAttachmentEntity.java index b28acf8317..658922b493 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventAttachmentEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventAttachmentEntity.java @@ -89,4 +89,9 @@ public class ResiEventAttachmentEntity extends BaseEpmetEntity { */ private String reason; + /** + * 语音或视频时长,秒 + * */ + private Integer duration; + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 6be91e0cdd..90e37213f9 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -216,12 +216,15 @@ public class ResiEventServiceImpl extends BaseServiceImpl eventImgs = new ArrayList<>(); - List voiceList = new ArrayList<>(); + List voiceList = new ArrayList<>(); dto.getAttachmentList().forEach(file->{ if("image".equals(file.getType())){ eventImgs.add(file.getUrl()); }else if("voice".equals(file.getType())){ - voiceList.add(file.getUrl()); + FileCommonDTO fl = new FileCommonDTO(); + fl.setUrl(file.getUrl()); + fl.setDuration(file.getDuration()); + voiceList.add(fl); } }); dto.setEventImgs(eventImgs); @@ -350,6 +353,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl + @@ -155,6 +156,7 @@ ea.id AS resiEventAttachmentId, ea.ATTACHMENT_URL AS url, ea.ATTACHMENT_TYPE AS type, + ea.duration AS duration, IF(ISNULL(em.USER_SHOW_NAME),NULL,concat('人大代表-',em.USER_SHOW_NAME)) AS person, re.GRID_ID AS gridId, re.CREATED_BY AS eventUserId,