时间处理增加默认

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;
     }
 }

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())){
+                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());
             }