From ae28807818efd35fd211270213feca671f77718c Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Mon, 30 Jun 2025 23:26:21 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8F=96=E6=B6=88=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/imdroid/beidou_fwd/task/GXJKForwarder.java   | 2 +-
 .../java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java  | 5 ++---
 .../com/imdroid/beidou_fwd/task/GZYMQTTForwarder.java     | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXJKForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXJKForwarder.java
index c6fea8c4..facc51bb 100644
--- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXJKForwarder.java
+++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXJKForwarder.java
@@ -49,7 +49,7 @@ public class GXJKForwarder extends Forwarder {
     /**
      * 每半小时转发GNSS解算结果
      */
-    @Scheduled(cron = "0 0/10 * * * ?") // 每30分钟执行一次
+    @Scheduled(cron = "0 0/30 * * * ?") // 每30分钟执行一次
     private void forwardGnss() {
         logger.debug("gxjk forwardGnss");
         if(mqttClient.isConnected()) forwardCurrentGnss();
diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java
index 8ddf348b..ab6897fc 100644
--- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java
+++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java
@@ -67,11 +67,10 @@ public class GXXfzForwarder extends Forwarder{
     /**
      * 每半小时转发GNSS解算结果
      */
-    @Scheduled(cron = "0 0/10 * * * ?") // 每30分钟执行一次
+    @Scheduled(cron = "0 0/30 * * * ?") // 每30分钟执行一次
     private void forwardGnss() {
         logger.debug("xfz forwardGnss");
-        //forwardCurrentGnss();
-        forwardHistoryGnss();
+        forwardCurrentGnss();
     }
 /*
     @Scheduled(cron = "0 0/10 * * * ?") // 每30分钟执行一次
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 244cb65d..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
@@ -58,13 +58,13 @@ public class GZYMQTTForwarder extends Forwarder {
     /**
      * 每半小时转发GNSS解算结果
      */
-    //@Scheduled(cron = "0 0 0/1 * * ?") // 每小时执行一次
-    @Scheduled(cron = "0 0/10 * * * ?") // 每30分钟执行一次
+    @Scheduled(cron = "0 0 0/1 * * ?") // 每小时执行一次
+    //@Scheduled(cron = "0 0/5 * * * ?") // 每30分钟执行一次
     private void forwardGnss() {
         logger.debug("gzy mqtt forwardGnss");
         if(mqttClient.isConnected()) {
-            //forwardCurrentGnss();
-            forwardHistoryGnss();
+            forwardCurrentGnss();
+            //forwardAngleData();
         }
         else{
             try{