From ba2e6c5fa2e21f535da27f29e54da2d6c7eb9aaa Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 15 七月 2025 10:47:14 +0800
Subject: [PATCH] 硬件数据推送

---
 ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/callback/PushCallback.java         |    3 ---
 ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/util/MqttPushUtil.java             |   30 ++++++++++++++++++++++++++++--
 ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java |    2 +-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java
index 9741636..d1cab39 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java
@@ -35,7 +35,7 @@
     /**
      * 每天的9点执行的任务
      */
-    @Scheduled(cron = "0 0 10 * * *")
+    @Scheduled(cron = "0 0 11 * * *")
     public void taskDay(){
         try {
             // 传输mongodb的硬件数据
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/callback/PushCallback.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/callback/PushCallback.java
index 14c0bd2..4d18bd6 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/callback/PushCallback.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/callback/PushCallback.java
@@ -35,11 +35,8 @@
     public void connectionLost(Throwable throwable) {
         if (client == null || !client.isConnected()) {
             System.out.println("连接断开,正在重连....");
-            int[] Qos  = {0};
-            String[] topic1 = {TopicConstants.CHARGE_PILE_CODE};
             try {
                 client.connect(options);
-                client.subscribe(topic1, Qos);
                 log.info("连接失败重连成功");
             } catch (MqttException e) {
                 log.info("连接失败重连失败");
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 6a485d5..a76477a 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
@@ -73,13 +73,29 @@
             // 设置超时时间 单位为秒
             options.setConnectionTimeout(TIME_OUT);///默认:30
             // 设置是否清空session,这里如果设置为false表示服务器会保留客户端的连接记录,设置为true表示每次连接到服务器都以新的身份连接
-            options.setCleanSession(false);//默认:true
+            options.setCleanSession(true);//默认:true
             // 设置断开后重新连接(设置为true时将启用自动重新连接)
             options.setAutomaticReconnect(true);//默认:false
             // 设置会话心跳时间 单位为秒 服务器会每隔1.5*20秒的时间向客户端发送个消息判断客户端是否在线,但这个方法并没有重连的机制
             options.setKeepAliveInterval(KEEP_ALIVE);//默认:60
             // 设置回调
-            mqttClient.setCallback(new PushCallback());
+            mqttClient.setCallback(new MqttCallback() {
+                @Override
+                public void connectionLost(Throwable cause) {
+                    System.out.println("Connection lost, reconnecting...");
+                    reconnect();
+                }
+
+                @Override
+                public void messageArrived(String topic, MqttMessage message) throws Exception {
+                    System.out.println("Message arrived: " + new String(message.getPayload()));
+                }
+
+                @Override
+                public void deliveryComplete(IMqttDeliveryToken token) {
+                    System.out.println("Delivery complete");
+                }
+            });
             mqttClient.connect(options);
         } catch (Exception e) {
             e.printStackTrace();
@@ -121,6 +137,16 @@
         mqttClient.connect(options);
     }
 
+    public void reconnect() {
+        while (!mqttClient.isConnected()) {
+            try {
+                mqttClient.connect();
+            } catch (MqttException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
     /**
      * 发布,默认qos为0,非持久化
      */

--
Gitblit v1.7.1