From bbff4754d3e9fbd96eaad34ca7cecfd3f60a1044 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Mon, 25 Nov 2024 15:32:24 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9A=82=E5=81=9Clog=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=202=E3=80=81=E5=A6=82=E6=9E=9C=E8=BF=9E=E7=BB=AD?=
 =?UTF-8?q?=E6=97=A0=E5=9B=BA=E5=AE=9A=E8=A7=A3=EF=BC=8C=E5=8F=91=E5=86=B7?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executor/D341LocationMessageExecutor.java |  4 ---
 .../D3F0SelfCheckMessageExecutor.java         | 31 ++++++++++++++++---
 .../sideslope/service/WarningServiceImpl.java |  2 +-
 3 files changed, 28 insertions(+), 9 deletions(-)

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 49ea89d9..d32417fc 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
@@ -113,8 +113,4 @@ public class D341LocationMessageExecutor implements Executor<D341LocationMessage
     public Class<?> getMessageType() {
         return D341LocationMessage.class;
     }
-
-    void executeInThread(D341LocationMessage message){
-
-    }
 }
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 aad86465..bce56bb3 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
@@ -4,6 +4,7 @@ import com.imdroid.common.util.DataTypeUtil;
 import com.imdroid.common.util.HexUtil;
 import com.imdroid.common.util.ThreadManager;
 import com.imdroid.secapi.client.BeidouClient;
+import com.imdroid.secapi.dto.GnssDevice;
 import com.imdroid.secapi.dto.GnssMsg;
 import com.imdroid.secapi.dto.GnssMsgMapper;
 import com.imdroid.secapi.dto.GnssStatus;
@@ -52,8 +53,8 @@ public class D3F0SelfCheckMessageExecutor implements Executor<D3F0SelfCheckMessa
         //应答
         sendD3F1Ack(device);
 
-        // 检查是否需要对设备的F9P进行断电操作
-        checkAndSendF9PPowerOffCommand(device);
+        // 检查是否需要对设备的F9P进行冷启动操作
+        checkAndSendF9PColdStartCommand(device);
         // 补齐tenantId
         message.setTenantId(device.getTenantId());
         device.updateRx(message.getHeader(),message.getLen(),1);
@@ -83,7 +84,7 @@ public class D3F0SelfCheckMessageExecutor implements Executor<D3F0SelfCheckMessa
         return D3F0SelfCheckMessage.class;
     }
 
-    private void checkAndSendF9PPowerOffCommand(Device device){
+    /*private void checkAndSendF9PPowerOffCommand(Device device){
         if(device.getDeviceId().startsWith("2419") && device.getDeviceType() == Device.DEVICE_ROVER){
             // 连续6个周期无解，则立即发送F9P断电指令
             if(device.getNoFixedAndFloatResult() >= 6){
@@ -92,6 +93,17 @@ public class D3F0SelfCheckMessageExecutor implements Executor<D3F0SelfCheckMessa
                 device.clearNoResultStat();
             }
         }
+    }*/
+
+    private void checkAndSendF9PColdStartCommand(Device device){
+        if(device.getModel() == GnssDevice.MODEL_G505){
+            // 连续6个周期无解，则发送 F9P 冷启动指令
+            if(device.getNoFixedAndFloatResult() >= 6){
+                sendF9PColdStartCommand(device);
+                logger.debug("{}: 连续{}次无固定解和浮点解，发送 F9P 冷启动指令",device.getDeviceId(), device.getNoFixedAndFloatResult());
+                device.clearNoResultStat();
+            }
+        }
     }
 
     void saveMsg(String deviceId, int tenantId, int msgType, String content,boolean isTx){
@@ -110,7 +122,7 @@ public class D3F0SelfCheckMessageExecutor implements Executor<D3F0SelfCheckMessa
             gnssMsg.setContent(content.substring(0,128));
         msgMapper.insert(gnssMsg);
     }
-
+/*
     void sendF9PPowerOffCommand(Device device){
         int flag = 0xD313;
         String sendCmd = "2500";
@@ -123,6 +135,17 @@ public class D3F0SelfCheckMessageExecutor implements Executor<D3F0SelfCheckMessa
         rtcmClient.config(device.getDeviceId(), sendCmd);
         saveMsg(device.getDeviceId(), device.getTenantId(),0xD313, sendCmd, true);
     }
+*/
+    void sendF9PColdStartCommand(Device device){
+        int msgType = 0xD310;
+        // F9P 冷启动 b5 62 06 04 04 00 00 00 02 00 10 68
+        String sendCmd = "b56206040400000002001068";
+        short len = (short) (sendCmd.length()/2+4);
+        sendCmd = Integer.toHexString(msgType) + HexUtil.Short2HexString(len)+
+                HexUtil.Int2HexString(Integer.parseInt(device.getDeviceId()))+sendCmd;
+        rtcmClient.config(device.getDeviceId(), sendCmd);
+        saveMsg(device.getDeviceId(), device.getTenantId(),0xD310, sendCmd, true);
+    }
 
     void sendD3F1Ack(Device device){
         int flag = 0xD3F1;
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java
index 5c4b706e..3214daf4 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java
@@ -181,7 +181,7 @@ public class WarningServiceImpl implements WarningService {
                 curStatus.setWarningcode(curStatus.getWarningcode() | warningType);
 
                 // 新告警出现后，生成对应设备的 warning 日志文件
-                generate_warning_logs(curStatus.getDeviceid(),warningType,auxInfo);
+                //generate_warning_logs(curStatus.getDeviceid(),warningType,auxInfo);
             }
             isUpdated = true;
         }