From 689f6cf360cc492cb86e7167f72274382e9c3e02 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Mon, 23 Jun 2025 14:43:21 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=BF=9E=E7=BB=AD=E6=97=A0=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E8=A7=A3=E6=94=B9=E4=B8=BA=E6=AF=8F=E7=A7=92=E5=8F=91?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E5=86=B7=E5=90=AF=E5=8A=A8=EF=BC=8C=E8=BF=9E?=
 =?UTF-8?q?=E7=BB=AD=E5=8F=9110=E6=AC=A1=202=E3=80=81MQTT=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beidou_fwd/task/GZYMQTTForwarder.java     | 21 ++++++++++++++++---
 .../beidou_fwd/task/ZNYMQTTForwarder.java     | 18 +++++++++++++---
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYMQTTForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYMQTTForwarder.java
index 642e6477..84491bc1 100644
--- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYMQTTForwarder.java
+++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYMQTTForwarder.java
@@ -47,7 +47,12 @@ public class GZYMQTTForwarder extends Forwarder {
     void registerMe() throws MqttException {
         init(FORWARDER_NAME, "MQTT "+brokerUrl,2,FWD_DEVICE_ALIAS_NAME,30);
         mqttClient = new MQTTClient(brokerUrl, username, password,clientid);
-        mqttClient.connect();
+        try{
+            mqttClient.connect();
+        }
+        catch (Exception e){
+            logger.error("gzy mqtt connect failed: {}",e.toString());
+        }
     }
 
     /**
@@ -57,8 +62,18 @@ public class GZYMQTTForwarder extends Forwarder {
     //@Scheduled(cron = "0 0/5 * * * ?") // 每30分钟执行一次
     private void forwardGnss() {
         logger.debug("gzy mqtt forwardGnss");
-        forwardCurrentGnss();
-        //forwardAngleData();
+        if(mqttClient.isConnected()) {
+            forwardCurrentGnss();
+            //forwardAngleData();
+        }
+        else{
+            try{
+                mqttClient.connect();
+            }
+            catch (Exception e){
+                logger.error("gzy mqtt connect failed: {}",e.toString());
+            }
+        }
     }
 
     @Override
diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/ZNYMQTTForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/ZNYMQTTForwarder.java
index 9bb9e550..7010a9c0 100644
--- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/ZNYMQTTForwarder.java
+++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/ZNYMQTTForwarder.java
@@ -49,7 +49,12 @@ public class ZNYMQTTForwarder extends Forwarder {
     void registerMe() throws MqttException {
         init(FORWARDER_NAME, "MQTT "+brokerUrl,4,FWD_DEVICE_ALIAS_NAME,30);
         mqttClient = new MQTTClient(brokerUrl, username, password,clientid);
-        mqttClient.connect();
+        try{
+            mqttClient.connect();
+        }
+        catch (Exception e){
+            logger.error("zny mqtt connect failed: {}",e.toString());
+        }
     }
 
     /**
@@ -59,8 +64,15 @@ public class ZNYMQTTForwarder extends Forwarder {
     @Scheduled(cron = "0 0/30 * * * ?") // 每30分钟执行一次
     private void forwardGnss() {
         logger.debug("zny mqtt forwardGnss");
-        forwardCurrentGnss();
-        //forwardAngleData();
+        if(mqttClient.isConnected()) forwardCurrentGnss();
+        else{
+            try{
+                mqttClient.connect();
+            }
+            catch (Exception e){
+                logger.error("zny mqtt connect failed: {}",e.toString());
+            }
+        }
     }
 
     @Override