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/DockOnlineServiceImpl.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 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 3d30a70..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
@@ -3,20 +3,25 @@
import com.alibaba.fastjson2.JSON;
import com.ard.common.core.redis.RedisConst;
import com.ard.common.core.redis.RedisOpsUtils;
+import com.ard.ossdock.service.impl.OssDockServiceContext;
import com.ard.sample.component.websocket.enums.MessageType;
import com.ard.sample.component.websocket.handler.DockWebSocketHandler;
import com.ard.sample.manage.model.dto.DeviceDTO;
import com.ard.sample.manage.service.IDeviceService;
import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
+import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+@Slf4j
@Component
public class DockOnlineServiceImpl {
@@ -29,10 +34,13 @@
@Autowired
protected ObjectMapper _objectMapper;
+ @Resource
+ 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) {
@@ -41,16 +49,26 @@
// 更新机场设备状态："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.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");
+// log.info("机场任务航线文件url地址：{}", url.toString());
// 发送设备状态到websocket客户端
List<DeviceDTO> devicesList = _deviceService.getDevicesTopoForWeb();
for (DeviceDTO device : devicesList) {
@@ -61,12 +79,12 @@
dockStatus = String.valueOf(RedisOpsUtils.get(RedisConst.OSD_STATUS_PREFIX + device.getDeviceSn()));
}
if(RedisOpsUtils.checkExist(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn())){
- droneStatus = String.valueOf(RedisOpsUtils.get(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn()));;
+ droneStatus = String.valueOf(RedisOpsUtils.get(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn()));
}
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