|
|
@@ -221,10 +221,7 @@ public class PhotoSpeakVideoController extends BaseController { |
|
|
|
if(StringUtils.isBlank(voiceMaterialUrl)){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未找到上传声音文件"); |
|
|
|
} |
|
|
|
if(voiceMaterial.getTime() == null){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"音频时长为空"); |
|
|
|
} |
|
|
|
videoUpd.setVideoTime(String.valueOf(voiceMaterial.getTime())); |
|
|
|
// videoUpd.setVideoTime(String.valueOf(voiceMaterial.getTime())); |
|
|
|
} else if (EnumVoiceFrom.MUSIC.getCode().equals(voiceFrom)) { |
|
|
|
Long musicId = mouldVideo.getMusicId(); |
|
|
|
MusicInfo musicInfo = musicInfoService.getById(musicId); |
|
|
@@ -238,7 +235,7 @@ public class PhotoSpeakVideoController extends BaseController { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"音乐时长为空"); |
|
|
|
} |
|
|
|
videoUpd.setVoiceMaterialUrl(musicInfo.getUrl()); |
|
|
|
videoUpd.setVideoTime(String.valueOf(musicInfo.getTime())); |
|
|
|
// videoUpd.setVideoTime(String.valueOf(musicInfo.getTime())); |
|
|
|
} else { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"声音数据异常"); |
|
|
|
} |
|
|
|