From 33b646d05b25a2bbe380554dd593449f1562bc36 Mon Sep 17 00:00:00 2001 From: weidong Date: Fri, 16 Feb 2024 08:46:29 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=AD=E7=82=B9=E7=BB=AD=E4=BC=A0?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=B6=88=E6=81=AF=E5=A2=9E=E5=8A=A0=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/imdroid/secapi/client/BeidouClient.java | 3 ++- .../com/imdroid/sideslope/calc/MultiLineGNSSCalcService.java | 3 ++- .../java/com/imdroid/beidou/controller/APIController.java | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sec-api/src/main/java/com/imdroid/secapi/client/BeidouClient.java b/sec-api/src/main/java/com/imdroid/secapi/client/BeidouClient.java index 0d8ee97b..13238a03 100644 --- a/sec-api/src/main/java/com/imdroid/secapi/client/BeidouClient.java +++ b/sec-api/src/main/java/com/imdroid/secapi/client/BeidouClient.java @@ -38,6 +38,7 @@ public interface BeidouClient { @PostMapping("/gnss_upload_complete") String onGnssUploadComplete(@RequestParam(name = "deviceId") String deviceId, - @RequestParam(name = "tenantId") Integer tenantId); + @RequestParam(name = "tenantId") Integer tenantId, + @RequestParam(name = "uploadTime") LocalDateTime uploadTime); } 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 4a59be78..844cc533 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 @@ -107,12 +107,12 @@ public class MultiLineGNSSCalcService { } // 移除记录、发完成指示、更新设备状态 deviceMap.remove(deviceId); - beidouClient.onGnssUploadComplete(deviceId,tenantId); GnssStatus gnssStatus = dataPersistService.getDeviceState(deviceId); if(gnssStatus!=null){ gnssStatus.setState(GnssStatus.STATE_IDLE); dataPersistService.updateDeviceState(gnssStatus); } + beidouClient.onGnssUploadComplete(deviceId,tenantId, lastDate); } void createFwdReord(D342LocationMessage d342Message){ @@ -142,6 +142,7 @@ public class MultiLineGNSSCalcService { LocalDateTime nowTime = LocalDateTime.now(); if(lastD342Time.uploadTime.isBefore(nowTime.minusMinutes(30))){ d342SessionDone(deviceId,tenantId,lastD342Time.createTime); + logger.info("upload broken for half hour, end session"); return null; } return lastD342Time.createTime; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/APIController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/APIController.java index b177496d..0a2cf6f8 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/APIController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/APIController.java @@ -146,8 +146,8 @@ public class APIController extends BasicController{ @PostMapping(value = "/api/gnss_upload_complete") @ResponseBody - public String onGnssUploadComplete(String deviceId, Integer tenantId) { - saveMsg(deviceId, tenantId,0xd342, "gnss data upload completely",false); + public String onGnssUploadComplete(String deviceId, Integer tenantId, LocalDateTime uploadTime) { + saveMsg(deviceId, tenantId,0xd342, "gnss data upload completely at "+uploadTime,false); return null; }