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

websocket增加设备绑定推送用户

Browse Source
This commit is contained in:
wulin 2023-10-09 10:04:24 +08:00
parent 1fb7296fa7
commit 9b9401f93f
12 changed files with 2845 additions and 34055 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
iot-common/iot-base/src/main/java/com/qiuguo/iot/base/enums/AskTypeEnum.java
View File

@ -15,6 +15,7 @@ public enum AskTypeEnum {
MUSIC(5, "音乐，声音"), MUSIC(5, "音乐，声音"),
UPDATE(100, "固件升级"), UPDATE(100, "固件升级"),
BIND_BOX(101, "Box绑定推送"),
; ;
AskTypeEnum(Integer c, String n){ AskTypeEnum(Integer c, String n){
code = c; code = c;

350
iot-common/iot-third/src/main/java/com/qiuguo/iot/third/enums/ChinesePartSpeechEnum.java
View File

@ -24,9 +24,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
action.setAction(key); action.setAction(key);
SystemTalkAnswerConfigEntity entity = getSystemTalkWithKey(action.getAction(), keyGroup); SystemTalkAnswerConfigEntity entity = getSystemTalkWithKey(action.getAction(), keyGroup);
if(entity != null){ if(entity != null){
@ -36,14 +36,14 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
return action; return action;
} }
}, },
vd(0, "副动词"){ /*vd(0, "副动词"){
@Override @Override
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -52,9 +52,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -66,9 +66,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -77,9 +77,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
},//LAC PER },//LAC PER
@ -88,9 +88,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -99,20 +99,20 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },*/
nt(4, "机构团体"){ nt(4, "机构团体"){
@Override @Override
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
action.getLbs().add(key); action.getLbs().add(key);
return action; return action;
} }
@ -122,10 +122,10 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return nt.getAction(keyGroup, key, actions, action, systemTalkAnswerConfigEntities, includs);
} }
}, },
LOC(4, "机构团体"){ LOC(4, "机构团体"){
@ -133,47 +133,48 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return nt.getAction(keyGroup, key, actions, action, systemTalkAnswerConfigEntities, includs);
} }
}, },
nz(5, "其他专名"){ /*nz(5, "其他专名"){
@Override @Override
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },*/
n(6, "名词"){ n(6, "名词"){
@Override @Override
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
//匹配到关键词就不能作为名词加入，未匹配到的，分割前的都加入名词 //匹配到关键词就不能作为名词加入，未匹配到的，分割前的都加入名词
SystemTalkAnswerConfigEntity entity = getSystemTalkWithKey(key, keyGroup); SystemTalkAnswerConfigEntity entity = getSystemTalkWithKey(key, keyGroup);
if(entity != null){ if(entity != null){
systemTalkAnswerConfigEntities.add(entity); systemTalkAnswerConfigEntities.add(entity);
actions.setA(1);//a = 1; actions.setA(1);
if(StringUtils.isNotEmpty(actions.getName())){//已记录的加进去 //已记录的加进去
if(StringUtils.isNotEmpty(actions.getName())){
// //
entity = getSystemTalkWithKey(actions.getName(), keyGroup); entity = getSystemTalkWithKey(actions.getName(), keyGroup);
if(entity != null){ if(entity != null){
systemTalkAnswerConfigEntities.add(entity); systemTalkAnswerConfigEntities.add(entity);
actions.setA(1);//a = 1; actions.setA(1);
}else{ }else{
//这里会走到a+b=2 //这里会走到a+b=2
action.setName(actions.getName());//.add(name);//加入分割前的名词 action.setName(actions.getName());
actions.setB(1);//b = 1; actions.setB(1);
actions.setName("");//name = ""; actions.setName("");
} }
} }
}else{ }else{
@ -201,32 +202,32 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
b(8, "区别词"){ /*b(8, "区别词"){
@Override @Override
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },*/
c(9, "连接词"){ c(9, "连接词"){
@Override @Override
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
if(StringUtils.isNotEmpty(actions.getName())){ if(StringUtils.isNotEmpty(actions.getName())){
//action.setName(name);//.add(name); //action.setName(name);//.add(name);
SystemTalkAnswerConfigEntity entity = getSystemTalkWithKey(actions.getName(), keyGroup); SystemTalkAnswerConfigEntity entity = getSystemTalkWithKey(actions.getName(), keyGroup);
@ -240,16 +241,16 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
action.setAction(action.getSystemTalkAnswerConfigEntity().getAskKey()); action.setAction(action.getSystemTalkAnswerConfigEntity().getAskKey());
action.setDeviceUserBindEntity(actions.getLastDeviceUserBindEntity()); action.setDeviceUserBindEntity(actions.getLastDeviceUserBindEntity());
actions.getActions().add(action); actions.getActions().add(action);
actions.setLastName(action.getName());//lastName = action.getName(); actions.setLastName(action.getName());
actions.setLastDeviceUserBindEntity(action.getDeviceUserBindEntity()); actions.setLastDeviceUserBindEntity(action.getDeviceUserBindEntity());
action = new Action(); action = new Action();
actions.setName("");//name = ""; actions.setName("");
//action.setName(new ArrayList<>()); //action.setName(new ArrayList<>());
action.setLbs(new ArrayList<>()); action.setLbs(new ArrayList<>());
action.setAsk(actions.getRecordText()); action.setAsk(actions.getRecordText());
} }
action.setName(actions.getName());//.add(name);//加入分割前的名词 action.setName(actions.getName());
//name = ""; //name = "";
actions.setB(1);//b = 1; actions.setB(1);//b = 1;
} }
@ -258,14 +259,14 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
return action; return action;
} }
}, },
dg(10, "副语素"){ /*dg(10, "副语素"){
@Override @Override
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -274,9 +275,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -285,9 +286,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -296,9 +297,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -307,9 +308,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -318,9 +319,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
},//LAC t },//LAC t
@ -329,9 +330,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
},//LAC vn },//LAC vn
@ -340,9 +341,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -351,9 +352,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -362,32 +363,32 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },*/
m(19, "数词"){ m(19, "数词"){
@Override @Override
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
action.setStatus(key); action.setStatus(key);
return action; return action;
} }
}, },
o(20, "拟声词"){ /*o(20, "拟声词"){
@Override @Override
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -396,9 +397,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -408,9 +409,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -419,9 +420,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -430,20 +431,20 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, ist<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },*/
t(25, "时间词"){ t(25, "时间词"){
@Override @Override
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
//解析时间关键字 //解析时间关键字
action.setTime(new ActionTime()); action.setTime(new ActionTime());
action.getTime().setTime(key); action.getTime().setTime(key);
@ -455,20 +456,20 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return t.getAction(keyGroup, key, actions, action, systemTalkAnswerConfigEntities, includs);
} }
},//LAC TIME },//LAC TIME
u(26, "助词"){ /* u(26, "助词"){
@Override @Override
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -477,9 +478,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -489,9 +490,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -500,9 +501,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -511,9 +512,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -522,31 +523,31 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },*/
w(29, "标点符号"){ w(29, "标点符号"){
@Override @Override
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return c.getAction(keyGroup, key, actions, action, systemTalkAnswerConfigEntities, includs); return c.getAction(keyGroup, key, actions, action, systemTalkAnswerConfigEntities, includs);
} }
}, },
x(30, "非语素词"){ /*x(30, "非语素词"){
@Override @Override
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -555,9 +556,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
},//LAC xc },//LAC xc
@ -566,9 +567,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
},//LAC xc },//LAC xc
@ -577,9 +578,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -588,9 +589,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
Actions actions, Actions actions,
Action action, Action action,
List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities, List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },
@ -604,9 +605,9 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
List<DeviceUserBindEntity> includs){ List<DeviceUserBindEntity> includs){
return action; return action;
} }
}, },*/
qg(100, "在查找字符串时用来临时替换用户命名的设备，目前最多同时支持20个，见LAC字典"){ qg(100, "在查找字符串时用来临时替换用户命名的设备，目前最多同时支持20个，见LAC字典>1<"){
@Override @Override
public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup, public Action getAction(ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup,
String key, String key,
@ -620,20 +621,19 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
action.setAction(action.getSystemTalkAnswerConfigEntity().getAskKey()); action.setAction(action.getSystemTalkAnswerConfigEntity().getAskKey());
action.setDeviceUserBindEntity(actions.getLastDeviceUserBindEntity()); action.setDeviceUserBindEntity(actions.getLastDeviceUserBindEntity());
actions.getActions().add(action); actions.getActions().add(action);
actions.setLastName(action.getName());// lastName = action.getName(); actions.setLastName(action.getName());
actions.setLastDeviceUserBindEntity(action.getDeviceUserBindEntity()); actions.setLastDeviceUserBindEntity(action.getDeviceUserBindEntity());
action = new Action(); action = new Action();
actions.setName("");//name = ""; actions.setName("");
//action.setName(new ArrayList<>());
action.setLbs(new ArrayList<>()); action.setLbs(new ArrayList<>());
action.setAsk(actions.getRecordText()); action.setAsk(actions.getRecordText());
} }
int index = Integer.parseInt(key.replace(">", "").replace("<", "")); int index = Integer.parseInt(key.replace(">", "").replace("<", ""));
action.setDeviceUserBindEntity(includs.get(index)); action.setDeviceUserBindEntity(includs.get(index));
actions.setName("");//name = ""; actions.setName("");
action.setName(action.getDeviceUserBindEntity().getBindName());//.add(action.getDeviceUserBindEntity().getBindName()); action.setName(action.getDeviceUserBindEntity().getBindName());
actions.setB(1);//b = 1; actions.setB(1);
return action; return action;
} }
}, },
@ -656,6 +656,8 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
private Integer code; private Integer code;
private String name; private String name;
public Integer getCode() { public Integer getCode() {
return code; return code;
} }
@ -683,8 +685,18 @@ public enum ChinesePartSpeechEnum implements IChinesePartSpeech{
} }
return DEFAULT; return DEFAULT;
} }
public static ChinesePartSpeechEnum getWitchValue(String tag) {
for (ChinesePartSpeechEnum e:values()
) {
if(tag.equals(e.toString())){
return e;
}
}
return DEFAULT;
}
private static SystemTalkAnswerConfigEntity getSystemTalkWithKey(String key, ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup){ private static SystemTalkAnswerConfigEntity getSystemTalkWithKey(String key,
ConcurrentHashMap<String, SystemTalkAnswerConfigEntity> keyGroup){
if(keyGroup.containsKey(key)){ if(keyGroup.containsKey(key)){
return keyGroup.get(key); return keyGroup.get(key);
} }

3
iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/NlpKey.java
View File

@ -15,7 +15,8 @@ public class NlpKey {
public void setTagName(String tag) { public void setTagName(String tag) {
tagName = tag; tagName = tag;
ChinesePartSpeechEnum chinesePartSpeechEnum = ChinesePartSpeechEnum.valueOf(tag);
ChinesePartSpeechEnum chinesePartSpeechEnum = ChinesePartSpeechEnum.getWitchValue(tag);//.valueOf(tag);
if(chinesePartSpeechEnum != null){ if(chinesePartSpeechEnum != null){
type = chinesePartSpeechEnum.getCode(); type = chinesePartSpeechEnum.getCode();
} }

5
iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/Actions.java
View File

@ -11,9 +11,12 @@ import java.util.List;
public class Actions { public class Actions {
/** /**
* 下面a,b解析时使用动作，名词计数 * 记录动词为1 一个循环后0
*/ */
int a = 0; int a = 0;
/**
* 记录名词或用户配置的词为1.一个循环后0
*/
int b = 0; int b = 0;
/** /**
* 当前组合的名词 * 当前组合的名词

23
iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/domain/BaseMessageResp.java Normal file
View File

@ -0,0 +1,23 @@
package com.qiuguo.iot.box.websocket.api.domain;
import com.qiuguo.iot.box.websocket.api.domain.box.resp.ActionResp;
import com.qiuguo.iot.data.resp.third.MusicResp;
import lombok.Data;
@Data
public class BaseMessageResp {
/**
* 回答类型0：文本问答 1：iOT控制 2：天气 3：闹钟 4：U3D 100：固件升级 101Box绑定成功
*/
protected Integer type;
/**
* 播放文本内容
*/
protected String text;
/**
* 在线播放音乐信息
*/
protected MusicResp music;
}

11
iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/domain/box/resp/BoxMessageResp.java
View File

@ -1,5 +1,6 @@
package com.qiuguo.iot.box.websocket.api.domain.box.resp; package com.qiuguo.iot.box.websocket.api.domain.box.resp;
import com.qiuguo.iot.box.websocket.api.domain.BaseMessageResp;
import com.qiuguo.iot.data.resp.third.MusicResp; import com.qiuguo.iot.data.resp.third.MusicResp;
import lombok.Data; import lombok.Data;
import org.springframework.web.reactive.socket.WebSocketMessage; import org.springframework.web.reactive.socket.WebSocketMessage;
@ -7,13 +8,11 @@ import org.springframework.web.reactive.socket.WebSocketSession;
import reactor.core.publisher.FluxSink; import reactor.core.publisher.FluxSink;
@Data @Data
public class BoxMessageResp { public class BoxMessageResp extends BaseMessageResp {
Integer type;//响应类型：0，问答响应 1：iOT操作结果响应 2：设置闹钟 3：天气 4：固件升级
String text;//播放文本内容
//其他動作 /**
* U3D動作
*/
ActionResp action; ActionResp action;
MusicResp music;
} }

10
iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/domain/user/UserMessageResp.java Normal file
View File

@ -0,0 +1,10 @@
package com.qiuguo.iot.box.websocket.api.domain.user;
import com.qiuguo.iot.box.websocket.api.domain.BaseMessageResp;
import com.qiuguo.iot.box.websocket.api.domain.box.resp.ActionResp;
import lombok.Data;
@Data
public class UserMessageResp extends BaseMessageResp {
}

2
iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BaseWebSocketProcess.java
View File

@ -346,7 +346,7 @@ public class BaseWebSocketProcess {
log.info("果box聊天记录，同步到客户端"); log.info("果box聊天记录，同步到客户端");
BaseSession userSession = getUserSessionWithUserId(baseSession.getUserId()); BaseSession userSession = getUserSessionWithUserId(baseSession.getUserId());
if(userSession != null){ if(userSession != null){
userSession.getSink().next(baseSession.getSession().textMessage(JSONObject.toJSONString(resp))); userSession.getSink().next(baseSession.getSession().textMessage(msg));
} }
} }
baseSession.getSink().next(baseSession.getSession().textMessage(msg)); baseSession.getSink().next(baseSession.getSession().textMessage(msg));

18
iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BoxWebSocketHandler.java
View File

@ -4,14 +4,13 @@ import cn.hutool.crypto.digest.MD5;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.qiuguo.iot.base.annotation.WebSocketMapping; import com.qiuguo.iot.base.annotation.WebSocketMapping;
import com.qiuguo.iot.base.constans.RedisConstans; import com.qiuguo.iot.base.constans.RedisConstans;
import com.qiuguo.iot.base.enums.DeviceCodeEnum; import com.qiuguo.iot.base.enums.*;
import com.qiuguo.iot.base.enums.DeviceTypeEnum;
import com.qiuguo.iot.base.enums.OrderByEnum;
import com.qiuguo.iot.base.enums.YesNo;
import com.qiuguo.iot.base.model.UserDeviceInfoModel; import com.qiuguo.iot.base.model.UserDeviceInfoModel;
import com.qiuguo.iot.box.websocket.api.domain.BaseSession; import com.qiuguo.iot.box.websocket.api.domain.BaseSession;
import com.qiuguo.iot.box.websocket.api.domain.box.BoxSession; import com.qiuguo.iot.box.websocket.api.domain.box.BoxSession;
import com.qiuguo.iot.box.websocket.api.domain.box.BoxTalkMessage; import com.qiuguo.iot.box.websocket.api.domain.box.BoxTalkMessage;
import com.qiuguo.iot.box.websocket.api.domain.user.UserMessageResp;
import com.qiuguo.iot.box.websocket.api.domain.user.UserTalkMessage;
import com.qiuguo.iot.box.websocket.api.filter.LogMdcConfiguration; import com.qiuguo.iot.box.websocket.api.filter.LogMdcConfiguration;
import com.qiuguo.iot.box.websocket.api.filter.LogWebFilter; import com.qiuguo.iot.box.websocket.api.filter.LogWebFilter;
import com.qiuguo.iot.data.entity.device.DeviceInfoEntity; import com.qiuguo.iot.data.entity.device.DeviceInfoEntity;
@ -221,6 +220,17 @@ public class BoxWebSocketHandler extends BaseWebSocketProcess implements WebSock
operations.set(RedisConstans.USER_BOX_INFO + userId, operations.set(RedisConstans.USER_BOX_INFO + userId,
JSONObject.toJSONString(userDeviceInfoModel), JSONObject.toJSONString(userDeviceInfoModel),
RedisConstans.TEN_YEAR).subscribe(); RedisConstans.TEN_YEAR).subscribe();
//通知用户端设备绑定成功
BaseSession userSession = getUserSessionWithUserId(userId);
if(userSession != null){
//log.info("推送用户通知设备绑定成功");
UserMessageResp userMsgResp = new UserMessageResp();
userMsgResp.setType(AskTypeEnum.BIND_BOX.getCode());
userMsgResp.setText("设备绑定成功，设备序列号：" + dv.getSn());
String msg = JSONObject.toJSONString(userMsgResp);
log.info("推送通知到端msg:{}", msg);
userSession.getSink().next(userSession.getSession().textMessage(msg));
}
return Mono.empty(); return Mono.empty();
}).subscribe(); }).subscribe();
return Mono.empty(); return Mono.empty();

12159
logs/iot-box-websocket-api/error.log
View File

File diff suppressed because one or more lines are too long

12159
logs/iot-box-websocket-api/info.log
View File

File diff suppressed because one or more lines are too long

12159
logs/iot-box-websocket-api/warn.log
View File

File diff suppressed because one or more lines are too long