From a95382aefe1bbefe32a2cd4a24f394ec5aed181d Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Thu, 18 May 2023 10:10:20 +0800 Subject: [PATCH] =?UTF-8?q?#20230510=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E8=A3=85=E7=BD=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shxy/xymanager_common/model/TerminalPhotoListModel.java | 3 +++ .../shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java index cef0ec3..7bf7198 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java @@ -63,5 +63,8 @@ public class TerminalPhotoListModel implements Serializable { @ApiModelProperty(value = "拍照方式", example = "123456") private Integer manualRequest; + @ApiModelProperty(value = "拍照类型", example = "123456") + private Integer mediaType; + } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java index b037971..4f6d98b 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java @@ -107,12 +107,13 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { photoBean.setChannelId(item.getChannelId()); photoBean.setFileSize(item.getFileSize()); photoBean.setHeight(item.getHeight()); + photoBean.setMediaType(item.getMediaType()); if (item.getMediaType() == 0) { photoBean.setPath(photoaddress + item.getPath()); } else { photoBean.setPath(videoaddress + item.getPath()); - if (item.getThumb() != null) { + if (StringUtils.isNotBlank(item.getThumb())) { photoBean.setThumb(videoaddress + item.getThumb()); } }