From 942e911f02fd57a0147b9afaaaeaf011cd7c33ea Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 23 Oct 2023 17:37:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=80=E5=87=BA=E8=81=86?= =?UTF-8?q?=E5=90=AC=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/qiuguo/iot/base/enums/AskTypeEnum.java | 2 ++ .../box/websocket/api/handler/BaseWebSocketProcess.java | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/enums/AskTypeEnum.java b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/enums/AskTypeEnum.java index b7e91db..34a5910 100644 --- a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/enums/AskTypeEnum.java +++ b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/enums/AskTypeEnum.java @@ -16,6 +16,8 @@ public enum AskTypeEnum { TIME(6, "询问时间"), POEM(7, "古诗"), + EXIT(20, "退出聆听"), + UPDATE(100, "固件升级"), BOX_ON_LINE(101, "Box配网成功"), BOX_OFF_LINE(102, "Box离线"), diff --git a/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BaseWebSocketProcess.java b/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BaseWebSocketProcess.java index e655b89..87d9561 100644 --- a/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BaseWebSocketProcess.java +++ b/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BaseWebSocketProcess.java @@ -535,6 +535,13 @@ public class BaseWebSocketProcess { } }); + }else if(action.getSystemTalkAnswerConfigEntity().getAnswerType().equals(AskTypeEnum.EXIT.getCode())){ + return sendMessage(action, + baseSession , + action.getSystemTalkAnswerConfigEntity().getAnswerValue(), + AskTypeEnum.EXIT.getCode()).flatMap(m -> { + return Mono.empty(); + }); }else{ return toQianWen(action, baseSession, action.getSystemTalkAnswerConfigEntity().getAnswerType()).flatMap(vo ->{ //千问只调一次