From fc7cd4be1d6335cd3497fe5b1bed1d23eb8d9303 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Fri, 05 Dec 2025 15:38:23 +0800
Subject: [PATCH] 修改盒子名称之前先修改六合盒子名称
---
ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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 1709a4c..051b21b 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,12 +8,13 @@
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.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;
-import com.ard.work.util.UtilMethod;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
@@ -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;
}
/**
@@ -100,6 +113,10 @@
*/
@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 +240,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,11 +274,12 @@
/**
* 同步盒子属性
- *
*/
@Scheduled(fixedRate = 1000 * 5)
public void syncBoxInfo() {
- List<ArdDroneInfo> localList = selectArdDroneList(new ArdDroneInfo());
+ List<ArdDroneInfo> localList = selectArdDroneList(new ArdDroneInfo() {{
+ setUseDataScope(false);
+ }});
Map<String, ArdDroneInfo> localMap = localList.stream()
.collect(Collectors.toMap(ArdDroneInfo::getBoxSn, drone -> drone));
@@ -273,7 +290,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