From 5cff654d1966934fc1e771ffc00294d9032ebdfc Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 24 Nov 2023 11:30:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E7=9A=84=E6=89=A9=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SystemTalkAnswerConfigService.java | 2 +- .../iot/third/enums/ActionPartSpeechEnum.java | 25 ++++++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/system/SystemTalkAnswerConfigService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/system/SystemTalkAnswerConfigService.java index a1d1522..7f0f00b 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/system/SystemTalkAnswerConfigService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/system/SystemTalkAnswerConfigService.java @@ -82,7 +82,7 @@ public class SystemTalkAnswerConfigService extends GenericReactiveCrudService reactiveQuery1 = createQuery(); reactiveQuery1 = reactiveQuery1.and("is_delete", 0); reactiveQuery1 = reactiveQuery1.and("parent_id", item.getId()); - reactiveQuery1 = reactiveQuery1.gt("answer_type", AskTypeEnum.EXCOMMAND.getCode()); + reactiveQuery1 = reactiveQuery1.gte("answer_type", AskTypeEnum.EXCOMMAND.getCode()); reactiveQuery1.paging(0, MAX_COUT.intValue()).fetch().map(item1 ->{ item1.setAnswerType(item1.getAnswerType() % systemTalkAnswerConfig.getSystemTalkAnswerConfig().getAnswerType()); systemTalkAnswerConfig.getExCommand().put(item1.getAskKey(), item1); diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/enums/ActionPartSpeechEnum.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/enums/ActionPartSpeechEnum.java index 686a122..c29fa01 100644 --- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/enums/ActionPartSpeechEnum.java +++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/enums/ActionPartSpeechEnum.java @@ -857,18 +857,25 @@ public enum ActionPartSpeechEnum implements IChinesePartSpeech{ if(entity.getExCommand() == null){ return entity.getSystemTalkAnswerConfig(); }else{ - //找到扩展指令 - for (String key1 :entity.getKeys()){ - if(ask.toLowerCase().contains(key1)){ - return entity.getExCommand().get(key1); - } - } - //找不到继续用原来的 - return entity.getSystemTalkAnswerConfig(); + return getSystemTalkWithKey(entity, ask); } - //return keyGroup.get(key); } return null; } + + private static SystemTalkAnswerConfigEntity getSystemTalkWithKey(SystemTalkAnswerConfig systemTalkAnswerConfig, + String ask){ + if(systemTalkAnswerConfig.getExCommand() != null){ + //找到扩展指令 + for (String key1 :systemTalkAnswerConfig.getKeys()){ + if(ask.toLowerCase().contains(key1)){ + return systemTalkAnswerConfig.getExCommand().get(key1); + } + } + //找不到继续用原来的 + return systemTalkAnswerConfig.getSystemTalkAnswerConfig(); + } + return systemTalkAnswerConfig.getSystemTalkAnswerConfig(); + } }