From 0d9fb1b9336da142d070109782a8c260744f5e57 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 08 Dec 2025 12:16:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java | 82 +++++++++++++++++++++++++++++------------
1 files changed, 58 insertions(+), 24 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..c4366ea 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
@@ -8,13 +8,17 @@
import com.ard.common.utils.DateUtils;
import com.ard.common.utils.uuid.IdUtils;
import com.ard.system.authorize.service.AuthorizeService;
+import com.ard.work.domain.dto.BoxSettingsDTO;
import com.ard.work.domain.entity.ArdDroneInfo;
+import com.ard.work.domain.entity.ArdServerInfo;
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.IArdServerInfoService;
import com.ard.work.service.ITyService;
-import com.ard.work.util.UtilMethod;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
@@ -44,6 +48,9 @@
@Resource
private RedisCache redisCache;
+
+ @Autowired
+ private IArdServerInfoService ardServerInfoService;
/**
* 查询无人机盒子
@@ -76,7 +83,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;
}
/**
@@ -100,6 +119,11 @@
*/
@Override
public int updateArdDrone(ArdDroneInfo ArdDroneInfo) {
+ Boolean b =
+ tyService.updateBoxSettings(BoxSettingsDTO.builder().boxSn(ArdDroneInfo.getBoxSn()).boxName(ArdDroneInfo.getBoxName()).build());
+ if (!b) {
+ throw new ServiceException("修改无人机盒子名称失败");
+ }
ArdDroneInfo.setUpdateTime(DateUtils.getNowDate());
return ArdDroneInfoMapper.updateArdDrone(ArdDroneInfo);
}
@@ -223,7 +247,6 @@
drone.setId(IdUtils.simpleUUID());
drone.setBoxSn(box.getBoxSn());
drone.setBoxName(box.getBoxName());
- drone.setBoxAliasName(box.getBoxName());
drone.setStartTime(new Date());
drone.setOnLine(box.getOnLine());
drone.setVideoServer(box.getVideoServer());
@@ -258,31 +281,42 @@
/**
* 同步盒子属性
- *
*/
@Scheduled(fixedRate = 1000 * 5)
public void syncBoxInfo() {
- List<ArdDroneInfo> localList = selectArdDroneList(new ArdDroneInfo(){{setUseDataScope(false);}});
- Map<String, ArdDroneInfo> localMap = localList.stream()
- .collect(Collectors.toMap(ArdDroneInfo::getBoxSn, drone -> drone));
-
- tyService.getBoxList().forEach(remote -> {
- String boxSn = remote.getBoxSn();
-
- // ✅ 维护在线状态缓存
- // 只有在线的无人机才存 Redis
- String redisKey = CacheConstants.UAV_ONLINE_KEY + boxSn;
- if (remote.getOnLine() == 1) {
- redisCache.setCacheObject(redisKey, remote, 10, TimeUnit.SECONDS);
- } else {
- redisCache.deleteObject(CacheConstants.UAV_ONLINE_KEY + boxSn);
+ ArdServerInfo ardServerInfo = new ArdServerInfo();
+ ardServerInfo.setUseDataScope(false);
+ List<ArdServerInfo> servers = ardServerInfoService.selectArdServerInfoList(ardServerInfo);
+ servers.forEach(server -> {
+ ArdDroneInfo droneInfo = new ArdDroneInfo();
+ droneInfo.setServerId(server.getId());
+ droneInfo.setUseDataScope(false);
+ List<ArdDroneInfo> localList = selectArdDroneList(droneInfo);
+ Map<String, ArdDroneInfo> localMap = localList.stream()
+ .collect(Collectors.toMap(ArdDroneInfo::getBoxSn, drone -> drone));
+ List<BoxInfoReceiver> boxList = tyService.getBoxList(server.getId());
+ if (boxList == null) {
+ updateArdDrone(ArdDroneInfo.builder().serverId(server.getId()).onLine(0).build());
+ return;
}
- // 数据库同步
- ArdDroneInfo local = localMap.get(boxSn);
- if (local != null && !local.isSameAs(remote)) {
- updateChangedAttributes(local, remote);
- updateArdDrone(local);
- }
+ boxList.forEach(remote -> {
+ String boxSn = remote.getBoxSn();
+
+ // ✅ 维护在线状态缓存
+ // 只有在线的无人机才存 Redis
+ String redisKey = CacheConstants.UAV_ONLINE_KEY + boxSn;
+ if (remote.getOnLine() == 1) {
+ redisCache.setCacheObject(redisKey, remote, 30, TimeUnit.SECONDS);
+ } else {
+ redisCache.deleteObject(CacheConstants.UAV_ONLINE_KEY + boxSn);
+ }
+ // 数据库同步
+ ArdDroneInfo local = localMap.get(boxSn);
+ if (local != null && !local.isSameAs(remote)) {
+ updateChangedAttributes(local, remote);
+ updateArdDrone(local);
+ }
+ });
});
}
--
Gitblit v1.9.3