From 106ddb6e50ad3928331fce11d9e1bef68c2df7a9 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 22 Nov 2023 09:14:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=A2=E9=97=AE=E5=A4=AA?=
 =?UTF-8?q?=E5=BF=AB=E5=92=8C=E5=A4=AA=E5=A4=9A=E5=B9=B6=E5=8F=91=E7=9A=84?=
 =?UTF-8?q?=E6=96=87=E6=A1=88=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qiuguo/iot/third/command/ActionCommand.java |  5 +++++
 .../qiuguo/iot/third/nlp/AliYunXingChen.java    | 17 ++++++++++-------
 .../src/main/resources/bootstrap-dev.yml        |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/ActionCommand.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/ActionCommand.java
index 7622283..2a2f9cc 100644
--- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/ActionCommand.java
+++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/ActionCommand.java
@@ -204,6 +204,11 @@ public abstract class ActionCommand {
                 //保存记录
                 return actionSendMessage.sendMsgTongYiFinished(action, baseSession, data.getResut());
             }else{
+                if(data.getCode() == 422){
+                    return sendMessage(action, baseSession, "询问太快了，请慢一点。容我思考思考！", AskTypeEnum.NONE.getCode(), actionSendMessage);
+                }else if(data.getCode() == 429){
+                    return sendMessage(action, baseSession, "询问问题用户过多，请稍等在问！", AskTypeEnum.NONE.getCode(), actionSendMessage);
+                }
                 return sendMessage(action, baseSession, "很抱歉，我无法回答您的问题，请换一个问题。", AskTypeEnum.NONE.getCode(), actionSendMessage);
             }
         });
diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/AliYunXingChen.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/AliYunXingChen.java
index 6ceb6fc..9733589 100644
--- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/AliYunXingChen.java
+++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/AliYunXingChen.java
@@ -1,11 +1,6 @@
 package com.qiuguo.iot.third.nlp;
 
-import com.alibaba.dashscope.aigc.generation.Generation;
-import com.alibaba.dashscope.aigc.generation.GenerationResult;
-import com.alibaba.dashscope.aigc.generation.models.QwenParam;
-import com.alibaba.dashscope.common.MessageManager;
-import com.alibaba.dashscope.common.ResultCallback;
-import com.alibaba.dashscope.common.Role;
+import com.alibaba.xingchen.ApiException;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -41,6 +36,7 @@ public class AliYunXingChen {
     ChatApiSub api;
 
 
+
     List<Message> messages = new ArrayList<>(50);
 
 
@@ -86,6 +82,7 @@ public class AliYunXingChen {
                                      QWenReplyResponse qwenReplyResponse) {
         log.info("调用通义星尘内存缓存回答：{}", msg);
         Message message = Message.builder().name(userName).role("user").content(msg).build();
+
         addMessage(message);
         return sendMsg(onNext, qwenReplyResponse);
     }
@@ -112,12 +109,17 @@ public class AliYunXingChen {
                     addMessage(message1);
                     onNext.finish();
 
+
                 }
             });
             return Mono.just(true);
         }catch (Exception e){
             log.info("调用星尘异常{}", e);
-            qwenReplyResponse.setCode(500);
+            ApiException apiException = (ApiException)e.getCause().getCause();
+
+            qwenReplyResponse.setCode(apiException.getCode());
+
+
         }
         return Mono.just(false);
     }
@@ -142,6 +144,7 @@ public class AliYunXingChen {
                                 Message m = JSONObject.toJavaObject(jsonArray.getJSONObject(i), Message.class);
                                 messages.add(m);
                             }
+
                         }
                     }catch (Exception e){
                         log.info("聊天缓存转换异常{}", e);
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 11e8f07..5ab6f9e 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
@@ -50,7 +50,7 @@ qiuguo:
 tts:
   #max:
   #  text: 30 #当发送给前端文字超过改值时，分批发送给前端
-  suanfa: true #nacos控制变化
+  suanfa: false #nacos控制变化
   url: http://192.168.8.211:18000/run/predict # #http://47.110.40.30:18000/run/predict # #算法语音合成
 lac:
   #type: suanfa #nacos控制变化