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()); } }