增加文本最后一个标识

iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/AliYunQianWen.java

@@ -11,6 +11,7 @@ import com.alibaba.dashscope.common.Role;
 import com.alibaba.dashscope.exception.InputRequiredException;
 import com.alibaba.dashscope.exception.NoApiKeyException;
 import com.qiuguo.iot.data.resp.qg.algorithm.QWenReplyResponse;
+import com.qiuguo.iot.third.service.IQianWen;
 import io.reactivex.functions.Consumer;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -56,7 +57,7 @@ public class AliYunQianWen {
 
 
     public Mono<Boolean> sendMessage(String msg,
-                                     Consumer<? super String> onNext,
+                                     IQianWen<? super String> onNext,
                                      QWenReplyResponse qwenReplyResponse) {
         if(!canAsk){
             msgManager = new MessageManager(10);
@@ -82,7 +83,7 @@ public class AliYunQianWen {
                     public void onEvent(GenerationResult message) {
 
                         try {
-                            onNext.accept(message.getOutput().getChoices().get(0).getMessage().getContent());
+                            onNext.sendMessage(message.getOutput().getChoices().get(0).getMessage().getContent());
                             if(lastGenerationResult != null) {
                                 lastGenerationResult.getOutput().getChoices().get(0).getMessage().setContent(
                                         lastGenerationResult.getOutput().getChoices().get(0).getMessage().getContent()
@@ -106,11 +107,7 @@ public class AliYunQianWen {
                         if(lastGenerationResult != null){
                             qwenReplyResponse.setResut(lastGenerationResult.getOutput().getChoices().get(0).getMessage().getContent());
                         }
-                        try {
+                        onNext.finish();
-                            onNext.accept("。");
-                        } catch (Exception e) {
-                            log.info("千问最后调用结束时异常{}", e);
-                        }
                         lastGenerationResult = null;
                         semaphore.release();
                     }

iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/IQianWen.java

@@ -0,0 +1,7 @@
+package com.qiuguo.iot.third.service;
+
+public interface IQianWen<T> {
+    void sendMessage(T var);
+
+    void finish();
+}

iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/QWenService.java

@@ -37,7 +37,7 @@ public class QWenService {
     protected static ConcurrentHashMap<String, AliYunQianWen> qianwenGroup = new ConcurrentHashMap<>();
 
 
-    public Mono<QWenReplyResponse> communication(TongYiCommunicationRest rest, Consumer<? super String> onNext){
+    public Mono<QWenReplyResponse> communication(TongYiCommunicationRest rest, IQianWen<? super String> onNext){
         AliYunQianWen aliQianWen = null;
         if (!qianwenGroup.containsKey(rest.getOnlyId())) {
             aliQianWen = new AliYunQianWen(SpringUtil.getProperty("Ali.qianwen"));

iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/domain/BaseMessageResp.java

@@ -19,4 +19,9 @@ public class BaseMessageResp {
      * 在线播放音乐信息
      */
     protected MusicResp music;
+
+    /**
+     * 文本推送情况
+     */
+    protected TTSResp tts = new TTSResp();
 }

iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/domain/TTSResp.java

@@ -0,0 +1,11 @@
+package com.qiuguo.iot.box.websocket.api.domain;
+
+import lombok.Data;
+
+@Data
+public class TTSResp {
+    /**
+     * 1标识最后一个文本，0标识播放中
+     */
+    Integer status = 1;
+}

iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BaseWebSocketProcess.java

@@ -146,32 +146,41 @@ public class BaseWebSocketProcess {
             tongYiCommunicationRest.setOnlyId(baseSession.getUserId().toString());
         }
         StringBuilder sb = new StringBuilder();
-        return qwenService.communication(tongYiCommunicationRest, message ->{
+        return qwenService.communication(tongYiCommunicationRest, new IQianWen<String>() {
-            //通知到客户端
+            @Override
-            MDC.put(Log4Constans.PRINT_LOG_ID, baseSession.getLogId());
+            public void sendMessage(String message) {
-            if(tongYiCommunicationRest.getRequestId().equals(baseSession.getRequestId())){
+                //通知到客户端
-                String old = sb.toString() + message;
+                MDC.put(Log4Constans.PRINT_LOG_ID, baseSession.getLogId());
-                int d = old.lastIndexOf("，");
+                if (tongYiCommunicationRest.getRequestId().equals(baseSession.getRequestId())) {
-                int j = old.lastIndexOf("。");
+                    String old = sb.toString() + message;
-                int a = old.lastIndexOf("：");
+                    int d = old.lastIndexOf("，");
-                int b = old.lastIndexOf("\n");
+                    int j = old.lastIndexOf("。");
-                int c = old.lastIndexOf("；");
+                    int a = old.lastIndexOf("：");
-                int n = old.lastIndexOf("\\n");
+                    int b = old.lastIndexOf("\n");
-                int m = Math.max(Math.max(Math.max(Math.max(d, j), Math.max(a, b)), c), n);
+                    int c = old.lastIndexOf("；");
-                if(m > 0){
+                    int n = old.lastIndexOf("\\n");
-                    //清空
+                    int m = Math.max(Math.max(Math.max(Math.max(d, j), Math.max(a, b)), c), n);
-                    sb.setLength(0);
+                    if (m > 0) {
-                    sb.append(old.substring(m));
+                        //清空
-                    old = old.substring(0, m);
+                        sb.setLength(0);
-                    normalSendMsg(baseSession, old, type);
+                        sb.append(old.substring(m));
-                }else{
+                        old = old.substring(0, m);
-                    sb.append(message);
+                        normalSendMsg(baseSession, old, type, YesNo.NO.getCode());
-                }
+                    } else {
+                        sb.append(message);
+                    }
 
-                return;
+                    return;
+                }
+                log.info("已经有新的请求，不在推送到客户端SN：{} userId:{}", baseSession.getSn(), baseSession.getUserId());
+                MDC.remove(Log4Constans.PRINT_LOG_ID);
+            }
+
+            @Override
+            public void finish() {
+                log.info("千问最后调用finish");
+                normalSendMsg(baseSession, sb.toString(), type);
             }
-            log.info("已经有新的请求，不在推送到客户端SN：{} userId:{}", baseSession.getSn(), baseSession.getUserId());
-            MDC.remove(Log4Constans.PRINT_LOG_ID);
         }).flatMap(data ->{
             if(data.getCode() == 200){
                 log.info("千问正常结束");
@@ -686,6 +695,15 @@ public class BaseWebSocketProcess {
         sendMsg(baseSession, msg);
     }
 
+    protected void normalSendMsg(BaseSession baseSession, String message, Integer type, Integer finish){
+        BoxMessageResp resp = new BoxMessageResp();
+        resp.setType(type);
+        resp.setText(message);
+        resp.getTts().setStatus(finish);
+        String msg = JSONObject.toJSONString(resp);
+        sendMsg(baseSession, msg);
+    }
+
     private void sendMsg(BaseSession baseSession, String msg) {
         log.info("推到终端：{},SN:{},userId:{}，消息内容：{}", baseSession.getSessionType(), baseSession.getSn(), baseSession.getUserId(), msg);
         baseSession.getSink().next(baseSession.getSession().textMessage(msg));