diff --git a/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java b/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java index c6e1484..f110c3f 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java @@ -319,10 +319,6 @@ public class PhotoSpeakVideoController extends BaseController { if (record == null) record = new MusicInfo(); record.setType(EnumMouldSendType.build.getCode()); record.setUserId(getMemberId()); - record.setUrl(record.getUrl()); - if (StringUtils.isBlank(record.getUrl())) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "素材为空"); - } if (record.getTitle() == null) { record.setTitle("用户自建"); } diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/MusicInfo.java b/suimangService/src/main/java/com/iformall/domain/po/sm/MusicInfo.java index ea5e669..c0fc9e1 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/MusicInfo.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/MusicInfo.java @@ -1,5 +1,6 @@ package com.iformall.domain.po.sm; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @@ -62,4 +63,7 @@ public class MusicInfo extends TenantEntity { private String title; + @TableField(exist = false) + private String voiceId; + } diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/MusicInfoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/MusicInfoServiceImpl.java index 273ff64..126db46 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/MusicInfoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/MusicInfoServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.sm.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.sm.MusicInfo; @@ -45,10 +46,15 @@ public class MusicInfoServiceImpl implements MusicInfoService { @Override public ResultData saveOrUpdate(MusicInfo record) { - VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(record.getUrl()); + VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(record.getVoiceId()); if (videoDetail.isSuccess() && StringUtils.isNotBlank(videoDetail.getDuration()) && !"0.0".equals(videoDetail.getDuration())) { record.setTime(Long.valueOf(videoDetail.getDuration())); record.setSize(videoDetail.getSize()); + record.setUrl(videoDetail.getVideoUrl()); + } + + if (StringUtils.isBlank(record.getUrl())) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "素材为空"); } Date now = new Date();