英语指令转小写比对

iot-common/iot-third/src/main/java/com/qiuguo/iot/third/enums/ActionPartSpeechEnum.java

@@ -859,11 +859,12 @@ public enum ActionPartSpeechEnum implements IChinesePartSpeech{
             }else{
                 //找到扩展指令
                 for (String key1 :entity.getKeys()){
-                    if(ask.contains(key1)){
+                    if(ask.toLowerCase().contains(key1)){
                         return entity.getExCommand().get(key1);
-
                     }
                 }
+                //找不到继续用原来的
+                return entity.getSystemTalkAnswerConfig();
             }
             //return keyGroup.get(key);
         }

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

@@ -79,7 +79,7 @@ public class NlpService {
                 return b.getKey().length() - a.getKey().length();
             });
 
-            String pText = text;
+            String pText = text.toLowerCase();
             i = 0;
             int j = 0;
             Boolean isFinding = false;
@@ -167,7 +167,7 @@ public class NlpService {
                 ActionPartSpeechEnum actionPartSpeechEnum = ActionPartSpeechEnum.getEnumWithCode(key.getType());
 
                 action = actionPartSpeechEnum.getAction(systemTalkAnswerConfigService.getSystemTalkWithKeyGroup(),
-                        key.getKey(),
+                        key.getKey().toLowerCase(),
                         actions,
                         action,
                         systemTalkAnswerConfigEntities,

iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java

@@ -1,6 +1,7 @@
 package com.qiuguo.iot.user.api.controller.device;
 
 import com.alibaba.fastjson.JSONArray;
+import com.qiuguo.iot.base.constans.RedisConstans;
 import com.qiuguo.iot.base.enums.*;
 import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.domain.BaseMessageResp;
@@ -11,6 +12,7 @@ import com.qiuguo.iot.data.domain.box.BoxSession;
 import com.qiuguo.iot.data.domain.user.UserSession;
 import com.qiuguo.iot.data.entity.device.DeviceUserBindEntity;
 import com.qiuguo.iot.data.entity.device.DeviceUserTalkRecordEntity;
+import com.qiuguo.iot.data.model.system.SystemTalkAnswerConfig;
 import com.qiuguo.iot.data.request.device.DeviceUserBindRequest;
 import com.qiuguo.iot.data.request.device.DeviceUserTalkRecordRequest;
 import com.qiuguo.iot.data.request.qiuguo.cloud.UserTalkRequst;
@@ -21,6 +23,7 @@ import com.qiuguo.iot.data.service.device.DeviceInfoService;
 import com.qiuguo.iot.data.service.device.DeviceUserBindService;
 import com.qiuguo.iot.data.service.device.DeviceUserTalkRecordService;
 import com.qiuguo.iot.data.domain.action.Actions;
+import com.qiuguo.iot.data.service.system.SystemTalkAnswerConfigService;
 import com.qiuguo.iot.third.command.ActionCommand;
 import com.qiuguo.iot.third.service.AliYunTranslateService;
 import com.qiuguo.iot.third.service.NlpService;
@@ -75,9 +78,21 @@ public class DeviceController {
     @Resource
     private AliYunTranslateService aliYunTranslateService;
 
+    @Resource
+    private SystemTalkAnswerConfigService systemTalkAnswerConfigService;
 
     @Value("${device.timeout}")
     private Long timeOut;//2分钟
+
+    @GetMapping("/init/sysTalkAnswer")
+    public Mono<String> sysTalkAnswer(@RequestParam Integer type) {
+        if(type == 0){
+            systemTalkAnswerConfigService.initGroup();
+            return Mono.just("重新读取指令完成");
+        }
+        return Mono.just("未知请求");
+
+    }
     @PostMapping("/talk")
     public Mono<BaseMessageResp> deviceInit(@RequestBody UserTalkRequst userTalkRequst){
         return nlpService.getActionWithLacSingle(userTalkRequst.getId(), userTalkRequst.getAsk().replace("@小果(智能AI助手) ", ""), someProperties.getType())

iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-dev.yml

@@ -53,7 +53,7 @@ tts:
   suanfa: false #nacos控制变化
   url: http://192.168.8.211:18000/run/predict # #http://47.110.40.30:18000/run/predict # #算法语音合成
 lac:
-  #type: suanfa #nacos控制变化
+  type: hub #nacos控制变化
   huburl: http://192.168.8.175:8866/predict/lac
   suanfaurl: http://192.168.8.211:6000/qg_human/lac_word