diff --git a/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BoxWebSocketHandler.java b/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BoxWebSocketHandler.java index abd99fa..544c488 100644 --- a/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BoxWebSocketHandler.java +++ b/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BoxWebSocketHandler.java @@ -157,13 +157,7 @@ public class BoxWebSocketHandler implements WebSocketHandler { return baseWebSocketService.closeSendMsg(boxSession, "设备信息不全", AskTypeEnum.TIME.getCode()); } log.info("收到SN:{},消息:{}", boxTalkMessage.getSn(), boxTalkMessage.getMessage()); - if(YesNo.NO.getCode().equals(boxTalkMessage.getType())){ - if(StringUtils.isEmpty(boxTalkMessage.getMessage())){ - log.info("收到空字符串,不处理,请求编号+1"); - boxSession.setRequestId(boxSession.getRequestId() + 1); - return Mono.empty(); - } - }else{ + if(YesNo.YES.getCode().equals(boxTalkMessage.getType())){ return deviceAlarmClockRecordService.selectDeviceAlarmClockRecordById(boxTalkMessage.getId()) .defaultIfEmpty(new DeviceAlarmClockRecordEntity()) .flatMap(alarm -> { @@ -176,6 +170,13 @@ public class BoxWebSocketHandler implements WebSocketHandler { 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);