From 0306d5836a7a56614e01af35b9e70f0224b47cb2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 14 十二月 2023 13:51:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java b/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java
index 29965fa..e811055 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java
@@ -86,10 +86,17 @@
                 StatisticalService statisticalService = SpringUtils.getBean(StatisticalService.class);
                 statisticalService.data(new String(message.getPayload(), StandardCharsets.UTF_8));
             }
+            //鎺ユ敹闆疯揪寮哄埗寮曞鏁版嵁
             if (topic.equals("radarForceGuide"))
             {
                 ArdRadarService ardRadarService = SpringUtils.getBean(ArdRadarService.class);
                 ardRadarService.forceGuide(new String(message.getPayload(), StandardCharsets.UTF_8));
+            }
+            //鎺ユ敹闆疯揪寮曞杩借釜鏁版嵁
+            if (topic.equals("radarFollowGuide"))
+            {
+                ArdRadarService ardRadarService = SpringUtils.getBean(ArdRadarService.class);
+                ardRadarService.followGuide(new String(message.getPayload(), StandardCharsets.UTF_8));
             }
         } catch (Exception e) {
             log.debug("澶勭悊mqtt娑堟伅寮傚父:" + e);
@@ -106,7 +113,7 @@
                 if (client.isConnected()) {
                     client.subscribe(topic, qos);
                     log.info("mqtt杩炴帴鎴愬姛" );
-                    log.info("--璁㈤槄涓婚:锛�" + Arrays.toString(topic));
+                    log.info("璁㈤槄涓婚:" + Arrays.toString(topic));
                 } else {
                     log.info("mqtt杩炴帴澶辫触");
                 }

--
Gitblit v1.9.3