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-15 19:53:42 +08:00
parent 49f4538e5b
commit 61bb793f62
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,13 +157,7 @@ public class BoxWebSocketHandler implements WebSocketHandler {
return baseWebSocketService.closeSendMsg(boxSession, "设备信息不全", AskTypeEnum.TIME.getCode()); return baseWebSocketService.closeSendMsg(boxSession, "设备信息不全", AskTypeEnum.TIME.getCode());
} }
log.info("收到SN:{}，消息：{}", boxTalkMessage.getSn(), boxTalkMessage.getMessage()); log.info("收到SN:{}，消息：{}", boxTalkMessage.getSn(), boxTalkMessage.getMessage());
if(YesNo.NO.getCode().equals(boxTalkMessage.getType())){ if(YesNo.YES.getCode().equals(boxTalkMessage.getType())){
if(StringUtils.isEmpty(boxTalkMessage.getMessage())){
log.info("收到空字符串，不处理，请求编号+1");
boxSession.setRequestId(boxSession.getRequestId() + 1);
return Mono.empty();
}
}else{
return deviceAlarmClockRecordService.selectDeviceAlarmClockRecordById(boxTalkMessage.getId()) return deviceAlarmClockRecordService.selectDeviceAlarmClockRecordById(boxTalkMessage.getId())
.defaultIfEmpty(new DeviceAlarmClockRecordEntity()) .defaultIfEmpty(new DeviceAlarmClockRecordEntity())
.flatMap(alarm -> { .flatMap(alarm -> {
@ -176,6 +170,13 @@ public class BoxWebSocketHandler implements WebSocketHandler {
return processMessage(boxSession, boxTalkMessage); return processMessage(boxSession, boxTalkMessage);
} }
}); });
}else{
if(StringUtils.isEmpty(boxTalkMessage.getMessage())){
log.info("收到空字符串，不处理，请求编号+1");
boxSession.setRequestId(boxSession.getRequestId() + 1);
return Mono.empty();
}
} }
return processMessage(boxSession, boxTalkMessage); return processMessage(boxSession, boxTalkMessage);