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-20 22:55:25 +08:00
parent ab28a6bdc2
commit a06012cbc3
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ public enum ActionPartSpeechEnum implements IChinesePartSpeech{
List<SystemTalkAnswerConfigEntity> commands){ List<SystemTalkAnswerConfigEntity> commands){
return action; return action;
} }
}, },*/
vn(0, "名动词"){ vn(0, "名动词"){
@Override @Override
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfig> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfig> keyGroup,
@ -63,13 +63,13 @@ public enum ActionPartSpeechEnum implements IChinesePartSpeech{
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs, List<DeviceUserBindEntity> includs,
List<SystemTalkAnswerConfigEntity> commands){ List<SystemTalkAnswerConfigEntity> commands){
return action; return v.getAction(keyGroup, key, actions, action, systemTalkAnswerConfigEntities, includs, commands);
} }
}, },
ng(1, "名语素"){ /*ng(1, "名语素"){
@Override @Override
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfig> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfig> keyGroup,
String key, String key,

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

@ -256,6 +256,12 @@ public class NlpService {
if(actions.getA() + actions.getB() > 0){ if(actions.getA() + actions.getB() > 0){
actions.getActions().add(action); actions.getActions().add(action);
} }
if(actions.getActions().size() > 1){
actions.getActions().sort((a, b) -> {
return Integer.parseInt(String.valueOf(a.getSystemTalkAnswerConfigEntity().getKeyOrder() - b.getSystemTalkAnswerConfigEntity().getKeyOrder()));
});
}
return actions; return actions;
}); });
} }

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

@ -89,6 +89,7 @@ public class DeviceController {
session.setNickName(userTalkRequst.getNickName()); session.setNickName(userTalkRequst.getNickName());
session.setRoleId(DeviceCodeEnum.BOX.getName()); session.setRoleId(DeviceCodeEnum.BOX.getName());
session.setRequestId(userTalkRequst.getTimeTemp()); session.setRequestId(userTalkRequst.getTimeTemp());
session.setLanguage(actions.getLanguage());
//当不不使用城市时，默认使用杭州查询 //当不不使用城市时，默认使用杭州查询
session.setCustomerIP("115.205.2.137"); session.setCustomerIP("115.205.2.137");
BaseMessageResp baseMessageResp = new BaseMessageResp(); BaseMessageResp baseMessageResp = new BaseMessageResp();

2
iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml
View File

@ -1,5 +1,5 @@
server: server:
port: 8080 port: 8082
spring: spring:
application: application:
name: qiuguo-iot-box-user-api name: qiuguo-iot-box-user-api