From 4fbfabcbb1c8a8348946843b109b221108f36f47 Mon Sep 17 00:00:00 2001 From: xmzhao71 Date: Fri, 27 Oct 2023 15:09:18 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=9F=B3?= =?UTF-8?q?=E8=89=B2=E9=A2=84=E8=A7=88=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/vo/sm/PreviewVoiceVO.java | 11 +++++++++++ .../com/iformall/service/sm/VoiceInfoService.java | 6 ++---- .../service/sm/impl/VoiceInfoServiceImpl.java | 12 ++++++------ 3 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 suimangService/src/main/java/com/iformall/domain/vo/sm/PreviewVoiceVO.java diff --git a/suimangService/src/main/java/com/iformall/domain/vo/sm/PreviewVoiceVO.java b/suimangService/src/main/java/com/iformall/domain/vo/sm/PreviewVoiceVO.java new file mode 100644 index 0000000..c8cf05f --- /dev/null +++ b/suimangService/src/main/java/com/iformall/domain/vo/sm/PreviewVoiceVO.java @@ -0,0 +1,11 @@ +package com.iformall.domain.vo.sm; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +@ApiModel(value = "音色预览请求参数") +@Data +public class PreviewVoiceVO { + private Double time; + private String url; +} diff --git a/suimangService/src/main/java/com/iformall/service/sm/VoiceInfoService.java b/suimangService/src/main/java/com/iformall/service/sm/VoiceInfoService.java index 00ed921..d285b2d 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/VoiceInfoService.java +++ b/suimangService/src/main/java/com/iformall/service/sm/VoiceInfoService.java @@ -1,10 +1,8 @@ package com.iformall.service.sm; -import com.iformall.common.ErrorCode; -import com.iformall.common.ResultData; +import com.iformall.domain.vo.sm.PreviewVoiceVO; import com.iformall.domain.po.sm.VoiceInfo; -import com.iformall.domain.po.sm.VoiceLanguage; import com.iformall.sm.AiPreviewParam; import java.util.List; @@ -15,5 +13,5 @@ public interface VoiceInfoService { VoiceInfo getById(Long voiceMouldId); - Double previewVoice(AiPreviewParam aiPreviewParam); + PreviewVoiceVO previewVoice(AiPreviewParam aiPreviewParam); } diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java index 496ce20..41bd14e 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java @@ -2,14 +2,12 @@ package com.iformall.service.sm.impl; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.google.common.collect.Lists; import com.iformall.common.ErrorCode; -import com.iformall.common.ResultData; +import com.iformall.domain.vo.sm.PreviewVoiceVO; import com.iformall.domain.po.sm.VoiceInfo; import com.iformall.domain.vo.VoiceInfoVo; -import com.iformall.enums.EnumSex; import com.iformall.enums.EnumSpeakType; import com.iformall.exception.BizException; import com.iformall.file.aliyun.bean.AliyunOSSConfig; @@ -20,7 +18,6 @@ import com.iformall.utils.Constant; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.util.ObjectUtils; import java.util.ArrayList; import java.util.List; @@ -79,7 +76,7 @@ public class VoiceInfoServiceImpl implements VoiceInfoService { } @Override - public Double previewVoice(AiPreviewParam aiPreviewParam) { + public PreviewVoiceVO previewVoice(AiPreviewParam aiPreviewParam) { VoiceInfo voiceInfo = voiceMapper.selectOne(new LambdaQueryWrapper() .eq(VoiceInfo::getIsDel, 0) .eq(VoiceInfo::getId, aiPreviewParam.getVoice_id())); @@ -92,7 +89,10 @@ public class VoiceInfoServiceImpl implements VoiceInfoService { param.setGender(voiceInfo.getSex() == 1 ? "male" : "female"); AiPreviewResult result = AiVideoHelper.voicePreview(param); if (result.isSuccess()){ - return result.getTime(); + PreviewVoiceVO vo = new PreviewVoiceVO(); + vo.setTime(result.getTime()); + vo.setUrl(result.getUrl()); + return vo; } throw new BizException(result.getCode(), result.getMsgInfo(result.getCode(),result.getMsg())); }