From dc17707b81e03bcc39cb66883c7cd48d2479e143 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Thu, 12 Oct 2023 14:12:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=A4=84=E7=90=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/qiuguo/iot/base/date/DateEnum.java  | 10 +++++++++-
 .../websocket/api/handler/BaseWebSocketProcess.java   | 11 ++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/date/DateEnum.java b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/date/DateEnum.java
index 64d9f49..0a4c536 100644
--- a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/date/DateEnum.java
+++ b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/date/DateEnum.java
@@ -191,6 +191,14 @@ public enum DateEnum implements IDate{
             return localDateTime.minusDays(-2);
         }
 
+    },
+
+    DEFAULT("默认"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime;
+        }
+
     },
     ;
     Date date;
@@ -206,6 +214,6 @@ public enum DateEnum implements IDate{
                 return dateEnum;
             }
         }
-        return null;
+        return DEFAULT;
     }
 }
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 0290b72..3c2ed8e 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
@@ -274,7 +274,16 @@ public class BaseWebSocketProcess {
                 }
 
             }else if(action.getSystemTalkAnswerConfigEntity().getAnswerType().equals(AskTypeEnum.TTS.getCode())){
-                sendMessage(action, baseSession, action.getSystemTalkAnswerConfigEntity().getAnswerValue(), AskTypeEnum.TTS.getCode());
+                if(!action.getAction().equals(action.getAsk())){
+                    if(!isToQianWen){
+                        isToQianWen = true;
+                        toQianWen(action, baseSession);
+                    }
+
+                }else{
+                    sendMessage(action, baseSession, action.getSystemTalkAnswerConfigEntity().getAnswerValue(), AskTypeEnum.TTS.getCode());
+                }
+
             }else if(action.getSystemTalkAnswerConfigEntity().getAnswerType().equals(AskTypeEnum.QIU_GUO.getCode())){
                 sendMessage(action, baseSession, action.getSystemTalkAnswerConfigEntity().getAnswerValue(), AskTypeEnum.TTS.getCode());
             }