From 3756cf0e3841910b22998bc0edf8d209e8539556 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Thu, 13 Nov 2025 11:02:53 +0800
Subject: [PATCH] 增加禁飞区工具类
---
ard-work/src/main/java/com/ard/work/aspect/UavControlAspect.java | 66 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/aspect/UavControlAspect.java b/ard-work/src/main/java/com/ard/work/aspect/UavControlAspect.java
index 0450d6a..5f1f2fb 100644
--- a/ard-work/src/main/java/com/ard/work/aspect/UavControlAspect.java
+++ b/ard-work/src/main/java/com/ard/work/aspect/UavControlAspect.java
@@ -23,7 +23,6 @@
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.springframework.stereotype.Component;
-
import javax.annotation.Resource;
import java.util.List;
@@ -144,34 +143,61 @@
return;
}
- Double longitude = null;
- Double latitude = null;
+ // ① 提取 boxSn（无人机编号）和目标点坐标
+ String boxSn = null;
+ Double targetLon = null, targetLat = null;
for (Object arg : args) {
- if (arg == null) {
- continue;
+ if (arg == null) continue;
+
+ if (boxSn == null) {
+ String sn = ReflectUtils.getFieldValue(arg, "boxSn");
+ if (sn != null) boxSn = sn;
}
- Double lon = ReflectUtils.getFieldValue(arg, "longitude");
- Double lat = ReflectUtils.getFieldValue(arg, "latitude");
- if (lon != null && lat != null) {
- longitude = lon;
- latitude = lat;
- break;
+
+ if (targetLon == null || targetLat == null) {
+ Double lon = ReflectUtils.getFieldValue(arg, "longitude");
+ Double lat = ReflectUtils.getFieldValue(arg, "latitude");
+ if (lon != null && lat != null) {
+ targetLon = lon;
+ targetLat = lat;
+ }
}
}
- if (longitude == null || latitude == null) {
- throw new ControlException("方法参数中未找到有效经纬度字段，无法判断禁飞区！");
+ if (targetLon == null || targetLat == null) {
+ throw new ControlException("方法参数中未找到有效目标经纬度字段，无法判断禁飞区！");
}
- List<ArdNoFlyZone> ardNoFlyZones = ardNoFlyZoneService.selectArdNoFlyZoneList(new ArdNoFlyZone());
- if (!ardNoFlyZones.isEmpty()) {
- Vertex vertex = new Vertex(longitude, latitude);
- boolean inNoFlyZones = NoFlyZoneUtils.isInNoFlyZones(vertex, ardNoFlyZones);
- if (inNoFlyZones) {
- throw new ControlException("目标点在禁飞区内，无法执行操作！");
+ // ② 获取无人机当前位置（从缓存）
+ Vertex current = null;
+ if (boxSn != null) {
+ TelemetryData telemetry = UavTelemetryDataCache.get(boxSn);
+ if (telemetry != null) {
+ current = new Vertex(telemetry.getLng(), telemetry.getLat());
+ //current = new Vertex(125.03, 46.58);
+ }
+ }
+
+ Vertex target = new Vertex(targetLon, targetLat);
+
+ // ③ 查询禁飞区
+ List<ArdNoFlyZone> zones = ardNoFlyZoneService.selectArdNoFlyZoneList(new ArdNoFlyZone());
+ if (zones.isEmpty()) return;
+
+ for (ArdNoFlyZone zone : zones) {
+ List<Vertex> polygon = zone.getVertices();
+ if (polygon == null || polygon.size() < 3) continue;
+
+ // 检查目标点是否在禁飞区
+ if (NoFlyZoneUtils.isPointInPolygon(target, polygon)) {
+ throw new ControlException("目标点在禁飞区【" + zone.getName() + "】内，无法执行操作！");
+ }
+
+ // 检查路径是否穿越禁飞区
+ if (current != null && NoFlyZoneUtils.isLineIntersectPolygon(current, target, polygon)) {
+ throw new ControlException("路径穿越禁飞区【" + zone.getName() + "】，无法执行操作！");
}
}
}
-
}
--
Gitblit v1.9.3