From 579f3590f60df0e26c3400394222b26d3d7cc87c Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Thu, 25 Dec 2025 15:45:22 +0800
Subject: [PATCH] 1. 新增盒子编码，检查是否有重复的盒子编码。
---
ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java | 83 +++++++++++++++++++++++++++++++++--------
1 files changed, 67 insertions(+), 16 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 cdc212c..9d6b7f9 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
@@ -11,6 +11,7 @@
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;
@@ -19,6 +20,7 @@
import com.ard.work.service.ITyService;
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;
@@ -51,6 +53,10 @@
@Autowired
private IArdServerInfoService ardServerInfoService;
+
+ // 自动注入 ApplicationEventPublisher
+ @Autowired
+ private ApplicationEventPublisher eventPublisher;
/**
* 查询无人机盒子
@@ -170,6 +176,8 @@
try {
// 1. 检查已存在的无人机盒子
List<ArdDroneInfo> existingDrones = getExistingDrones(boxSn);
+ // 1.1 新增时不能添加重复的
+ checkDuplicateBox(existingDrones, boxSn);
// 2. 授权数量验证
validateAuthorization(existingDrones.size(), boxSn.length);
// 3. 获取并组装新的无人机信息
@@ -198,6 +206,29 @@
.map(ArdDroneInfoMapper::selectArdDroneByBoxSn)
.filter(Objects::nonNull)
.collect(Collectors.toList());
+ }
+
+ /**
+ * 检查是否有重复的盒子编码
+ */
+ private void checkDuplicateBox(List<ArdDroneInfo> existingDrone,String[] boxSn) {
+ Set<String> existingBoxSnSet = new HashSet<>();
+ for (ArdDroneInfo droneInfo : existingDrone) {
+ existingBoxSnSet.add(droneInfo.getBoxSn());
+ }
+
+ // 检查是否有重复的盒子编码
+ List<String> duplicateBoxSns = new ArrayList<>();
+ for (String sn : boxSn) {
+ if (existingBoxSnSet.contains(sn)) {
+ duplicateBoxSns.add(sn);
+ }
+ }
+
+ if (!duplicateBoxSns.isEmpty()) {
+ log.warn("存在重复的无人机盒子编码: {}", duplicateBoxSns);
+ throw new ServiceException("以下无人机盒子编码已存在: " + String.join(", ", duplicateBoxSns));
+ }
}
/**
@@ -282,44 +313,63 @@
/**
* 同步盒子属性
*/
- @Scheduled(fixedRate = 1000 * 5)
+ @Scheduled(fixedRate = 5000)
public void syncBoxInfo() {
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, drone -> drone));
+ Map<String, ArdDroneInfo> localMap = localList.stream().collect(Collectors.toMap(ArdDroneInfo::getBoxSn,
+ d -> d));
List<BoxInfoReceiver> boxList = tyService.getBoxList(server.getId());
- if (boxList == null) {
- updateArdDrone(ArdDroneInfo.builder().serverId(server.getId()).onLine(0).build());
+ // 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;
- // 只处理在线的 Redis
- if (remote.getOnLine() == 1) {
- redisCache.setCacheObject(redisKey, remote, 30, TimeUnit.SECONDS);
- } else {
- redisCache.deleteObject(redisKey);
- }
-
- // 数据库同步
ArdDroneInfo local = localMap.get(boxSn);
- if (local == null) continue;
+ boolean dbOnline = local != null && local.getOnLine() == 1;
+ boolean needUpdate = (dbOnline != currentOnline);
- if (updateChangedAttributes(local, remote)) {
- updateArdDrone(local); // 只有真的有变化才更新数据库
+ // 如果状态变化才更新
+ 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);
+ }
}
}
}
}
+
+
/**
* 更新 localBoxInfo 的字段，如果有变化返回 true，否则返回 false
*/
@@ -347,4 +397,5 @@
return changed;
}
+
}
--
Gitblit v1.9.3