From 9f4f5ad5c94e642bdc9c3737b673e092bf4a89fa Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Mon, 15 Jan 2024 10:20:09 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../imdroid/beidou_fwd/task/Forwarder.java    | 16 ++++++++--------
 .../beidou_fwd/task/GXXfzForwarder.java       | 19 +++++++++++--------
 .../imdroid/beidou_fwd/task/GZYForwarder.java |  2 +-
 .../beidou_fwd/task/KingMaForwarder.java      |  2 +-
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java
index 54dc05ae..417f8b62 100644
--- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java
+++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java
@@ -121,15 +121,16 @@ public class Forwarder {
             calcDataQueryWrapper.orderByAsc("createtime");
             List<GnssCalcData> calcDataList = gnssDataMapper.selectList(calcDataQueryWrapper);
             // 推送记录
-            sendBatch(fwdRecord.getProject_id(),calcDataList);
-            // 记录推送结果
-            fwdRecord.setState(FwdRecord.STATE_FWD_DONE);
-            fwdRecordsMapper.updateById(fwdRecord);
+            if(sendBatch(fwdRecord.getProject_id(),calcDataList)>0) {
+                // 记录推送结果
+                fwdRecord.setState(FwdRecord.STATE_FWD_DONE);
+                fwdRecordsMapper.updateById(fwdRecord);
+            }
         }
     }
 
-    void sendBatch(String projectId, List<GnssCalcData> records){
-        if(records.size() == 0) return;
+    int sendBatch(String projectId, List<GnssCalcData> records){
+        if(records.size() == 0) return 0;
 
         LocalDateTime lastTime = records.get(0).getCreatetime();
 
@@ -144,8 +145,7 @@ public class Forwarder {
             }
         }
 
-        send(projectId, records);
-
+        return send(projectId, records);
     }
 
     int send(String projectId, List<GnssCalcData> records) {
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 5c69512a..7fe788a4 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
@@ -43,13 +43,6 @@ public class GXXfzForwarder extends Forwarder{
         xfzTcpClient.start();
     }
 
-    @Scheduled(cron = "0 29,39,59 * * * ?") // 每29分/59分执行一次
-    private void checkTCP() {
-        if(!xfzTcpClient.isActive()) {
-            xfzTcpClient.connect();
-        }
-    }
-
     /**
      * 每半小时转发GNSS解算结果
      */
@@ -69,6 +62,16 @@ public class GXXfzForwarder extends Forwarder{
         int sendNum = 0;
         if(records.size() == 0) return 0;
 
+        if(!xfzTcpClient.isActive()) {
+            xfzTcpClient.connect();
+            try {
+                Thread.sleep(5000);
+            }
+            catch (Exception e){
+
+            }
+        }
+
         XFZData xfzTcpMessage = new XFZData();
         xfzTcpMessage.setProjectID(projectId);
         xfzTcpMessage.setWorkPointID(projectId);
@@ -77,7 +80,7 @@ public class GXXfzForwarder extends Forwarder{
         xfzTcpMessage.setData(dataList);
 
         for(GnssCalcData locationRecord: records) {
-            if(!locationRecord.getEnabled()) continue;
+            if(!locationRecord.getEnabled() || locationRecord.getRb562e()==null) continue;
             XFZData.Data data = new XFZData.Data();
             dataList.add(data);
             data.setDataTime(locationRecord.getCreatetime().format(dateFormatter));
diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYForwarder.java
index 46d17e92..a4c43f87 100644
--- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYForwarder.java
+++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYForwarder.java
@@ -61,7 +61,7 @@ public class GZYForwarder extends Forwarder{
 
 
         for(GnssCalcData locationRecord: records) {
-            if(!locationRecord.getEnabled()) continue;
+            if(!locationRecord.getEnabled() || locationRecord.getRb562e()==null) continue;
             GZYData.Data tranData = new GZYData.Data();
             tranData.setCollectTime(locationRecord.getCreatetime().format(formatter));
             double n = NumberUtils.scale(locationRecord.getRb562n(), 2);
diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/KingMaForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/KingMaForwarder.java
index bedbde84..4118da2a 100644
--- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/KingMaForwarder.java
+++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/KingMaForwarder.java
@@ -101,7 +101,7 @@ public class KingMaForwarder extends Forwarder{
         List<KingMaData> dataList = new ArrayList<>(records.size());
 
         for(GnssCalcData locationRecord: records) {
-            if(!locationRecord.getEnabled()) continue;
+            if(!locationRecord.getEnabled() || locationRecord.getRb562e()==null) continue;
             KingMaData data = new KingMaData();
             data.setDataTime(locationRecord.getCreatetime().toString());
             data.setProjectId(projectId);