From 803f2475b66a7e01a0609e9129bd212b3808c7d6 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Sun, 30 Mar 2025 14:49:52 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8F=82=E6=95=B0=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E6=80=A7=E6=A3=80=E6=9F=A5=E6=94=BE=E5=9C=A8online=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=202=E3=80=81=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=91=A8=E6=9C=9F=E7=9A=84=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/imdroid/secapi/client/BeidouClient.java  |  3 +--
 .../executor/D331RtcmMessageExecutor.java        |  2 +-
 .../executor/D341LocationMessageExecutor.java    |  2 +-
 .../executor/D3F0SelfCheckMessageExecutor.java   |  3 +--
 .../imdroid/beidou/controller/APIController.java | 16 ++++++----------
 .../beidou/controller/GnssStatusController.java  |  2 +-
 6 files changed, 11 insertions(+), 17 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 8b1880be..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
@@ -20,8 +20,7 @@ public interface BeidouClient {
 
     @PostMapping("/device_active")
     String onDeviceActive(@RequestParam(name = "deviceId") String deviceId,
-                          @RequestParam(name = "tenantId") Integer tenantId,
-                          @RequestParam(name = "lastOnlineTime") LocalDateTime lastOnlineTime);
+                          @RequestParam(name = "tenantId") Integer tenantId);
 
     @PostMapping("/device_stop")
     String onDeviceStop(@RequestParam(name = "deviceId") String deviceId,
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java
index e5153aa5..8d643ea0 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java
@@ -109,7 +109,7 @@ public class D331RtcmMessageExecutor implements Executor<D331RtcmMessage, Void>
                 ThreadManager.getFixedThreadPool().submit(() -> {
                     // 通知上线
                     try {
-                        beidouClient.onDeviceActive(deviceBs.getDeviceId(), deviceBs.getTenantId(),lastCycleDevice.getLastRxTime());
+                        beidouClient.onDeviceActive(deviceBs.getDeviceId(), deviceBs.getTenantId());
                     } catch (Exception e) {
                         logger.error(e.toString());
                     }
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java
index dae99380..45f8fa91 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java
@@ -64,7 +64,7 @@ public class D341LocationMessageExecutor implements Executor<D341LocationMessage
                 ThreadManager.getFixedThreadPool().submit(() -> {
                     // 通知上线
                     try {
-                        beidouClient.onDeviceActive(device.getDeviceId(), device.getTenantId(),lastCycleDevice.getLastRxTime());
+                        beidouClient.onDeviceActive(device.getDeviceId(), device.getTenantId());
                     } catch (Exception e) {
 
                     }
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java
index c37c7606..dd8ef688 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java
@@ -82,8 +82,7 @@ public class D3F0SelfCheckMessageExecutor implements Executor<D3F0SelfCheckMessa
                     beidouClient.onLine(lastGnssStatus.getDeviceid(),
                             lastGnssStatus.getTenantid(), lastGnssStatus.getUpdatetime());
                 } else {
-                    beidouClient.onDeviceActive(message.getId(), device.getTenantId(),
-                            (lastGnssStatus==null)?null:lastGnssStatus.getUpdatetime());
+                    beidouClient.onDeviceActive(message.getId(), device.getTenantId());
                 }
             }
             catch (Exception e){
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 0420ad28..79c0fb3e 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
@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
 
 @Controller
 public class APIController extends BasicController{
-    final String getWorkCycleCmd = "d3120005009034D301";
+    final String getWorkCycleCmd = "d3120005";
     SimpleDateFormat dateFormat = new SimpleDateFormat("yy-MM-dd HH:mm:ss");
     @Autowired
     RtcmClient rtcmClient;
@@ -113,7 +113,10 @@ public class APIController extends BasicController{
     @PostMapping(value = "/api/device_online")
     @ResponseBody
     public String onLine(String deviceId, Integer tenantId, LocalDateTime lastOnlineTime) {
-        onDeviceActive(deviceId,tenantId,lastOnlineTime);
+        onDeviceActive(deviceId,tenantId);
+        // 检查参数一致性
+        rtcmClient.config(deviceId, getWorkCycleCmd+
+                HexUtil.Int2HexString(Integer.parseInt(deviceId))+"01");
 
         // 检查是否自动补传
         GnssDevice device = deviceMapper.queryByDeviceId(deviceId);
@@ -147,7 +150,7 @@ public class APIController extends BasicController{
     /****** device active *******/
     @PostMapping(value = "/api/device_active")
     @ResponseBody
-    public String onDeviceActive(String deviceId, Integer tenantId, LocalDateTime lastOnlineTime) {
+    public String onDeviceActive(String deviceId, Integer tenantId) {
 
         // 检查有没有待配置的参数
         GnssDevice device = deviceMapper.queryByDeviceId(deviceId);
@@ -180,13 +183,6 @@ public class APIController extends BasicController{
             saveMsg(deviceId, tenantId,cacheCmd.getMsgtype(), cacheCmd.getCmd(), true);
         }
 
-        // 检查参数一致性
-        if(lastOnlineTime!=null){
-            if(lastOnlineTime.isBefore(LocalDateTime.now().minusMinutes(50))){
-                rtcmClient.config(deviceId, getWorkCycleCmd);
-            }
-        }
-
         // 检查iccid
         checkAndAskICCID(device);
 
diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java
index d367f4bd..f35e8254 100644
--- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java
+++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java
@@ -99,7 +99,7 @@ public class GnssStatusController extends BasicController implements CommonExcel
     public MPJQueryWrapper<GnssStatus> prepareQueryWrapper() {
         return new MPJQueryWrapper<GnssStatus>()
                 .selectAll(GnssStatus.class)
-                .select("d.devicetype as devicetype,d.remark as remark")
+                .select("d.devicetype as devicetype,d.remark as remark,d.iccid as iccid")
                 .leftJoin("gnssdevices d on t.deviceid = d.deviceid")
                 .orderByDesc("t.updatetime");
     }