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

分装部分nlp

Browse Source
This commit is contained in:
wulin 2023-09-25 17:42:25 +08:00
parent c18f94cf40
commit a27062040a
16 changed files with 6680 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,6 +97,9 @@ public class SystemTalkAnswerConfigService extends GenericReactiveCrudService<Sy
if(request.getKeyOrder() != null){
reactiveQuery = reactiveQuery.and(SystemTalkAnswerConfigRequest::getKeyOrder, request.getKeyOrder());
}
if(request.getAnswerType() != null){
reactiveQuery = reactiveQuery.and(SystemTalkAnswerConfigRequest::getAnswerType, request.getAnswerType());
}
SortOrder sortOrder = null;
if(StringUtils.isNotEmpty(request.getOrder())){
if(StringUtils.isNotEmpty(request.getSort()) && request.getSort().compareTo("0") == 0){
@ -156,6 +159,9 @@ public class SystemTalkAnswerConfigService extends GenericReactiveCrudService<Sy
if(StringUtils.isNotEmpty(request.getAnswerBackImg())){
reactiveQuery = reactiveQuery.$like$(SystemTalkAnswerConfigRequest::getAnswerBackImg, request.getAnswerBackImg());
}
if(request.getAnswerType() != null){
reactiveQuery = reactiveQuery.and(SystemTalkAnswerConfigRequest::getAnswerType, request.getAnswerType());
}
if(request.getKeyOrder() != null){
reactiveQuery = reactiveQuery.and(SystemTalkAnswerConfigRequest::getKeyOrder, request.getKeyOrder());
}
@ -229,6 +235,9 @@ public class SystemTalkAnswerConfigService extends GenericReactiveCrudService<Sy
if(entity.getKeyOrder() != null){
update = update.set(SystemTalkAnswerConfigEntity::getKeyOrder, entity.getKeyOrder());
}
if(entity.getAnswerType() != null){
update = update.set(SystemTalkAnswerConfigEntity::getAnswerType, entity.getAnswerType());
}
return update.where(SystemTalkAnswerConfigEntity::getId, entity.getId()).and("is_delete", 0).execute();
}
@ -247,6 +256,7 @@ public class SystemTalkAnswerConfigService extends GenericReactiveCrudService<Sy
update = update.set(SystemTalkAnswerConfigEntity::getAnswerBackSound, entity.getAnswerBackSound());
update = update.set(SystemTalkAnswerConfigEntity::getAnswerBackImg, entity.getAnswerBackImg());
update = update.set(SystemTalkAnswerConfigEntity::getKeyOrder, entity.getKeyOrder());
update = update.set(SystemTalkAnswerConfigEntity::getAnswerType, entity.getAnswerType());
return update.where(SystemTalkAnswerConfigEntity::getId, entity.getId()).and("is_delete", 0).execute();
}
@ -261,5 +271,7 @@ public class SystemTalkAnswerConfigService extends GenericReactiveCrudService<Sy
}
public SystemTalkAnswerConfigEntity getSystemTalkWithKey(String key) {
return group.get(key);
}
}

3
iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/INlp.java → iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/INlp.java
View File

@ -1,6 +1,5 @@
package com.qiuguo.iot.base.nlp;
package com.qiuguo.iot.third.nlp;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.util.List;

2
iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/Nlp.java → iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/Nlp.java
View File

@ -1,4 +1,4 @@
package com.qiuguo.iot.base.nlp;
package com.qiuguo.iot.third.nlp;
import lombok.Data;

2
iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/NlpKey.java → iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/NlpKey.java
View File

@ -1,4 +1,4 @@
package com.qiuguo.iot.base.nlp;
package com.qiuguo.iot.third.nlp;
import com.qiuguo.iot.base.enums.ChinesePartSpeechEnum;
import lombok.Data;

2
iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/action/Action.java → iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/Action.java
View File

@ -1,4 +1,4 @@
package com.qiuguo.iot.base.nlp.action;
package com.qiuguo.iot.third.nlp.action;
import lombok.Data;
import lombok.NoArgsConstructor;

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

@ -1,8 +1,9 @@
package com.qiuguo.iot.base.nlp.action;
package com.qiuguo.iot.third.nlp.action;
import com.qiuguo.iot.base.enums.ChinesePartSpeechEnum;
import com.qiuguo.iot.base.nlp.Nlp;
import com.qiuguo.iot.base.nlp.NlpKey;
import com.qiuguo.iot.base.utils.StringUtils;
import com.qiuguo.iot.third.nlp.Nlp;
import com.qiuguo.iot.third.nlp.NlpKey;
import lombok.Data;
import java.util.ArrayList;
@ -18,6 +19,7 @@ public class Actions {
actions = new ArrayList<>();
nlp.getKeys().sort(Comparator.comparing(NlpKey::getType)); //解析,按照type从小到大排序
Action action = new Action();
String name = "";
action.setName(new ArrayList<>());
for (NlpKey key : nlp.getKeys()
) {
@ -25,10 +27,18 @@ public class Actions {
if(key.getType().equals(ChinesePartSpeechEnum.v.getCode())){
action.setAction(key.getKey());
}else if(key.getType().equals(ChinesePartSpeechEnum.n.getCode())){
action.getName().add(key.getKey());
}else if(key.getType().equals(ChinesePartSpeechEnum.a.getCode())){
action.setStatus(key.getKey());
name += key.getKey();
//action.getName().add(key.getKey());
}else if(key.getType().equals(ChinesePartSpeechEnum.c.getCode())){
//action.setStatus(key.getKey());
if(StringUtils.isNotEmpty(name)){
action.getName().add(name);
}
}
}
if(StringUtils.isNotEmpty(name)){
action.getName().add(name);
}
actions.add(action);
}
}

2
iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/lac/LacRequest.java → iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/lac/LacRequest.java
View File

@ -1,4 +1,4 @@
package com.qiuguo.iot.base.nlp.lac;
package com.qiuguo.iot.third.nlp.lac;
import lombok.Data;

21
iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/lac/LacNlp.java → iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/LacNlpService.java
View File

@ -1,16 +1,17 @@
package com.qiuguo.iot.base.nlp.lac;
package com.qiuguo.iot.third.service;
import cn.hutool.extra.spring.SpringUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.qiuguo.iot.base.nlp.INlp;
import com.qiuguo.iot.base.nlp.Nlp;
import com.qiuguo.iot.base.nlp.NlpKey;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.qiuguo.iot.third.nlp.INlp;
import com.qiuguo.iot.third.nlp.Nlp;
import com.qiuguo.iot.third.nlp.NlpKey;
import com.qiuguo.iot.third.nlp.lac.LacRequest;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Service;
import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Mono;
@ -28,14 +29,16 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
* @since 2023-09-06
*/
//LAC中的tag说明 v：动词 n：名称 PER/nr：人名 a：量词 w：标点符号 m：数字（中文、阿拉伯） TIME：时间词 vn：动名词组 xc：语气词 c：连接词
@Service
@Slf4j
public class LacNlp implements INlp {
public class LacNlpService implements INlp {
private static WebClient webClient = WebClient.builder()
.defaultHeader(HttpHeaders.CONTENT_TYPE, APPLICATION_JSON_VALUE).build();
@Value("${lac.url}")
private String url;
private Mono<JSONObject> getNlpFromLac(LacRequest request){
return webClient.post().uri(SpringUtil.getProperty("lac.url") + "/predict/lac").bodyValue(JSONObject.toJSON(request))
return webClient.post().uri(url + "/predict/lac").bodyValue(JSONObject.toJSON(request))
.retrieve()
.bodyToMono(JSONObject.class).doOnNext(res -> {
if (!Objects.equals(res.getInteger("status"), 0)) {

22
iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/NlpService.java Normal file
View File

@ -0,0 +1,22 @@
package com.qiuguo.iot.third.service;
import com.qiuguo.iot.third.nlp.INlp;
import com.qiuguo.iot.third.nlp.action.Actions;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import reactor.core.publisher.Mono;
import javax.annotation.Resource;
@Service
@Slf4j
public class NlpService {
@Resource
private LacNlpService liguoNlpService;
public Mono<Actions> getActionWithLacSingle(String text){
return liguoNlpService.geSingletNlp(text).map(nlp -> {
return new Actions(nlp);
});
}
}

6
iot-modules/iot-box-websocket-api/pom.xml
View File

@ -57,6 +57,12 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.qiuguo.iot</groupId>
<artifactId>iot-third</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>

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

@ -5,7 +5,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication(scanBasePackages = {"com.qiuguo.iot.box.websocket.api", "com.qiuguo.iot.data.service"})
@SpringBootApplication(scanBasePackages = {"com.qiuguo.iot.box.websocket.api", "com.qiuguo.iot.data.service", "com.qiuguo.iot.third.service"})
@EnableEasyormRepository(value = "com.qiuguo.iot.data.entity.*")
public class IotBoxWebsocketApplication {

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

@ -8,9 +8,11 @@ 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.filter.LogMdcConfiguration;
import com.qiuguo.iot.data.entity.device.DeviceInfoEntity;
import com.qiuguo.iot.data.entity.system.SystemTalkAnswerConfigEntity;
import com.qiuguo.iot.data.request.device.DeviceInfoRequest;
import com.qiuguo.iot.data.service.device.DeviceInfoService;
import com.qiuguo.iot.data.service.system.SystemTalkAnswerConfigService;
import com.qiuguo.iot.third.service.NlpService;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.MDC;
import org.springframework.beans.factory.annotation.Value;
@ -42,6 +44,9 @@ public class BoxWebSocketHandler implements WebSocketHandler {
@Resource
private SystemTalkAnswerConfigService systemTalkAnswerConfigService;
@Resource
private NlpService nlpService;
public static ConcurrentHashMap<String, BoxSession> group = new ConcurrentHashMap<>();
@Override
@ -57,49 +62,33 @@ public class BoxWebSocketHandler implements WebSocketHandler {
return session.close();
}
String token = headers.get("signature").get(0);
ReactiveValueOperations<String, String> operations = reactiveStringRedisTemplate.opsForValue();
//校验token
checkToken(sn, linkTime, token);
//
operations.get(RedisConstans.DEVICE_INFO + sn).defaultIfEmpty("").flatMap(s -> {
if(com.qiuguo.iot.base.utils.StringUtils.isNotBlank(s)){
try{
DeviceInfoEntity dv = JSONObject.parseObject(s, DeviceInfoEntity.class);
return Mono.just(dv);
}catch (Exception e){
log.info("转换异常{}", e);
}
}
DeviceInfoRequest request = new DeviceInfoRequest();
request.setSn(sn);
return deviceInfoService.selectDeviceInfoByRequest(request).defaultIfEmpty(new DeviceInfoEntity()).map(dv -> {
if(dv.getId() != null){
operations.set(RedisConstans.DEVICE_INFO + dv.getSn(), JSONObject.toJSONString(dv), RedisConstans.ONE_HOUR).subscribe();//直接提交订阅
}
return dv;
});
}).map(dv ->{
String snMd5 = MD5.create().digestHex(sn).toUpperCase();
String wifiMd5 = MD5.create().digestHex(dv.getWifiMac()).toUpperCase();
String btMd5 = MD5.create().digestHex(dv.getBtMac()).toUpperCase();
String signalMd5 = MD5.create().digestHex(snMd5 + wifiMd5 + btMd5 + linkTime + dv.getKey()).toUpperCase();
if(!signalMd5.equals(token)){
log.info("设备{}，验签失败", sn);
//session.send(session.textMessage(""));
BoxSession boxSession = getBoxSessionWithSn(sn);
if(boxSession != null){
boxSession.getSink().next(session.textMessage("验签失败"));
}
session.close().subscribe();
}
return Mono.empty();
}).subscribe();
log.info("登录成功SN:{}", sn);
log.info("登录成功SN:{}", sn);
Mono<Void> input = session.receive().map(webSocketMessage ->{
//MDC.put(LogMdcConfiguration.PRINT_LOG_ID, getBoxSessionWithSn().getLogId());
String text = webSocketMessage.getPayloadAsText();
log.info("设备端收到消息：{}", text);
BoxTalkMessage boxTalkMessage = JSONObject.parseObject(text, BoxTalkMessage.class);
nlpService.getActionWithLacSingle(boxTalkMessage.getMessage()).map(actions -> {
//处理
if(actions.getActions().size() > 0){
SystemTalkAnswerConfigEntity talkAnswerConfigEntity =
systemTalkAnswerConfigService.getSystemTalkWithKey(actions.getActions().get(0).getAction());
log.info("匹配到自定义指令{}", talkAnswerConfigEntity);
}else{
//调用千问回答
log.info("未匹配到自定义命令，调用千问");
}
return Mono.empty();
}).thenEmpty(empty ->{
//调用千问回答
log.info("未匹配到自定义命令，调用千问");
}).subscribe();
log.info("收到SN:{}，消息{}", boxTalkMessage.getSn(), boxTalkMessage.getMessage());
//MDC.remove(LogMdcConfiguration.PRINT_LOG_ID);
return Mono.empty();
@ -120,9 +109,44 @@ public class BoxWebSocketHandler implements WebSocketHandler {
log.info("设备断开连接SN：{}", boxSession.getSn());
// MDC.remove(LogMdcConfiguration.PRINT_LOG_ID);
}).then();
}
private void checkToken(String sn, Long linkTime, String token){
ReactiveValueOperations<String, String> operations = reactiveStringRedisTemplate.opsForValue();
operations.get(RedisConstans.DEVICE_INFO + sn).defaultIfEmpty("").flatMap(s -> {
if(com.qiuguo.iot.base.utils.StringUtils.isNotBlank(s)){
try{
DeviceInfoEntity dv = JSONObject.parseObject(s, DeviceInfoEntity.class);
return Mono.just(dv);
}catch (Exception e){
log.info("转换异常{}", e);
}
}
DeviceInfoRequest request = new DeviceInfoRequest();
request.setSn(sn);
return deviceInfoService.selectDeviceInfoByRequest(request).defaultIfEmpty(new DeviceInfoEntity()).map(dv -> {
if(dv.getId() != null){
operations.set(RedisConstans.DEVICE_INFO + dv.getSn(), JSONObject.toJSONString(dv), RedisConstans.ONE_HOUR).subscribe();//直接提交订阅
}
return dv;
});
}).map(dv ->{
String snMd5 = MD5.create().digestHex(sn).toUpperCase();
String wifiMd5 = MD5.create().digestHex(dv.getWifiMac()).toUpperCase();
String btMd5 = MD5.create().digestHex(dv.getBtMac()).toUpperCase();
String signalMd5 = MD5.create().digestHex(snMd5 + wifiMd5 + btMd5 + linkTime + dv.getKey()).toUpperCase();
if(!signalMd5.equals(token)){
log.info("设备{}，验签失败", sn);
//session.send(session.textMessage(""));
BoxSession boxSession = getBoxSessionWithSn(sn);
if(boxSession != null){
boxSession.getSink().next(boxSession.getSession().textMessage("验签失败"));
}
boxSession.getSession().close().subscribe();
}
return Mono.empty();
}).subscribe();
}
public BoxSession getBoxSessionWithSn(String sn) {

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

@ -21,6 +21,7 @@ import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import javax.annotation.Resource;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@Component
@ -40,6 +41,7 @@ public class CustomerWebSocketHandler implements WebSocketHandler {
public Mono<Void> handle(WebSocketSession session) {
HandshakeInfo handshakeInfo = session.getHandshakeInfo();
HttpHeaders headers = handshakeInfo.getHeaders();
//List<String> tokens = headers.get("token");
String token = headers.get("token").get(0);
Long userId = Long.valueOf(headers.get("userId").get(0));
Long linkTime = Long.parseLong(headers.get("time").get(0));
@ -50,7 +52,7 @@ public class CustomerWebSocketHandler implements WebSocketHandler {
}
ReactiveValueOperations<String, String> operations = reactiveStringRedisTemplate.opsForValue();
operations.get(RedisConstans.DEVICE_INFO + userId).defaultIfEmpty("").flatMap(s -> {
operations.get(RedisConstans.DEVICE_INFO + userId).defaultIfEmpty("ba2ef9fd8a70a6ac72c38aa6a46be4f6").flatMap(s -> {
if(com.qiuguo.iot.base.utils.StringUtils.isNotBlank(s)){
if(!token.equals(s)){
log.info("验签失败{}", userId);
@ -87,7 +89,7 @@ public class CustomerWebSocketHandler implements WebSocketHandler {
return Mono.zip(input, output).doFinally(signalType -> {
// MDC.put(LogMdcConfiguration.PRINT_LOG_ID, requestId);
group.remove(userSession.getUserId());//断链后及时移除
log.info("设备断开连接SN：{}", userSession.getUserId());
log.info("用户断开连接SN：{}", userSession.getUserId());
// MDC.remove(LogMdcConfiguration.PRINT_LOG_ID);
}).then();
}

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff