From 588e823357bb227a273e97388d3129b5c07a05b1 Mon Sep 17 00:00:00 2001 From: wulin Date: Sun, 29 Oct 2023 22:19:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0box=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E8=BF=87=E6=9D=A5=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=A4=84=E7=90=86=E8=AF=B7=E6=B1=82=E7=BC=96?= =?UTF-8?q?=E5=8F=B7+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qiuguo/iot/user/api/listener/YunxiListener.java | 8 ++++++++ .../box/websocket/api/handler/BoxWebSocketHandler.java | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/listener/YunxiListener.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/listener/YunxiListener.java index f0c3fa8..2e1e508 100644 --- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/listener/YunxiListener.java +++ b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/listener/YunxiListener.java @@ -18,5 +18,13 @@ import java.io.IOException; @Component @Slf4j public class YunxiListener { + @RabbitListener(queues = YunxiRabbitConst.QUEUE_YUNXI, containerFactory = "simpleRabbitListenerContainerFactory") + public void processYunxiQueue(Channel channel, Message message) throws IOException { + String messageContent = new String(message.getBody(), "UTF-8"); + System.out.println("YunxiListener msg " + messageContent); + //TODO 消费者处理程序 + //处理完毕 手动消息确认 配置需开启 acknowledge-mode: manual + channel.basicAck(message.getMessageProperties().getDeliveryTag(), false); + } } 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 d4c9cab..fef72e4 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 @@ -151,6 +151,11 @@ public class BoxWebSocketHandler implements WebSocketHandler { return baseWebSocketService.closeSendMsg(boxSession, "设备信息不全", AskTypeEnum.TIME.getCode()); } log.info("收到SN:{}，消息：{}", boxTalkMessage.getSn(), boxTalkMessage.getMessage()); + if(StringUtils.isEmpty(boxTalkMessage.getMessage())){ + log.info("收到空字符串，不处理，请求编号+1"); + boxSession.setRequestId(boxSession.getRequestId() + 1); + return Mono.empty(); + } return nlpService.getActionWithLacSingle( boxSession.getUserId(), boxTalkMessage.getMessage(),