From 85c37783859ab41f257c0b1c78a7d341849d9845 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Mon, 11 Dec 2023 16:06:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A1=A5=E4=BC=A0=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E7=AC=AC=E4=B8=89=E6=96=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/imdroid/sideslope/fwd/ForwardGnssTask.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/fwd/ForwardGnssTask.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/fwd/ForwardGnssTask.java
index 06d68441..5719b0cf 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/fwd/ForwardGnssTask.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/fwd/ForwardGnssTask.java
@@ -82,7 +82,6 @@ public class ForwardGnssTask {
 
         // 转发新发展数据
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        String sendTime = nowTime.format(formatter);
         String sendAfterTime = nowTime.minusMinutes(30).format(formatter);
 
         QueryWrapper<GnssDevice> queryWrapper = new QueryWrapper<>();
@@ -113,12 +112,12 @@ public class ForwardGnssTask {
 
         // 按项目打包推送
         for (Map.Entry<String, List<GnssCalcData>> entry: projects.entrySet()){
-            SendToXFZ(entry.getKey(), entry.getValue(), sendTime);
+            SendToXFZ(entry.getKey(), entry.getValue());
         }
 
     }
 
-    void SendToXFZ(String projectId, List<GnssCalcData> records, String sendTime){
+    void SendToXFZ(String projectId, List<GnssCalcData> records){
         if(records.size() == 0) return;
 
         XFZTcpMessage xfzTcpMessage = new XFZTcpMessage();
@@ -129,9 +128,10 @@ public class ForwardGnssTask {
         xfzTcpMessage.setData(dataList);
 
         for(GnssCalcData locationRecord: records) {
+            if(!locationRecord.getEnabled()) continue;
             XFZTcpMessage.Data data = new XFZTcpMessage.Data();
             dataList.add(data);
-            data.setDataTime(sendTime);
+            data.setDataTime(locationRecord.getCreatetime().format(dateFormatter));
             data.setDevNum(locationRecord.getDeviceid());
             data.setDevtype("GNSS");
             // 单位由mm转化为m
@@ -154,11 +154,15 @@ public class ForwardGnssTask {
             if(calcData.getEnabled() &&
                     calcData.getCreatetime().isAfter(lastTime.plusMinutes(28))){
                 // 推送
-                SendOneToXFZ(projectId, calcData,lastTime.format(dateFormatter));
                 lastTime = calcData.getCreatetime();
             }
+            else{
+                calcData.setEnabled(false);//借用来表示不推送，不会保存到数据库
+            }
         }
 
+        SendToXFZ(projectId, records);
+
     }
 
     void SendOneToXFZ(String projectId, GnssCalcData calcData, String sendTime){