wulin/qiuguo-iot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加了扩展的扩展

Browse Source
This commit is contained in:
wulin 2023-11-24 11:30:05 +08:00
parent af127c2b1f
commit 5cff654d19
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/system/SystemTalkAnswerConfigService.java
View File

@ -82,7 +82,7 @@ public class SystemTalkAnswerConfigService extends GenericReactiveCrudService<Sy
ReactiveQuery<SystemTalkAnswerConfigEntity> reactiveQuery1 = createQuery(); ReactiveQuery<SystemTalkAnswerConfigEntity> reactiveQuery1 = createQuery();
reactiveQuery1 = reactiveQuery1.and("is_delete", 0); reactiveQuery1 = reactiveQuery1.and("is_delete", 0);
reactiveQuery1 = reactiveQuery1.and("parent_id", item.getId()); 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 ->{ reactiveQuery1.paging(0, MAX_COUT.intValue()).fetch().map(item1 ->{
item1.setAnswerType(item1.getAnswerType() % systemTalkAnswerConfig.getSystemTalkAnswerConfig().getAnswerType()); item1.setAnswerType(item1.getAnswerType() % systemTalkAnswerConfig.getSystemTalkAnswerConfig().getAnswerType());
systemTalkAnswerConfig.getExCommand().put(item1.getAskKey(), item1); systemTalkAnswerConfig.getExCommand().put(item1.getAskKey(), item1);

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

@ -857,18 +857,25 @@ public enum ActionPartSpeechEnum implements IChinesePartSpeech{
if(entity.getExCommand() == null){ if(entity.getExCommand() == null){
return entity.getSystemTalkAnswerConfig(); return entity.getSystemTalkAnswerConfig();
}else{ }else{
//找到扩展指令 return getSystemTalkWithKey(entity, ask);
for (String key1 :entity.getKeys()){
if(ask.toLowerCase().contains(key1)){
return entity.getExCommand().get(key1);
} }
} }
//找不到继续用原来的
return entity.getSystemTalkAnswerConfig();
}
//return keyGroup.get(key);
}
return null; 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();
}
} }