From 63e503016c78aac218a4c7f9a765bcbb0b1e398e Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 24 Nov 2025 12:27:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java
index 69639bc..09b3fdc 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java
@@ -84,8 +84,6 @@
                 BoxStreamUrlReceiver boxLiveUrl = tyService.getBoxLiveUrl(uav.getBoxSn());
                 if (boxLiveUrl != null) {
                     uav.setWebrtcUrl(boxLiveUrl.getRtc());
-                } else {
-                    log.warn("设备 {} 的直播地址为空", uav.getBoxSn());
                 }
             } catch (Exception e) {
                 log.error("获取设备 {} 的直播地址失败", uav.getBoxSn(), e);
@@ -289,7 +287,7 @@
             // 只有在线的无人机才存 Redis
             String redisKey = CacheConstants.UAV_ONLINE_KEY + boxSn;
             if (remote.getOnLine() == 1) {
-                redisCache.setCacheObject(redisKey, remote, 10, TimeUnit.SECONDS);
+                redisCache.setCacheObject(redisKey, remote, 30, TimeUnit.SECONDS);
             } else {
                 redisCache.deleteObject(CacheConstants.UAV_ONLINE_KEY + boxSn);
             }

--
Gitblit v1.9.3