From f3ba49dc3b2793f8a6968a815a2e38b49159045f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 16 Dec 2025 08:50:01 +0800
Subject: [PATCH] 2025-12-16 zwy 优化-去掉日志
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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..76efd4f 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
@@ -1,6 +1,5 @@
package com.ard.sample.manage.service.impl;
-import com.alibaba.fastjson2.JSON;
import com.ard.common.core.redis.RedisConst;
import com.ard.common.core.redis.RedisOpsUtils;
import com.ard.sample.component.websocket.enums.MessageType;
@@ -8,15 +7,20 @@
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;
+import java.util.concurrent.TimeUnit;
+@Slf4j
@Component
public class DockOnlineServiceImpl {
@@ -30,9 +34,9 @@
protected ObjectMapper _objectMapper;
/**
- * 定时任务，每5秒取一次机场设备的在线状态，如已离线更新状态
+ * 定时任务，每2秒取一次机场设备的在线状态，如已离线更新状态
* */
- @Scheduled(cron = "0/5 * * * * ?")
+ @Scheduled(cron = "0/2 * * * * ?")
public void cronOnlineTask() {
List<DeviceDTO> devicesList = _deviceService.getDevicesTopoForWeb();
for (DeviceDTO device : devicesList) {
@@ -41,16 +45,27 @@
// 更新机场设备状态："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 * * * * ?")
+ @Scheduled(initialDelay = 2, fixedRate = 1, timeUnit = TimeUnit.SECONDS)
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 +76,13 @@
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, "");
+// log.info("发送设备状态{}到websocket客户端：{}", MessageType.STATE.getType(), json);
}
}
--
Gitblit v1.9.3