From b09534d85ab2344151f570fd51889aca4da396b3 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 05 六月 2025 09:10:12 +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 |   42 ++++++++++++++++++++++--------------------
 1 files changed, 22 insertions(+), 20 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 c27e09d..6a485d5 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
@@ -14,10 +14,14 @@
 @Component
 public class MqttPushUtil {
 
-    private final static String HOST = "tcp://127.0.0.1:9882";
-    private final static String CLIENT_ID = "mqttx_3267186711111fdsasdsa";
-    private final static String USER_NAME = "admin";
-    private final static String PASS_WORD = "mingxingdianli123";
+//    private final static String HOST = "tcp://127.0.0.1:9882";
+//    private final static String CLIENT_ID = "mqttx_3267186711111fdsasdsa";
+//    private final static String USER_NAME = "admin";
+//    private final static String PASS_WORD = "mingxingdianli123";
+    private final static String HOST = "tcp://182.129.202.2:1883";
+    private final static String CLIENT_ID = "mqttx_3267186711111mxcdszyun";
+    private final static String USER_NAME = "mxEmqx";
+    private final static String PASS_WORD = "csDN_wlwpt";
     private final static Integer TIME_OUT = 30000;
     private final static Integer KEEP_ALIVE = 60000;
     private MqttClient mqttClient;
@@ -28,12 +32,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()+"]");
@@ -43,19 +45,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