From d622682904bb0a4b401db317e8d0b9fdf474e54b Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Sat, 13 Dec 2025 09:00:17 +0800
Subject: [PATCH] 1. 修改发现BUG。

---
 ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java
index 6e5806c..e93217b 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java
@@ -38,9 +38,9 @@
     private OssDockServiceContext _ossService;
 
     /**
-     * 定时任务,每5秒取一次机场设备的在线状态,如已离线更新状态
+     * 定时任务,每2秒取一次机场设备的在线状态,如已离线更新状态
      * */
-    @Scheduled(cron = "0/5 * * * * ?")
+    @Scheduled(cron = "0/2 * * * * ?")
     public void cronOnlineTask() {
         List<DeviceDTO> devicesList = _deviceService.getDevicesTopoForWeb();
         for (DeviceDTO device : devicesList) {
@@ -49,22 +49,22 @@
             // 更新机场设备状态:"3"-"设备已离线",
             if(!_deviceService.checkDeviceOnline(device.getDeviceSn())){
                 _deviceService.updateWorkType(device.getDeviceSn(), 3L);
-                RedisOpsUtils.setWithExpire(RedisConst.OSD_STATUS_PREFIX + device.getDeviceSn(), 3, RedisConst.DEVICE_ALIVE_SECOND);
+                RedisOpsUtils.set(RedisConst.OSD_STATUS_PREFIX + device.getDeviceSn(), 3);
                 RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + device.getDeviceSn());
                 RedisOpsUtils.del(RedisConst.COVER_STATE_PREFIX + device.getDeviceSn());
             }
             if(!_deviceService.checkDeviceOnline(device.getChildDeviceSn())){
                 _deviceService.updateWorkType(device.getChildDeviceSn(), 6L);
                 RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + device.getChildDeviceSn());
-                RedisOpsUtils.del(RedisConst.COVER_STATE_PREFIX + device.getDeviceSn());
+                RedisOpsUtils.del(RedisConst.COVER_STATE_PREFIX + device.getChildDeviceSn());
             }
         }
     }
 
     /**
-     * 定时任务,每5秒读一次redis的机场设备的状态,并发送到websocket客户端
+     * 定时任务,每1秒读一次redis的机场设备的状态,并发送到websocket客户端
      * */
-    @Scheduled(cron = "0/5 * * * * ?")
+    @Scheduled(cron = "0/1 * * * * ?")
     public void sendDeviceStatus(){
         // 测试 机场oss读取文件
 //        URL url = _ossService.getObjectUrl("kmz","/2025/11/25/新建航点航线(1)_20251125161322A001.kmz");
@@ -84,7 +84,7 @@
             String json = getJSONString(MessageType.STATE.getType(), device.getDeviceSn(), dockStatus, droneStatus);
 
             // 发送给websocket客户端
-            _dockWebSocketHandler.sendMessageToSubscribers(device.getDeviceSn(), MessageType.STATE.getType(), json);
+            _dockWebSocketHandler.sendMessageToSubscribers(device.getDeviceSn(), MessageType.STATE.getType(), json, "");
         }
     }
 

--
Gitblit v1.9.3