From 104bbc3c956ba741b61df4d11f76acfecea7622d Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Mon, 17 Nov 2025 09:22:46 +0800
Subject: [PATCH] 1.判断行点是否在禁飞区接口优化。 2.增加禁飞区DTO实体类。 3.上传禁飞区实体类增加。 4.原生实体类文件归类整理。
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
index ab18141..207e10f 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
@@ -13,8 +13,8 @@
import com.ard.data.noflyzone.utils.NoFlyZoneUtils;
import com.ard.oss.model.MinioUploadResult;
import com.ard.oss.service.impl.OssServiceContext;
-import com.ard.route.domain.CoordinatePointReq;
-import com.ard.route.domain.UavRouteReq;
+import com.ard.route.domain.djuav.UavRouteReq;
+import com.ard.route.domain.dto.ArdNoflyDto;
import com.ard.route.domain.route.ArdRouteInfo;
import com.ard.route.domain.vo.KmzResultVo;
import com.ard.route.mapper.ArdRouteInfoMapper;
@@ -74,6 +74,11 @@
*/
@Override
public List<ArdRouteInfo> selectArdRouteInfoList(ArdRouteInfo ardRouteInfo) {
+ if ("1".equals(ardRouteInfo.getOrderByTime())) {
+ ardRouteInfo.setOrderByTime("DESC");
+ }else if ("0".equals(ardRouteInfo.getOrderByTime())) {
+ ardRouteInfo.setOrderByTime("ASC");
+ }
return ardRouteInfoMapper.selectArdRouteInfoList(ardRouteInfo);
}
@@ -87,6 +92,7 @@
public String insertArdRouteInfo(ArdRouteInfo ardRouteInfo) {
ardRouteInfo.setId(IdUtils.simpleUUID());
ardRouteInfo.setCreateTime(DateUtils.getNowDate());
+ ardRouteInfo.setUpdateTime(DateUtils.getNowDate()); // 修改时间，用于排序
if (ardRouteInfo.getGroupId() == null){
ardRouteInfo.setGroupId("0");
}
@@ -211,28 +217,11 @@
/**
* 判断行点是否在禁飞区
- *
- * @param longitude 经度
- * @param latitude 纬度
* @return 结果
*/
@Override
- public Boolean selectRouteInfomationNoFly(Double longitude, Double latitude) {
- if (longitude == null || latitude == null) {
- throw new ControlException("方法参数中未找到有效经纬度字段，无法判断禁飞区！");
- }
- List<ArdNoFlyZone> ardNoFlyZones = ardNoFlyZoneService.selectArdNoFlyZoneList(new ArdNoFlyZone());
-
-
-
- if (!ardNoFlyZones.isEmpty()) {
- Vertex vertex = new Vertex(longitude, latitude);
-// boolean inNoFlyZones = NoFlyZoneUtils.isPointInPolygon(vertex, ardNoFlyZones);
-// if (inNoFlyZones) {
-// throw new ControlException("目标点在禁飞区内，无法执行操作！");
-// }
- }
- return true;
+ public Boolean selectRouteInfomationNoFly(ArdNoflyDto ardNoflyDto) {
+ return verifyNoFlyZone(ardNoflyDto);
}
/**
@@ -244,8 +233,32 @@
ardRouteInfoMapper.insertArdRouteInfo(ardRouteInfo);
}
- private void verifyNoFlyZone(CoordinatePointReq a,CoordinatePointReq b){
+ /**
+ * 判断行点是否在禁飞区
+ * 原点 current 第一个节点
+ * 目标点 target 第二个节点
+ */
+ private Boolean verifyNoFlyZone(ArdNoflyDto ardNoflyDto){
+ // ③ 查询禁飞区
+ List<ArdNoFlyZone> zones = ardNoFlyZoneService.selectArdNoFlyZoneList(new ArdNoFlyZone());
+ if (zones.isEmpty()) {
+ return true;
+ }
+ for (ArdNoFlyZone zone : zones) {
+ List<Vertex> polygon = zone.getVertices();
+ if (polygon == null || polygon.size() < 3) continue;
+ // 检查目标点是否在禁飞区
+ if (NoFlyZoneUtils.isPointInPolygon(ardNoflyDto.getTarget(), polygon)) {
+ throw new ControlException("目标点在禁飞区【" + zone.getName() + "】内，无法执行操作！");
+ }
+
+ // 检查路径是否穿越禁飞区
+ if (ardNoflyDto.getCurrent() != null && NoFlyZoneUtils.isLineIntersectPolygon(ardNoflyDto.getCurrent(), ardNoflyDto.getTarget(), polygon)) {
+ throw new ControlException("路径穿越禁飞区【" + zone.getName() + "】，无法执行操作！");
+ }
+ }
+ return true;
}
}
--
Gitblit v1.9.3