Browse Source

修改视频创建逻辑、新增图片检查接口、新增百度API接口、修改上传阿里云检查、新增回调接口

private_deployment
lrh 1 year ago
parent
commit
7db93fa163
3 changed files with 24 additions and 7 deletions
  1. +1
    -1
      suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java
  2. +3
    -1
      suimangService/src/main/java/com/iformall/domain/po/sm/VoiceInfo.java
  3. +20
    -5
      suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java

+ 1
- 1
suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java View File

@@ -473,7 +473,7 @@ public class PhotoSpeakVideoController extends BaseController {
@ApiOperation("获取视频是否生成成功") @ApiOperation("获取视频是否生成成功")
@GetMapping("/checkVideoStatus") @GetMapping("/checkVideoStatus")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
public ResultData checkVideoStatus(List<Long> list) {
public ResultData checkVideoStatus(@RequestParam("list") List<Long> list) {
return photoSpeakVideoService.checkVideoStatus(getMemberId(),list); return photoSpeakVideoService.checkVideoStatus(getMemberId(),list);
} }
} }

+ 3
- 1
suimangService/src/main/java/com/iformall/domain/po/sm/VoiceInfo.java View File

@@ -4,6 +4,7 @@ package com.iformall.domain.po.sm;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.VoiceInfoVo;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
@@ -60,7 +61,7 @@ public class VoiceInfo extends TenantEntity {
*/ */
private String styleList; private String styleList;
@TableField(exist = false) @TableField(exist = false)
private List<String> style;
private List<VoiceInfoVo> style;
/** /**
* 创建时间 * 创建时间
*/ */
@@ -77,4 +78,5 @@ public class VoiceInfo extends TenantEntity {
* 年纪类型 EnumAgeType * 年纪类型 EnumAgeType
*/ */
private Integer ageType; private Integer ageType;
private String voiceUrl;
} }

+ 20
- 5
suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java View File

@@ -8,6 +8,7 @@ import com.google.common.collect.Lists;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.sm.VoiceInfo; import com.iformall.domain.po.sm.VoiceInfo;
import com.iformall.domain.vo.VoiceInfoVo;
import com.iformall.enums.EnumSex; import com.iformall.enums.EnumSex;
import com.iformall.enums.EnumSpeakType; import com.iformall.enums.EnumSpeakType;
import com.iformall.mapper.VoiceMapper; import com.iformall.mapper.VoiceMapper;
@@ -28,6 +29,8 @@ public class VoiceInfoServiceImpl implements VoiceInfoService {
private VoiceMapper voiceMapper; private VoiceMapper voiceMapper;


private final static String str = "\uD83D\uDD57"; 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 @Override
public List<VoiceInfo> chooseType(Long id) { public List<VoiceInfo> chooseType(Long id) {
@@ -35,14 +38,26 @@ public class VoiceInfoServiceImpl implements VoiceInfoService {
voiceInfos.forEach(x -> { voiceInfos.forEach(x -> {
if (StringUtils.isNotEmpty(x.getStyleList())) { if (StringUtils.isNotEmpty(x.getStyleList())) {
List<String> strings = JSON.parseArray(x.getStyleList(), String.class); List<String> strings = JSON.parseArray(x.getStyleList(), String.class);
List<String> list = new ArrayList<>();
List<VoiceInfoVo> list = new ArrayList<>();
strings.forEach(y->{ 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); x.setStyle(list);
} else { } else {
x.setStyle(Lists.newArrayList());

List<VoiceInfoVo> 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; return voiceInfos;
@@ -66,7 +81,7 @@ public class VoiceInfoServiceImpl implements VoiceInfoService {
param.setGender(voiceInfo.getSex() == 1 ? "male" : "female"); param.setGender(voiceInfo.getSex() == 1 ? "male" : "female");
AiPreviewResult result = AiVideoHelper.voicePreview(param); AiPreviewResult result = AiVideoHelper.voicePreview(param);
if (result.isSuccess()){ if (result.isSuccess()){
return new ResultData(result.getUrl());
return new ResultData(result.getTime());
} }
return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(), result.getMsg()); return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(), result.getMsg());
} }


Loading…
Cancel
Save