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 2b31c8dd..b7d825af 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{ @@ -79,15 +79,9 @@ public class MultiLineGNSSCalcService { lastD342Time.createTime = msgTime; lastD342Time.uploadTime = LocalDateTime.now(); - int i = 0; for(BaseMessage message: d342Message.getMessageList()){ - //D341LocationMessage d341Message = (D341LocationMessage)message; - //calcService.calcSingle(d341Message, false); - - // 查找序号不连续的问题 - i++; - if(i==1) logger.info("d342: 1st d341 seq {}", message.getSeq()); - else if(i==d341Count) logger.info("d342: {}th d341 seq {}",d341Count,message.getSeq()); + D341LocationMessage d341Message = (D341LocationMessage)message; + calcService.calcSingle(d341Message, false); } } else if(lastD342Time != null){ @@ -101,7 +95,7 @@ public class MultiLineGNSSCalcService { 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 @@ -119,7 +113,6 @@ public class MultiLineGNSSCalcService { gnssStatus.setState(GnssStatus.STATE_IDLE); dataPersistService.updateDeviceState(gnssStatus); } - } void createFwdReord(D342LocationMessage d342Message){ diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D342LocationMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D342LocationMessageExecutor.java index 82a2af67..cb07502e 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D342LocationMessageExecutor.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D342LocationMessageExecutor.java @@ -36,13 +36,13 @@ public class D342LocationMessageExecutor implements Executor { + ThreadManager.getFixedThreadPool().submit(() -> { gnssCalcService.calc(message); if(message.getMessageList().size()==0){ dataPersistService.saveD342Stat(message, device); device.clearD342Stat(); } - //}); + }); return null; }