From 7db93fa1630e8251985d3cec5706802da49af119 Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Wed, 5 Jul 2023 14:10:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=86=E9=A2=91=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E9=80=BB=E8=BE=91=E3=80=81=E6=96=B0=E5=A2=9E=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=A3=80=E6=9F=A5=E6=8E=A5=E5=8F=A3=E3=80=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=99=BE=E5=BA=A6API=E6=8E=A5=E5=8F=A3=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0=E9=98=BF=E9=87=8C=E4=BA=91?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E3=80=81=E6=96=B0=E5=A2=9E=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PhotoSpeakVideoController.java | 2 +- .../com/iformall/domain/po/sm/VoiceInfo.java | 4 ++- .../service/sm/impl/VoiceInfoServiceImpl.java | 25 +++++++++++++++---- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java b/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java index 5c1fa8e..746391d 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java @@ -473,7 +473,7 @@ public class PhotoSpeakVideoController extends BaseController { @ApiOperation("获取视频是否生成成功") @GetMapping("/checkVideoStatus") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - public ResultData checkVideoStatus(List list) { + public ResultData checkVideoStatus(@RequestParam("list") List list) { return photoSpeakVideoService.checkVideoStatus(getMemberId(),list); } } diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceInfo.java b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceInfo.java index 2c99ba0..1d1b732 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceInfo.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceInfo.java @@ -4,6 +4,7 @@ package com.iformall.domain.po.sm; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.VoiceInfoVo; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -60,7 +61,7 @@ public class VoiceInfo extends TenantEntity { */ private String styleList; @TableField(exist = false) - private List style; + private List style; /** * 创建时间 */ @@ -77,4 +78,5 @@ public class VoiceInfo extends TenantEntity { * 年纪类型 EnumAgeType */ private Integer ageType; + private String voiceUrl; } 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 283cc21..adc81b4 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 @@ -8,6 +8,7 @@ import com.google.common.collect.Lists; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; 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.mapper.VoiceMapper; @@ -28,6 +29,8 @@ public class VoiceInfoServiceImpl implements VoiceInfoService { private VoiceMapper voiceMapper; private final static String str = "\uD83D\uDD57"; + private final static String url = "https://suimang.oss-accelerate.aliyuncs.com/builtin/tts_all_sample/"; + private final static String end = ".wav"; @Override public List chooseType(Long id) { @@ -35,14 +38,26 @@ public class VoiceInfoServiceImpl implements VoiceInfoService { voiceInfos.forEach(x -> { if (StringUtils.isNotEmpty(x.getStyleList())) { List strings = JSON.parseArray(x.getStyleList(), String.class); - List list = new ArrayList<>(); + List list = new ArrayList<>(); strings.forEach(y->{ - list.add(EnumSpeakType.getEnum(y).getMessage()); + VoiceInfoVo infoVo = new VoiceInfoVo(); + infoVo.setName(EnumSpeakType.getEnum(y).getMessage()); + infoVo.setUrl(url + x.getMouldSmId() + "_" + y + end); + list.add(infoVo); }); + + VoiceInfoVo infoVo = new VoiceInfoVo(); + infoVo.setName(EnumSpeakType.getEnum(0).getMessage()); + infoVo.setUrl(url + x.getMouldSmId() + "_" + "default" + end); + list.add(infoVo); x.setStyle(list); } else { - x.setStyle(Lists.newArrayList()); - + List list = Lists.newArrayList(); + VoiceInfoVo infoVo = new VoiceInfoVo(); + infoVo.setName(EnumSpeakType.getEnum(0).getMessage()); + infoVo.setUrl(url + x.getMouldSmId() + "_" + "default" + end); + list.add(infoVo); + x.setStyle(list); } }); return voiceInfos; @@ -66,7 +81,7 @@ public class VoiceInfoServiceImpl implements VoiceInfoService { param.setGender(voiceInfo.getSex() == 1 ? "male" : "female"); AiPreviewResult result = AiVideoHelper.voicePreview(param); if (result.isSuccess()){ - return new ResultData(result.getUrl()); + return new ResultData(result.getTime()); } return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(), result.getMsg()); }