From 80d08b0c2a41988847adaee8c8704affe4d96b8e Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Tue, 11 Nov 2025 10:30:32 +0800
Subject: [PATCH] 取消方向控制禁飞区检查
---
ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 20 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 9128c2a..1323deb 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,6 +1,9 @@
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;
@@ -17,12 +20,13 @@
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
@@ -38,7 +42,8 @@
@Resource
private AuthorizeService authorizeService;
- UtilMethod utilMethod = new UtilMethod();
+ @Resource
+ private RedisCache redisCache;
/**
* 查询无人机盒子
@@ -65,12 +70,13 @@
/**
* 查询无人机盒子列表
*
- * @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) {
+ return ArdDroneInfoMapper.selectArdDroneList(ardDroneInfo);
}
/**
@@ -123,7 +129,7 @@
/**
* 批量新增无人机盒子
*
- * @param boxSn 盒子编码数组
+ * @param boxSn 盒子编码数组
* @param deptId 部门ID
* @return 成功插入的记录数
*/
@@ -150,6 +156,14 @@
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);
}
/**
@@ -245,23 +259,29 @@
/**
* 同步盒子属性
*
- * @return 结果
*/
- @Scheduled(fixedRate = 1000 * 10)
+ @Scheduled(fixedRate = 1000 * 5)
public void syncBoxInfo() {
- List<ArdDroneInfo> ArdDroneeListEntity = selectArdDroneList(new ArdDroneInfo());
- // 将本地列表转换为Map，方便快速查找
- Map<String, ArdDroneInfo> localArdDroneMap = ArdDroneeListEntity.stream()
+ List<ArdDroneInfo> localList = selectArdDroneList(new ArdDroneInfo(){{setUseDataScope(false);}});
+ Map<String, ArdDroneInfo> localMap = localList.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);
- }
+
+ 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);
+ }
+ // 数据库同步
+ ArdDroneInfo local = localMap.get(boxSn);
+ if (local != null && !local.isSameAs(remote)) {
+ updateChangedAttributes(local, remote);
+ updateArdDrone(local);
}
});
}
--
Gitblit v1.9.3