Browse Source

fix

master
winter 11 months ago
parent
commit
526c787a0c
4 changed files with 18 additions and 3 deletions
  1. +12
    -1
      suimangCApi/src/main/java/com/iformall/controller/UserLiveController.java
  2. +1
    -1
      suimangService/src/main/java/com/iformall/service/WxCVoiceService.java
  3. +3
    -1
      suimangService/src/main/java/com/iformall/service/impl/WxCVoiceServiceImpl.java
  4. +2
    -0
      suimangService/src/main/java/com/iformall/sm/AiPreviewParam.java

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

@@ -312,8 +312,19 @@ public class UserLiveController extends BaseController {
try{ try{
speed = Integer.parseInt(speedStr); speed = Integer.parseInt(speedStr);
}catch(Exception e){} }catch(Exception e){}
String pitchStr = params.get("pitch");
Integer pitch = null;
try{
pitch = Integer.parseInt(pitchStr);
}catch(Exception e){
status.put("code", ErrorCode.SYS_PARAMETER_ERROR.getCode());
status.put("msg", "pitch参数异常");
resultMap.put("status", status);
return resultMap;
}


Map<String, Object> data = wxCVoiceService.voicePreview(voiceId,voiceStyle,text,speed);
Map<String, Object> data = wxCVoiceService.voicePreview(voiceId,voiceStyle,text,speed,pitch);
if(data != null){ if(data != null){
resultMap.put("data", data); resultMap.put("data", data);




+ 1
- 1
suimangService/src/main/java/com/iformall/service/WxCVoiceService.java View File

@@ -13,6 +13,6 @@ public interface WxCVoiceService {


List<VoiceInfo> chooseType(Long id); List<VoiceInfo> chooseType(Long id);


Map<String, Object> voicePreview(Long voiceId, String voiceStyle, String text, Integer speed);
Map<String, Object> voicePreview(Long voiceId, String voiceStyle, String text, Integer speed,Integer pitch);


} }

+ 3
- 1
suimangService/src/main/java/com/iformall/service/impl/WxCVoiceServiceImpl.java View File

@@ -145,7 +145,7 @@ public class WxCVoiceServiceImpl implements WxCVoiceService {
} }


@Override @Override
public Map<String, Object> voicePreview(Long voiceId, String voiceStyle, String text, Integer speed) {
public Map<String, Object> voicePreview(Long voiceId, String voiceStyle, String text, Integer speed,Integer pitch) {
VoiceInfo voiceInfo = voiceMapper.selectById(voiceId); VoiceInfo voiceInfo = voiceMapper.selectById(voiceId);
if(voiceInfo == null){ if(voiceInfo == null){
logger.error("未查询到声音{}"+voiceId); logger.error("未查询到声音{}"+voiceId);
@@ -157,6 +157,8 @@ public class WxCVoiceServiceImpl implements WxCVoiceService {
param.setVoice_style(StringUtils.isBlank(voiceStyle) ? EnumSpeakType.default_0.getMessage() : voiceStyle); param.setVoice_style(StringUtils.isBlank(voiceStyle) ? EnumSpeakType.default_0.getMessage() : voiceStyle);
param.setGen_txt(text.replaceAll(Constant.text_pause, "[*]")); param.setGen_txt(text.replaceAll(Constant.text_pause, "[*]"));
param.setSpeed(speed==null?100:speed); param.setSpeed(speed==null?100:speed);
param.setPitch(pitch);
param.setVoice_type(voiceInfo.getVoiceType());
AiPreviewResult aiTtsResult = AiTtsHelper.voicePreview(param); AiPreviewResult aiTtsResult = AiTtsHelper.voicePreview(param);
if(!aiTtsResult.isSuccess()){ if(!aiTtsResult.isSuccess()){
logger.error("tts 预览失败{}"+aiTtsResult.getMsg()); logger.error("tts 预览失败{}"+aiTtsResult.getMsg());


+ 2
- 0
suimangService/src/main/java/com/iformall/sm/AiPreviewParam.java View File

@@ -10,4 +10,6 @@ public class AiPreviewParam {
private String gender; private String gender;
private int speed; private int speed;
private String token; private String token;
private int pitch;
private String voice_type;
} }

Loading…
Cancel
Save