From 49f4538e5b42e3dd1e864ad6260cc2220d9343a7 Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 15 Nov 2023 19:47:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E5=8F=8D?= =?UTF-8?q?=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qiuguo/iot/box/websocket/api/command/TimeActionCommand.java | 2 +- .../iot/box/websocket/api/handler/BoxWebSocketHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/command/TimeActionCommand.java b/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/command/TimeActionCommand.java index d0198ca..9360c19 100644 --- a/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/command/TimeActionCommand.java +++ b/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/command/TimeActionCommand.java @@ -64,7 +64,7 @@ public class TimeActionCommand extends ActionCommand implements IActionCommand{ resp.setText(action.getAsk().replaceAll(action.getAction(), getDayOfWeek(action.getTime().getDetailTime().getLocalDateTime().format(df)))); resp.setTime(dateTimeResp); - return baseWebSocketService.send .Message( + return baseWebSocketService.sendMessage( action, baseSession, resp); 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 6ec7aa7..abd99fa 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,7 +157,7 @@ public class BoxWebSocketHandler implements WebSocketHandler { return baseWebSocketService.closeSendMsg(boxSession, "设备信息不全", AskTypeEnum.TIME.getCode()); } log.info("收到SN:{}，消息：{}", boxTalkMessage.getSn(), boxTalkMessage.getMessage()); - if(boxTalkMessage.getType().equals(YesNo.NO.getCode())){ + if(YesNo.NO.getCode().equals(boxTalkMessage.getType())){ if(StringUtils.isEmpty(boxTalkMessage.getMessage())){ log.info("收到空字符串，不处理，请求编号+1"); boxSession.setRequestId(boxSession.getRequestId() + 1);