From 44708348c5a97a0703398357f9cf42d696ca8f6f Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 17 Nov 2023 10:02:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=97=E6=B3=95=E6=96=B0=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E5=90=88=E6=88=90=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third/request/Audio20231117Request.java | 21 +++++++++++++++++++ .../iot/third/service/AudioService.java | 14 +++++++++++++ .../api/service/BaseWebSocketService.java | 2 +- .../src/main/resources/bootstrap-dev.yml | 2 +- 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 iot-common/iot-third/src/main/java/com/qiuguo/iot/third/request/Audio20231117Request.java diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/request/Audio20231117Request.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/request/Audio20231117Request.java new file mode 100644 index 0000000..049fcc2 --- /dev/null +++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/request/Audio20231117Request.java @@ -0,0 +1,21 @@ +package com.qiuguo.iot.third.request; + +import lombok.Data; + +import java.util.List; + +@Data +public class Audio20231117Request { + + String data; + String event_data = "null"; + Integer fn_index = 0; + + String session_hash = "p76f1218t1"; + + String data_id; + /** + * 声音角色 + */ + String scl; +} diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/AudioService.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/AudioService.java index f6e2343..3bb2400 100644 --- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/AudioService.java +++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/AudioService.java @@ -4,6 +4,7 @@ import cn.hutool.extra.spring.SpringUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.qiuguo.iot.base.utils.WebClientUtils; +import com.qiuguo.iot.third.request.Audio20231117Request; import com.qiuguo.iot.third.request.AudioRequest; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -37,4 +38,17 @@ public class AudioService { return Mono.just(m); }); } + + public Mono getAudio20231117Url(String v, String scl){ + Audio20231117Request request = new Audio20231117Request(); + request.setData(v); + request.setScl(scl); + + return WebClientUtils.post(url, (JSONObject)JSONObject.toJSON(request)).flatMap(jsonObject -> { + JSONArray array = jsonObject.getJSONArray("data"); + jsonObject = array.getJSONObject(1); + String m = jsonObject.getString("name");//.replaceAll("/data/wzg/vits_results", downurl); + return Mono.just(m); + }); + } } diff --git a/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/service/BaseWebSocketService.java b/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/service/BaseWebSocketService.java index 54b47bc..088a670 100644 --- a/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/service/BaseWebSocketService.java +++ b/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/service/BaseWebSocketService.java @@ -374,7 +374,7 @@ public class BaseWebSocketService { sendMsg(baseSession, JSONObject.toJSONString(boxMessageResp)); return Mono.just(""); } - return audioService.getAudioUrl(boxMessageResp.getText(), + return audioService.getAudio20231117Url(boxMessageResp.getText(), StringUtils.isNotEmpty(baseSession.getTtsId()) ? baseSession.getTtsId() : "scl" ).map(s ->{ diff --git a/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-dev.yml b/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-dev.yml index d300402..46e2e8d 100644 --- a/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-dev.yml +++ b/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-dev.yml @@ -49,7 +49,7 @@ tts: #max: # text: 30 #当发送给前端文字超过改值时，分批发送给前端 suanfa: true #nacos控制变化 - url: http://47.110.40.30:18000/run/predict #http://192.168.8.211:18000/run/predict #算法语音合成 + url: http://192.168.8.211:18000/run/predict #http://47.110.40.30:18000/run/predict # #算法语音合成 lac: #type: suanfa #nacos控制变化 huburl: http://192.168.8.175:8866/predict/lac