From 8cfdbb89f34805bda233b0bc5d9170d798e4bcf3 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Tue, 13 Aug 2024 17:24:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=8E=A7=E5=88=B6=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E4=BB=8E=E6=95=B0=E6=8D=AE=E9=80=9A=E9=81=93=E6=9D=A5?=
 =?UTF-8?q?=EF=BC=8C=E5=88=99=E5=88=A0=E9=99=A4=E5=85=B6=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E9=80=9A=E9=81=93=E4=BF=A1=E6=81=AF=EF=BC=8C=E7=A1=AE=E4=BF=9D?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E4=BF=A1=E4=BB=A4=E4=B9=9F=E4=BB=8E?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=80=9A=E9=81=93=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sideslope/executor/D3F0SelfCheckMessageExecutor.java      | 4 +---
 .../java/com/imdroid/sideslope/server/OnlineChannels.java     | 4 ++++
 .../java/com/imdroid/sideslope/server/udp/RtcmUdpHandler.java | 4 ++++
 3 files changed, 9 insertions(+), 3 deletions(-)

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 c3c8b45a..2e67f762 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
@@ -37,8 +37,6 @@ public class D3F0SelfCheckMessageExecutor implements Executor<D3F0SelfCheckMessa
     @Resource(name = "local")
     private DeviceService deviceService;
     @Autowired
-    private GnssGroupMapper gnssGroupMapper;
-    @Autowired
     RtcmClient rtcmClient;
 
     @Override
@@ -96,7 +94,7 @@ public class D3F0SelfCheckMessageExecutor implements Executor<D3F0SelfCheckMessa
                 logger.debug("设备" + device.getDeviceId() + ": F9P 最近一次断电时间初始化为 " + device.getLastF9PPowerOffTime());
             }
             // 检查 F9P 最近一次断电时间是否超过 48 小时 ，若是，则发送断电指令
-            else if(device.getLastF9PPowerOffTime().isBefore(now.minusHours(48))){
+            else if(device.getLastF9PPowerOffTime().isBefore(now.minusHours(24))){
                 logger.debug("设备 "+device.getDeviceId()+" 的 F9P 距离上一次断电已超过48小时，发送F9P断电指令");
                 sendF9PPowerOffCommand(device);
                 // 更新F9P断电时间，用于下一个48小时周期后的判断
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/OnlineChannels.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/OnlineChannels.java
index b716dc0e..2a7a7d36 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/OnlineChannels.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/OnlineChannels.java
@@ -51,6 +51,10 @@ public class OnlineChannels {
         return deviceChannel;
     }
 
+    public void removeConfigChannel(String deviceId){
+        configChannels.remove(deviceId);
+    }
+
     public Optional<DeviceChannel> get(String deviceId) {
         return Optional.ofNullable(dataChannels.get(deviceId));
     }
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/udp/RtcmUdpHandler.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/udp/RtcmUdpHandler.java
index 0360b3ea..998f47b2 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/udp/RtcmUdpHandler.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/udp/RtcmUdpHandler.java
@@ -40,6 +40,10 @@ public class RtcmUdpHandler extends ChannelInboundHandlerAdapter {
             // 消息解析
             BaseMessage message = MessageParser.instance.parse(packet.content());
             OnlineChannels.INSTANCE.updateDataChannel(message.getId(), ctx.channel(), packet.sender());
+            if(message.getHeader() == 0xd3f0){
+                //如果控制消息从数据通道来，则删除其控制通道信息，确保服务器信令也从数据通道发
+                OnlineChannels.INSTANCE.removeConfigChannel(message.getId());
+            }
             BizExecutors.execute(message);
         } catch (UnSupportedMessageException e) {
             logger.warn("receive un supported message: {}", e.getMessage());