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 | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 1323deb..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
@@ -10,6 +10,7 @@
import com.ard.system.authorize.service.AuthorizeService;
import com.ard.work.domain.entity.ArdDroneInfo;
import com.ard.work.domain.receiver.BoxInfoReceiver;
+import com.ard.work.domain.receiver.BoxStreamUrlReceiver;
import com.ard.work.mapper.ArdDroneInfoMapper;
import com.ard.work.service.IArdDroneInfoService;
import com.ard.work.service.ITyService;
@@ -76,7 +77,19 @@
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<ArdDroneInfo> selectArdDroneList(ArdDroneInfo ardDroneInfo) {
- return ArdDroneInfoMapper.selectArdDroneList(ardDroneInfo);
+ List<ArdDroneInfo> ardDroneInfos = ArdDroneInfoMapper.selectArdDroneList(ardDroneInfo);
+ // 使用传统的 for 循环避免 forEach 带来的性能开销
+ for (ArdDroneInfo uav : ardDroneInfos) {
+ try {
+ BoxStreamUrlReceiver boxLiveUrl = tyService.getBoxLiveUrl(uav.getBoxSn());
+ if (boxLiveUrl != null) {
+ uav.setWebrtcUrl(boxLiveUrl.getRtc());
+ }
+ } catch (Exception e) {
+ log.error("获取设备 {} 的直播地址失败", uav.getBoxSn(), e);
+ }
+ }
+ return ardDroneInfos;
}
/**
@@ -258,11 +271,12 @@
/**
* 同步盒子属性
- *
*/
@Scheduled(fixedRate = 1000 * 5)
public void syncBoxInfo() {
- List<ArdDroneInfo> localList = selectArdDroneList(new ArdDroneInfo(){{setUseDataScope(false);}});
+ List<ArdDroneInfo> localList = selectArdDroneList(new ArdDroneInfo() {{
+ setUseDataScope(false);
+ }});
Map<String, ArdDroneInfo> localMap = localList.stream()
.collect(Collectors.toMap(ArdDroneInfo::getBoxSn, drone -> drone));
@@ -273,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