@@ -158,7 +158,6 @@ public class VoiceMouldController extends BaseController { | |||||
return new ResultData(voiceInfoService.chooseType(id)); | return new ResultData(voiceInfoService.chooseType(id)); | ||||
} | } | ||||
@Deprecated | |||||
@AuthIgnore | @AuthIgnore | ||||
@ApiOperation("TTS音色预览") | @ApiOperation("TTS音色预览") | ||||
@PostMapping("/preview_bak") | @PostMapping("/preview_bak") | ||||
@@ -167,14 +166,4 @@ public class VoiceMouldController extends BaseController { | |||||
logger.debug("[" + getIpAddr() + "] MouldPatchController::voicePreview"); | logger.debug("[" + getIpAddr() + "] MouldPatchController::voicePreview"); | ||||
return new ResultData(voiceInfoService.previewVoice(aiPreviewParam)); | return new ResultData(voiceInfoService.previewVoice(aiPreviewParam)); | ||||
} | } | ||||
@AuthIgnore | |||||
@ApiOperation("TTS音色预览") | |||||
@PostMapping("/preview") | |||||
@ApiImplicitParams({}) | |||||
public ResultData previewVideo(@RequestBody AiPreviewParam aiPreviewParam) { | |||||
logger.debug("[" + getIpAddr() + "] MouldPatchController::previewVideo"); | |||||
Double time = SmSdkUtils.preview(SmPreviewVideoDTO.mapping(aiPreviewParam)); | |||||
return new ResultData(time); | |||||
} | |||||
} | } |
@@ -16,6 +16,8 @@ import com.iformall.file.aliyun.bean.AliyunOSSConfig; | |||||
import com.iformall.mapper.VoiceMapper; | import com.iformall.mapper.VoiceMapper; | ||||
import com.iformall.service.sm.VoiceInfoService; | import com.iformall.service.sm.VoiceInfoService; | ||||
import com.iformall.sm.*; | import com.iformall.sm.*; | ||||
import com.iformall.smsdk.SmPreviewVideoDTO; | |||||
import com.iformall.smsdk.SmSdkUtils; | |||||
import com.iformall.utils.Constant; | import com.iformall.utils.Constant; | ||||
import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
@@ -90,7 +92,8 @@ public class VoiceInfoServiceImpl implements VoiceInfoService { | |||||
param.setVoice_id(voiceInfo.getMouldSmId()); | param.setVoice_id(voiceInfo.getMouldSmId()); | ||||
param.setVoice_style(StringUtils.isBlank(aiPreviewParam.getVoice_style()) ? EnumSpeakType.default_0.getMessage() : aiPreviewParam.getVoice_style()); | param.setVoice_style(StringUtils.isBlank(aiPreviewParam.getVoice_style()) ? EnumSpeakType.default_0.getMessage() : aiPreviewParam.getVoice_style()); | ||||
param.setGender(voiceInfo.getSex() == 1 ? "male" : "female"); | param.setGender(voiceInfo.getSex() == 1 ? "male" : "female"); | ||||
AiPreviewResult result = AiVideoHelper.voicePreview(param); | |||||
// AiPreviewResult result = AiVideoHelper.voicePreview(param); | |||||
AiPreviewResult result = SmSdkUtils.preview(SmPreviewVideoDTO.mapping(param)); | |||||
if (result.isSuccess()){ | if (result.isSuccess()){ | ||||
return result.getTime(); | return result.getTime(); | ||||
} | } | ||||
@@ -2,6 +2,7 @@ package com.iformall.smsdk; | |||||
import com.alibaba.fastjson.JSON; | import com.alibaba.fastjson.JSON; | ||||
import com.alibaba.fastjson.JSONObject; | import com.alibaba.fastjson.JSONObject; | ||||
import com.iformall.sm.AiPreviewResult; | |||||
import com.iformall.sm.AiVideoParam; | import com.iformall.sm.AiVideoParam; | ||||
import com.iformall.sm.AiVideoResult; | import com.iformall.sm.AiVideoResult; | ||||
import com.iformall.utils.JsonUtil; | import com.iformall.utils.JsonUtil; | ||||
@@ -44,13 +45,14 @@ public class SmSdkUtils { | |||||
return StringUtils.isNotBlank(data) ? JSON.parseObject(data, AiVideoResult.class) : new AiVideoResult(); | return StringUtils.isNotBlank(data) ? JSON.parseObject(data, AiVideoResult.class) : new AiVideoResult(); | ||||
} | } | ||||
public static Double preview(SmPreviewVideoDTO dto) { | |||||
public static AiPreviewResult preview(SmPreviewVideoDTO dto) { | |||||
String url = smSdkUtils.smSdkProperties.getBaseUrl() + SmSdkConstant.PREVIEW_VIDEO; | String url = smSdkUtils.smSdkProperties.getBaseUrl() + SmSdkConstant.PREVIEW_VIDEO; | ||||
HttpEntity<SmPreviewVideoDTO> httpEntity = new HttpEntity<>(dto); | HttpEntity<SmPreviewVideoDTO> httpEntity = new HttpEntity<>(dto); | ||||
log.info("(遂芒api)【预览视频】接口的请求参数:{}", JSON.toJSONString(dto)); | log.info("(遂芒api)【预览视频】接口的请求参数:{}", JSON.toJSONString(dto)); | ||||
ResponseEntity<String> response = smSdkUtils.restTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class); | ResponseEntity<String> response = smSdkUtils.restTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class); | ||||
log.info("(遂芒api)【预览视频】接口的响应数据:{}", JSON.toJSONString(response.getBody())); | log.info("(遂芒api)【预览视频】接口的响应数据:{}", JSON.toJSONString(response.getBody())); | ||||
JSONObject resultObject = JSON.parseObject(response.getBody()); | JSONObject resultObject = JSON.parseObject(response.getBody()); | ||||
return resultObject.getDouble("data"); | |||||
String data = resultObject.getString("data"); | |||||
return StringUtils.isNotBlank(data) ? JSON.parseObject(data, AiPreviewResult.class) : new AiPreviewResult(); | |||||
} | } | ||||
} | } |