Imdroid/security-monitor
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

1、去掉查找断点续传数据不连续的问题的打印，问题是在单片机代码

Browse Source
This commit is contained in:
weidong 2024-02-17 09:45:17 +08:00
parent 9a290244d9
commit eb0e0e9453
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/MultiLineGNSSCalcService.java
View File

@ -56,7 +56,7 @@ public class MultiLineGNSSCalcService {
if (msgTime.isAfter(lastD342Time.createTime.plusMinutes(4))) { if (msgTime.isAfter(lastD342Time.createTime.plusMinutes(4))) {
logger.info(deviceId + " d341 cycle done!"); logger.info(deviceId + " d341 cycle done!");
// 计算上轮结果 // 计算上轮结果
//calcService.calSingleDone(deviceId, d342Message.getTenantId(), lastD342Time.createTime); calcService.calSingleDone(deviceId, d342Message.getTenantId(), lastD342Time.createTime);
} }
} }
else{ else{
@ -79,15 +79,9 @@ public class MultiLineGNSSCalcService {
lastD342Time.createTime = msgTime; lastD342Time.createTime = msgTime;
lastD342Time.uploadTime = LocalDateTime.now(); lastD342Time.uploadTime = LocalDateTime.now();
int i = 0;
for(BaseMessage message: d342Message.getMessageList()){ for(BaseMessage message: d342Message.getMessageList()){
//D341LocationMessage d341Message = (D341LocationMessage)message; D341LocationMessage d341Message = (D341LocationMessage)message;
//calcService.calcSingle(d341Message, false); 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());
} }
} }
else if(lastD342Time != null){ else if(lastD342Time != null){
@ -101,7 +95,7 @@ public class MultiLineGNSSCalcService {
logger.info(deviceId + " d342 session done! "+lastDate); logger.info(deviceId + " d342 session done! "+lastDate);
beidouClient.onGnssUploadComplete(deviceId,tenantId, lastDate); beidouClient.onGnssUploadComplete(deviceId,tenantId, lastDate);
// 计算上轮结果 // 计算上轮结果
//calcService.calSingleDone(deviceId, tenantId, lastDate); calcService.calSingleDone(deviceId, tenantId, lastDate);
// 重算最近的 // 重算最近的
lastDate = gnssCalcFilterService.updateRpos(deviceId,lastDate); lastDate = gnssCalcFilterService.updateRpos(deviceId,lastDate);
// 记录转发表更新为upload done // 记录转发表更新为upload done
@ -119,7 +113,6 @@ public class MultiLineGNSSCalcService {
gnssStatus.setState(GnssStatus.STATE_IDLE); gnssStatus.setState(GnssStatus.STATE_IDLE);
dataPersistService.updateDeviceState(gnssStatus); dataPersistService.updateDeviceState(gnssStatus);
} }
} }
void createFwdReord(D342LocationMessage d342Message){ void createFwdReord(D342LocationMessage d342Message){

4
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D342LocationMessageExecutor.java
View File

@ -36,13 +36,13 @@ public class D342LocationMessageExecutor implements Executor<D342LocationMessage
message.setFwdId(device.getFwdId()); message.setFwdId(device.getFwdId());
device.updateD342Bytes(message.getLen(),message.getMessageList().size()); device.updateD342Bytes(message.getLen(),message.getMessageList().size());
//ThreadManager.getFixedThreadPool().submit(() -> { ThreadManager.getFixedThreadPool().submit(() -> {
gnssCalcService.calc(message); gnssCalcService.calc(message);
if(message.getMessageList().size()==0){ if(message.getMessageList().size()==0){
dataPersistService.saveD342Stat(message, device); dataPersistService.saveD342Stat(message, device);
device.clearD342Stat(); device.clearD342Stat();
} }
//}); });
return null; return null;
} }