From 4651a731319a7b7046dda5ab75fc650960ca9662 Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Tue, 13 Jun 2023 15:09:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=9F=B3=E4=B9=90=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E8=A7=86=E9=A2=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/sm/PhotoSpeakVideo.java | 3 +++ .../service/sm/impl/PhotoSpeakVideoServiceImpl.java | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/PhotoSpeakVideo.java b/suimangService/src/main/java/com/iformall/domain/po/sm/PhotoSpeakVideo.java index 0d278b5..54621f5 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/PhotoSpeakVideo.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/PhotoSpeakVideo.java @@ -150,5 +150,8 @@ public class PhotoSpeakVideo extends TenantEntity { @TableField(exist = false) private List videoStatuss; + + @TableField(exist = false) + private Long musicId; } diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java index 434c5aa..c374dfb 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java @@ -135,10 +135,13 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { voiceMaterialService.handVideoUrl(voiceMaterial); record.setVoiceMaterialUrl(voiceMaterial.getMaterial()); }else if(EnumVoiceFrom.MUSIC.getCode().equals(record.getVoiceFrom())){ - if(record.getVoiceMaterialId() == null){ + if(record.getMusicId() == null){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未选择音乐文件"); } - MusicInfo musicInfo = musicInfoService.getById(record.getVoiceMaterialId()); + MusicInfo musicInfo = musicInfoService.getById(record.getMusicId()); + if (ObjectUtils.isEmpty(musicInfo)){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未查询到音乐文件"); + } record.setVoiceMaterialUrl(musicInfo.getUrl()); } } @@ -232,8 +235,8 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { msg = "未找到上传声音文件"; } } else if (EnumVoiceFrom.MUSIC.getCode().equals(voiceFrom)) { - Long materialId = photoSpeakVideo.getVoiceMaterialId(); - MusicInfo musicInfo = musicInfoService.getById(materialId); + Long musicId = photoSpeakVideo.getMusicId(); + MusicInfo musicInfo = musicInfoService.getById(musicId); if (ObjectUtils.isEmpty(musicInfo)){ msg = "未找到音乐文件"; }