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 | 211 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 188 insertions(+), 23 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 0abed9a..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
@@ -1,27 +1,36 @@
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.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;
import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
* 无人机盒子Service业务层处理
*
- * @author ruoyi
+ * @author ard
* @date 2025-03-04
*/
+@Slf4j
@Service
public class ArdDroneInfoServiceImpl implements IArdDroneInfoService {
@@ -30,6 +39,12 @@
@Resource
private ITyService tyService;
+
+ @Resource
+ private AuthorizeService authorizeService;
+
+ @Resource
+ private RedisCache redisCache;
/**
* 查询无人机盒子
@@ -56,12 +71,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;
}
/**
@@ -112,25 +140,162 @@
}
/**
- * 同步盒子属性
+ * 批量新增无人机盒子
*
- * @return 结果
+ * @param boxSn 盒子编码数组
+ * @param deptId 部门ID
+ * @return 成功插入的记录数
*/
- @Scheduled(fixedRate = 1000 * 10)
- 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);
+ @Override
+ public int insertArdDroneLs(String[] boxSn, Long deptId) {
+ // 参数校验
+ if (boxSn == null || boxSn.length == 0) {
+ log.warn("传入的盒子编码为空");
+ return 1;
+ }
+ if (deptId == null) {
+ throw new IllegalArgumentException("部门ID不能为空");
+ }
+ try {
+ // 1. 检查已存在的无人机盒子
+ List<ArdDroneInfo> existingDrones = getExistingDrones(boxSn);
+ // 2. 授权数量验证
+ validateAuthorization(existingDrones.size(), boxSn.length);
+ // 3. 获取并组装新的无人机信息
+ List<ArdDroneInfo> newDrones = assembleNewDrones(boxSn, deptId);
+ // 4. 批量插入
+ return batchInsertDrones(newDrones);
+ } catch (Exception e) {
+ log.error("批量新增无人机盒子失败, boxSn: {}, deptId: {}", Arrays.toString(boxSn), deptId, e);
+ throw new ServiceException("批量新增无人机盒子失败: " + e.getMessage());
+ }
+ }
+
+ /**
+ * 修改无人机状态
+ */
+ @Override
+ public int updateDroneStatus(String serverId, String status) {
+ return ArdDroneInfoMapper.updateDroneStatus(serverId, status);
+ }
+
+ /**
+ * 获取已存在的无人机信息
+ */
+ private List<ArdDroneInfo> getExistingDrones(String[] boxSn) {
+ return Arrays.stream(boxSn)
+ .map(ArdDroneInfoMapper::selectArdDroneByBoxSn)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ }
+
+ /**
+ * 验证授权数量
+ */
+ private void validateAuthorization(int existingCount, int newCount) {
+ int totalCount = existingCount + newCount;
+
+ JSONObject authInfo = authorizeService.getAuthorizationInfo();
+ String authType = authInfo.getString("Type");
+
+ switch (authType) {
+ case "normal":
+ int allowedDroneNum = authInfo.getIntValue("droneNum");
+ if (totalCount > allowedDroneNum) {
+ throw new RuntimeException(String.format(
+ "授权数量%d，当前操作将导致总数达到%d，超过授权限制",
+ allowedDroneNum, totalCount));
}
+ break;
+ case "expired":
+ throw new RuntimeException("授权文件已过期");
+ case "mismatch":
+ throw new RuntimeException("授权文件不匹配");
+ default:
+ throw new RuntimeException("未知的授权类型: " + authType);
+ }
+ }
+
+ /**
+ * 组装新的无人机信息
+ */
+ private List<ArdDroneInfo> assembleNewDrones(String[] boxSn, Long deptId) {
+ List<BoxInfoReceiver> allBoxes = tyService.getBoxList();
+ Set<String> targetBoxSnSet = new HashSet<>(Arrays.asList(boxSn));
+ return allBoxes.stream()
+ .filter(box -> targetBoxSnSet.contains(box.getBoxSn()))
+ .map(box -> createDroneInfo(box, deptId))
+ .collect(Collectors.toList());
+ }
+
+ /**
+ * 创建无人机信息对象
+ */
+ private ArdDroneInfo createDroneInfo(BoxInfoReceiver box, Long deptId) {
+ ArdDroneInfo drone = new ArdDroneInfo();
+ 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());
+ drone.setVideoPort(box.getVideoPort());
+ drone.setLastTaskId(box.getLastTaskId());
+ drone.setDeptId(deptId);
+
+ // 设置创建信息和更新信息
+ setCreateAndUpdateInfo(drone);
+
+ return drone;
+ }
+
+ /**
+ * 设置创建和更新信息
+ */
+ private void setCreateAndUpdateInfo(ArdDroneInfo drone) {
+ Date currentTime = new Date();
+ drone.setCreateTime(currentTime);
+ drone.setUpdateTime(currentTime);
+ }
+
+ /**
+ * 批量插入无人机信息
+ */
+ private int batchInsertDrones(List<ArdDroneInfo> drones) {
+ if (drones.isEmpty()) {
+ return 0;
+ }
+ return ArdDroneInfoMapper.insertArdDroneLs(drones);
+ }
+
+ /**
+ * 同步盒子属性
+ */
+ @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, 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