From 61bb793f62b677b51b136059a1f131db5843eb9c Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 15 Nov 2023 19:53:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=8F=91=E9=80=81=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E9=80=80=E5=87=BA=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/handler/BoxWebSocketHandler.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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);