diff --git a/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java b/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java index f5c2d18..56a9eb4 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java @@ -158,7 +158,6 @@ public class VoiceMouldController extends BaseController { return new ResultData(voiceInfoService.chooseType(id)); } - @Deprecated @AuthIgnore @ApiOperation("TTS音色预览") @PostMapping("/preview_bak") @@ -167,14 +166,4 @@ public class VoiceMouldController extends BaseController { logger.debug("[" + getIpAddr() + "] MouldPatchController::voicePreview"); 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); - } } 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..ef11f04 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 @@ -16,6 +16,8 @@ import com.iformall.file.aliyun.bean.AliyunOSSConfig; import com.iformall.mapper.VoiceMapper; import com.iformall.service.sm.VoiceInfoService; import com.iformall.sm.*; +import com.iformall.smsdk.SmPreviewVideoDTO; +import com.iformall.smsdk.SmSdkUtils; import com.iformall.utils.Constant; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -90,7 +92,8 @@ public class VoiceInfoServiceImpl implements VoiceInfoService { param.setVoice_id(voiceInfo.getMouldSmId()); param.setVoice_style(StringUtils.isBlank(aiPreviewParam.getVoice_style()) ? EnumSpeakType.default_0.getMessage() : aiPreviewParam.getVoice_style()); 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()){ return result.getTime(); } diff --git a/suimangService/src/main/java/com/iformall/smsdk/SmSdkUtils.java b/suimangService/src/main/java/com/iformall/smsdk/SmSdkUtils.java index 0d0aadb..d0367c3 100644 --- a/suimangService/src/main/java/com/iformall/smsdk/SmSdkUtils.java +++ b/suimangService/src/main/java/com/iformall/smsdk/SmSdkUtils.java @@ -2,6 +2,7 @@ package com.iformall.smsdk; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.iformall.sm.AiPreviewResult; import com.iformall.sm.AiVideoParam; import com.iformall.sm.AiVideoResult; import com.iformall.utils.JsonUtil; @@ -44,13 +45,14 @@ public class SmSdkUtils { 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; HttpEntity httpEntity = new HttpEntity<>(dto); log.info("(遂芒api)【预览视频】接口的请求参数:{}", JSON.toJSONString(dto)); ResponseEntity response = smSdkUtils.restTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class); log.info("(遂芒api)【预览视频】接口的响应数据:{}", JSON.toJSONString(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(); } }