From 19763ebd20ad16435f3c1ccfdc8abd1518712cc1 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 24 Dec 2025 15:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java | 137 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 111 insertions(+), 26 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 7015fa7..053cfa6 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
@@ -1,28 +1,38 @@
package com.ard.work.service.impl;
import com.alibaba.fastjson2.JSONObject;
+import com.ard.common.annotation.DataScope;
+import com.ard.common.constant.CacheConstants;
+import com.ard.common.core.redis.RedisCache;
import com.ard.common.exception.ServiceException;
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.event.DeviceStatusEvent;
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.context.ApplicationEventPublisher;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
* 无人机盒子Service业务层处理
*
- * @author ruoyi
+ * @author ard
* @date 2025-03-04
*/
@Slf4j
@@ -37,6 +47,16 @@
@Resource
private AuthorizeService authorizeService;
+
+ @Resource
+ private RedisCache redisCache;
+
+ @Autowired
+ private IArdServerInfoService ardServerInfoService;
+
+ // 自动注入 ApplicationEventPublisher
+ @Autowired
+ private ApplicationEventPublisher eventPublisher;
/**
* 查询无人机盒子
@@ -63,12 +83,25 @@
/**
* 查询无人机盒子列表
*
- * @param ArdDroneInfo 无人机盒子
+ * @param ardDroneInfo 无人机盒子
* @return 无人机盒子
*/
@Override
- public List<ArdDroneInfo> selectArdDroneList(ArdDroneInfo ArdDroneInfo) {
- return ArdDroneInfoMapper.selectArdDroneList(ArdDroneInfo);
+ @DataScope(deptAlias = "d", userAlias = "u")
+ public List<ArdDroneInfo> selectArdDroneList(ArdDroneInfo 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;
}
/**
@@ -92,6 +125,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);
}
@@ -121,7 +159,7 @@
/**
* 批量新增无人机盒子
*
- * @param boxSn 盒子编码数组
+ * @param boxSn 盒子编码数组
* @param deptId 部门ID
* @return 成功插入的记录数
*/
@@ -215,7 +253,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());
@@ -250,42 +287,90 @@
/**
* 同步盒子属性
- *
- * @return 结果
*/
- @Scheduled(fixedRate = 1000 * 10)
+ @Scheduled(fixedRate = 5000)
public void syncBoxInfo() {
- List<ArdDroneInfo> ArdDroneeListEntity = selectArdDroneList(new ArdDroneInfo());
- // 将本地列表转换为Map，方便快速查找
- Map<String, ArdDroneInfo> localArdDroneMap = ArdDroneeListEntity.stream()
- .collect(Collectors.toMap(ArdDroneInfo::getBoxSn, drone -> drone));
- //遍历接口最新获取的无人机盒子信息
- tyService.getBoxList().forEach(remoteArdDrone -> {
- ArdDroneInfo localArdDroneInfo = localArdDroneMap.get(remoteArdDrone.getBoxSn());
- if (localArdDroneInfo != null) {
- if (!localArdDroneInfo.isSameAs(remoteArdDrone)) {
- // 修改无人机（只更新变化的属性）
- updateChangedAttributes(localArdDroneInfo, remoteArdDrone);
- updateArdDrone(localArdDroneInfo);
+ ArdServerInfo ardServerInfo = new ArdServerInfo();
+ ardServerInfo.setUseDataScope(false);
+ List<ArdServerInfo> servers = ardServerInfoService.selectArdServerInfoList(ardServerInfo);
+
+ for (ArdServerInfo server : servers) {
+ 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,
+ d -> d));
+ List<BoxInfoReceiver> boxList = tyService.getBoxList(server.getId());
+ // server 没有返回设备列表 → 全部离线
+ if (boxList == null || boxList.isEmpty()) {
+ for (ArdDroneInfo local : localList) {
+ if (local.getOnLine() != 0) { // 仅当状态变化才更新
+ local.setOnLine(0);
+ ArdDroneInfoMapper.updateArdDrone(local);
+ eventPublisher.publishEvent(new DeviceStatusEvent(local.getBoxSn(), false));
+ redisCache.deleteObject(CacheConstants.UAV_ONLINE_KEY + local.getBoxSn());
+ }
+ }
+ continue;
+ }
+ // server 返回设备列表 → 通过缓存判断状态
+ for (BoxInfoReceiver remote : boxList) {
+ String boxSn = remote.getBoxSn();
+ String redisKey = CacheConstants.UAV_ONLINE_KEY + boxSn;
+ boolean currentOnline = remote.getOnLine() == 1;
+
+ ArdDroneInfo local = localMap.get(boxSn);
+ boolean dbOnline = local != null && local.getOnLine() == 1;
+ boolean needUpdate = (dbOnline != currentOnline);
+
+ // 如果状态变化才更新
+ if (needUpdate){
+ // 更新 Redis
+ if (currentOnline) {
+ redisCache.setCacheObject(redisKey, remote);
+ } else {
+ redisCache.deleteObject(redisKey);
+ }
+ // 发布事件
+ eventPublisher.publishEvent(new DeviceStatusEvent(boxSn, currentOnline));
+ // 更新数据库
+ if (local != null) {
+ local.setOnLine(currentOnline ? 1 : 0);
+ updateArdDrone(local);
+ }
}
}
- });
+ }
}
- // 更新变化的属性
- private void updateChangedAttributes(ArdDroneInfo localBoxInfo, BoxInfoReceiver remoteArdDrone) {
+
+ /**
+ * 更新 localBoxInfo 的字段，如果有变化返回 true，否则返回 false
+ */
+ private boolean updateChangedAttributes(ArdDroneInfo localBoxInfo, BoxInfoReceiver remoteArdDrone) {
+ boolean changed = false;
+
if (!Objects.equals(localBoxInfo.getBoxName(), remoteArdDrone.getBoxName())) {
localBoxInfo.setBoxName(remoteArdDrone.getBoxName());
+ changed = true;
}
if (!Objects.equals(localBoxInfo.getBoxVersion(), remoteArdDrone.getBoxVersion())) {
localBoxInfo.setBoxVersion(remoteArdDrone.getBoxVersion());
+ changed = true;
}
if (!Objects.equals(localBoxInfo.getLastTaskId(), remoteArdDrone.getLastTaskId())) {
localBoxInfo.setLastTaskId(remoteArdDrone.getLastTaskId());
+ changed = true;
}
if (!Objects.equals(localBoxInfo.getOnLine(), remoteArdDrone.getOnLine())) {
localBoxInfo.setOnLine(remoteArdDrone.getOnLine());
+ changed = true;
}
- // 更新其他属性
+
+ // TODO: 更新其他属性时，如果变化也设置 changed = true
+
+ return changed;
}
+
}
--
Gitblit v1.9.3