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-16 12:18:23 +08:00
parent 252abbfee2
commit 9ba7eaf0d8
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
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{
@ -72,7 +72,7 @@ public class MultiLineGNSSCalcService {
dataPersistService.updateDeviceState(gnssStatus); dataPersistService.updateDeviceState(gnssStatus);
} }
// 生成推送记录 // 生成推送记录
createFwdReord(d342Message); //createFwdReord(d342Message);
} }
// 处理d341 // 处理d341
@ -81,12 +81,13 @@ public class MultiLineGNSSCalcService {
int i = 0; 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++; 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){ else if(lastD342Time != null){
@ -98,8 +99,9 @@ public class MultiLineGNSSCalcService {
void d342SessionDone(String deviceId, Integer tenantId, LocalDateTime lastDate){ void d342SessionDone(String deviceId, Integer tenantId, LocalDateTime lastDate){
//补传结束指示 //补传结束指示
logger.info(deviceId + " d342 session done! "+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); lastDate = gnssCalcFilterService.updateRpos(deviceId,lastDate);
// 记录转发表更新为upload done // 记录转发表更新为upload done
@ -109,7 +111,7 @@ public class MultiLineGNSSCalcService {
fwdRecord.setState(ResendRecord.STATE_BREAK_POINT); fwdRecord.setState(ResendRecord.STATE_BREAK_POINT);
resendRecordMapper.insert(fwdRecord); resendRecordMapper.insert(fwdRecord);
fwdRecordMap.remove(deviceId); fwdRecordMap.remove(deviceId);
} }*/
// 移除记录、发完成指示、更新设备状态 // 移除记录、发完成指示、更新设备状态
deviceMap.remove(deviceId); deviceMap.remove(deviceId);
GnssStatus gnssStatus = dataPersistService.getDeviceState(deviceId); GnssStatus gnssStatus = dataPersistService.getDeviceState(deviceId);
@ -117,7 +119,7 @@ public class MultiLineGNSSCalcService {
gnssStatus.setState(GnssStatus.STATE_IDLE); gnssStatus.setState(GnssStatus.STATE_IDLE);
dataPersistService.updateDeviceState(gnssStatus); dataPersistService.updateDeviceState(gnssStatus);
} }
beidouClient.onGnssUploadComplete(deviceId,tenantId, lastDate);
} }
void createFwdReord(D342LocationMessage d342Message){ void createFwdReord(D342LocationMessage d342Message){