From c8cf428dff262542016f0628f1c441a1976755e2 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 12 Dec 2025 14:36:01 +0800
Subject: [PATCH] 2025-12-12 zwy 优化，机场及飞行器状态存入redis中时没有时间限制，不清除。
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceOSDServiceImpl.java | 2 +-
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java | 4 ++--
ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java | 4 ++--
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java | 8 ++++----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java
index ca96e58..1298b39 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java
@@ -145,7 +145,7 @@
String deviceSn = receiver.getGateway();
if(method.equals("cover_close")){
_deviceService.updateWorkType(deviceSn, 2L);
- RedisOpsUtils.setWithExpire(RedisConst.OSD_STATUS_PREFIX + deviceSn, 2, RedisConst.DEVICE_ALIVE_SECOND);
+ RedisOpsUtils.set(RedisConst.OSD_STATUS_PREFIX + deviceSn, 2);
}
String sn = RedisOpsUtils.get(key).toString();
receiver.setType(MessageType.PROGRESS.getType());
@@ -180,7 +180,7 @@
// 更新设备列表状态--飞行器开机中...
if(method.equals("drone_open")){
_deviceService.updateWorkType(device.getChildDeviceSn(), 7L);
- RedisOpsUtils.setWithExpire(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn(), 7, RedisConst.DEVICE_ALIVE_SECOND);
+ RedisOpsUtils.set(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn(), 7);
}
String dockProgress ="";
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceOSDServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceOSDServiceImpl.java
index b9c3894..9cd6bde 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceOSDServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceOSDServiceImpl.java
@@ -95,7 +95,7 @@
Long code = jsonNode.get("data").get("mode_code").asLong();
if ("0,1,2,3,4,5,8,9,10,11,13,14".contains(code.toString())) {
_deviceService.updateWorkType(device.getDeviceSn(), code);
- RedisOpsUtils.setWithExpire(RedisConst.OSD_STATUS_PREFIX + device.getDeviceSn(), code, RedisConst.DEVICE_ALIVE_SECOND);
+ RedisOpsUtils.set(RedisConst.OSD_STATUS_PREFIX + device.getDeviceSn(), code);
}
}
}
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java
index 36346d8..0ad8495 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java
@@ -68,7 +68,7 @@
//只要状态 "0":"作业准备中","1":"飞行作业中","5":"任务空闲"
if(code == 0 || code == 1 || code == 5) {
_deviceService.updateWorkType(deviceSn,code);
- RedisOpsUtils.setWithExpire(RedisConst.OSD_STATUS_PREFIX + deviceSn, code, RedisConst.DEVICE_ALIVE_SECOND);
+ RedisOpsUtils.set(RedisConst.OSD_STATUS_PREFIX + deviceSn, code);
}
}
}
@@ -82,7 +82,7 @@
Long deviceOnlineStatus = jsonNode.get("sub_device").get("device_online_status").asLong();
if (inDock.equals(1L) && deviceOnlineStatus.equals(0L)) {// 飞行器在舱内且关机状态为6
_deviceService.updateWorkType(childDeviceSn, 6L);
- RedisOpsUtils.setWithExpire(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn(), 6, RedisConst.DEVICE_ALIVE_SECOND);
+ RedisOpsUtils.set(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn(), 6);
}
}
}
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 9824635..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,7 +38,7 @@
private OssDockServiceContext _ossService;
/**
- * 定时任务，每5秒取一次机场设备的在线状态，如已离线更新状态
+ * 定时任务，每2秒取一次机场设备的在线状态，如已离线更新状态
* */
@Scheduled(cron = "0/2 * * * * ?")
public void cronOnlineTask() {
@@ -49,7 +49,7 @@
// 更新机场设备状态："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());
}
@@ -62,9 +62,9 @@
}
/**
- * 定时任务，每5秒读一次redis的机场设备的状态，并发送到websocket客户端
+ * 定时任务，每1秒读一次redis的机场设备的状态，并发送到websocket客户端
* */
- @Scheduled(cron = "0/2 * * * * ?")
+ @Scheduled(cron = "0/1 * * * * ?")
public void sendDeviceStatus(){
// 测试 机场oss读取文件
// URL url = _ossService.getObjectUrl("kmz","/2025/11/25/新建航点航线(1)_20251125161322A001.kmz");
--
Gitblit v1.9.3