From b89f1d3745044fec20c9cfe7a94bdb301d2ae645 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 08 五月 2025 17:47:09 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev

---
 ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/util/MqttPushUtil.java |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/util/MqttPushUtil.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/util/MqttPushUtil.java
index 2f78687..aabab4c 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/util/MqttPushUtil.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/util/MqttPushUtil.java
@@ -11,6 +11,7 @@
 import org.springframework.stereotype.Component;
 
 @Slf4j
+@Component
 public class MqttPushUtil {
 
     private final static String HOST = "tcp://127.0.0.1:9882";
@@ -27,12 +28,10 @@
      * @param message
      * @return
      */
-    public static R<String> pushChargePileData(String topic, String message){
+    public R<String> pushChargePileData(String topic, String message){
         try {
-            MqttPushUtil mqttConnect = new MqttPushUtil();
-            mqttConnect.start();
             //发布消息
-            mqttConnect.publish(topic,message);
+            this.publish(topic,message);
             return R.ok("["+topic+"]-推送成功;内容为:["+message+"]");
         } catch (MqttException e) {
             return R.fail("推送失败:["+e.getMessage()+"]");
@@ -42,19 +41,19 @@
     /**
      * 测试订阅消息
      */
-    public static void main(String[] args) throws Exception {
-        MqttPushUtil mqttConnect = new MqttPushUtil();
-        mqttConnect.start();
-        //订阅消息
-        mqttConnect.publish("/cmt/IoT/pub/8/6700/status/silent","message11消息");
-    }
-
-//    @Bean
-//    public MqttPushUtil getMqttPushClient() {
-//        //连接至mqtt服务器,获取mqtt连接
-//        this.start();
-//        return this;
+//    public static void main(String[] args) throws Exception {
+//        MqttPushUtil mqttConnect = new MqttPushUtil();
+//        mqttConnect.start();
+//        //订阅消息
+//        mqttConnect.publish("/cmt/IoT/pub/8/6700/status/silent","message11消息");
 //    }
+
+    @Bean
+    public MqttPushUtil getMqttPushClient() {
+        //连接至mqtt服务器,获取mqtt连接
+        this.start();
+        return this;
+    }
     /**
      * 初始化mqtt链接
      * @throws MqttException

--
Gitblit v1.7.1