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 08:46:29 +08:00
parent 29824f4743
commit 33b646d05b
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sec-api/src/main/java/com/imdroid/secapi/client/BeidouClient.java
View File

@ -38,6 +38,7 @@ public interface BeidouClient {
@PostMapping("/gnss_upload_complete") @PostMapping("/gnss_upload_complete")
String onGnssUploadComplete(@RequestParam(name = "deviceId") String deviceId, String onGnssUploadComplete(@RequestParam(name = "deviceId") String deviceId,
@RequestParam(name = "tenantId") Integer tenantId); @RequestParam(name = "tenantId") Integer tenantId,
@RequestParam(name = "uploadTime") LocalDateTime uploadTime);
} }

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

@ -107,12 +107,12 @@ public class MultiLineGNSSCalcService {
} }
// 移除记录、发完成指示、更新设备状态 // 移除记录、发完成指示、更新设备状态
deviceMap.remove(deviceId); deviceMap.remove(deviceId);
beidouClient.onGnssUploadComplete(deviceId,tenantId);
GnssStatus gnssStatus = dataPersistService.getDeviceState(deviceId); GnssStatus gnssStatus = dataPersistService.getDeviceState(deviceId);
if(gnssStatus!=null){ if(gnssStatus!=null){
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){
@ -142,6 +142,7 @@ public class MultiLineGNSSCalcService {
LocalDateTime nowTime = LocalDateTime.now(); LocalDateTime nowTime = LocalDateTime.now();
if(lastD342Time.uploadTime.isBefore(nowTime.minusMinutes(30))){ if(lastD342Time.uploadTime.isBefore(nowTime.minusMinutes(30))){
d342SessionDone(deviceId,tenantId,lastD342Time.createTime); d342SessionDone(deviceId,tenantId,lastD342Time.createTime);
logger.info("upload broken for half hour, end session");
return null; return null;
} }
return lastD342Time.createTime; return lastD342Time.createTime;

4
sec-beidou/src/main/java/com/imdroid/beidou/controller/APIController.java
View File

@ -146,8 +146,8 @@ public class APIController extends BasicController{
@PostMapping(value = "/api/gnss_upload_complete") @PostMapping(value = "/api/gnss_upload_complete")
@ResponseBody @ResponseBody
public String onGnssUploadComplete(String deviceId, Integer tenantId) { public String onGnssUploadComplete(String deviceId, Integer tenantId, LocalDateTime uploadTime) {
saveMsg(deviceId, tenantId,0xd342, "gnss data upload completely",false); saveMsg(deviceId, tenantId,0xd342, "gnss data upload completely at "+uploadTime,false);
return null; return null;
} }