From 9ba7eaf0d872a08316460adae5b01cd20baefc83 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Fri, 16 Feb 2024 12:18:23 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=9F=A5=E6=89=BE=E6=96=AD=E7=82=B9=E7=BB=AD=E4=BC=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E8=BF=9E=E7=BB=AD=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../calc/MultiLineGNSSCalcService.java         | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/MultiLineGNSSCalcService.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/MultiLineGNSSCalcService.java
index 97e5fde1..779dc68e 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/MultiLineGNSSCalcService.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/MultiLineGNSSCalcService.java
@@ -56,7 +56,7 @@ public class MultiLineGNSSCalcService {
                 if (msgTime.isAfter(lastD342Time.createTime.plusMinutes(4))) {
                     logger.info(deviceId + " d341 cycle done!");
                     // 计算上轮结果
-                    calcService.calSingleDone(deviceId, d342Message.getTenantId(), lastD342Time.createTime);
+                    //calcService.calSingleDone(deviceId, d342Message.getTenantId(), lastD342Time.createTime);
                 }
             }
             else{
@@ -72,7 +72,7 @@ public class MultiLineGNSSCalcService {
                     dataPersistService.updateDeviceState(gnssStatus);
                 }
                 // 生成推送记录
-                createFwdReord(d342Message);
+                //createFwdReord(d342Message);
             }
 
             // 处理d341
@@ -81,12 +81,13 @@ public class MultiLineGNSSCalcService {
 
             int i = 0;
             for(BaseMessage message: d342Message.getMessageList()){
-                D341LocationMessage d341Message = (D341LocationMessage)message;
-                calcService.calcSingle(d341Message, false);
+                //D341LocationMessage d341Message = (D341LocationMessage)message;
+                //calcService.calcSingle(d341Message, false);
 
                 // 查找序号不连续的问题
                 i++;
-                if(i==1 || i==d341Count) logger.info("d342: d341 seq "+message.getSeq());
+                if(i==1) logger.info("d342: 1st d341 seq {}", message.getSeq());
+                else if(i==d341Count) logger.info("d342: {}th d341 seq ",d341Count,message.getSeq());
             }
         }
         else if(lastD342Time != null){
@@ -98,8 +99,9 @@ public class MultiLineGNSSCalcService {
     void d342SessionDone(String deviceId, Integer tenantId, LocalDateTime lastDate){
         //补传结束指示
         logger.info(deviceId + " d342 session done! "+lastDate);
+        beidouClient.onGnssUploadComplete(deviceId,tenantId, lastDate);
         // 计算上轮结果
-        calcService.calSingleDone(deviceId, tenantId, lastDate);
+        /*calcService.calSingleDone(deviceId, tenantId, lastDate);
         // 重算最近的
         lastDate = gnssCalcFilterService.updateRpos(deviceId,lastDate);
         // 记录转发表更新为upload done
@@ -109,7 +111,7 @@ public class MultiLineGNSSCalcService {
             fwdRecord.setState(ResendRecord.STATE_BREAK_POINT);
             resendRecordMapper.insert(fwdRecord);
             fwdRecordMap.remove(deviceId);
-        }
+        }*/
         // 移除记录、发完成指示、更新设备状态
         deviceMap.remove(deviceId);
         GnssStatus gnssStatus = dataPersistService.getDeviceState(deviceId);
@@ -117,7 +119,7 @@ public class MultiLineGNSSCalcService {
             gnssStatus.setState(GnssStatus.STATE_IDLE);
             dataPersistService.updateDeviceState(gnssStatus);
         }
-        beidouClient.onGnssUploadComplete(deviceId,tenantId, lastDate);
+
     }
 
     void createFwdReord(D342LocationMessage d342Message){