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/domain/djuav/kml/KmlWaypointTurnParam.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlFolder.java | 2
ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java | 9 +
ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java | 4
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlInfo.java | 2
ard-route/src/main/java/com/ard/route/domain/sixhe/ArdRoutePoints.java | 22 ++++
ard-route/src/main/java/com/ard/route/domain/sixhe/ArdRouteActions.java | 11 ++
ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java | 7
ard-route/src/main/java/com/ard/route/util/InitializationUtils.java | 7 +
ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java | 3
ard-route/src/main/java/com/ard/route/domain/djuav/WaypointTurnReq.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlDocument.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/CoordinatePointReq.java | 2
ard-route/src/main/java/com/ard/route/domain/vo/KmzInfoVo.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPolygon.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/kml/RoutePointInfo.java | 8
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlLinearRing.java | 2
ard-system/src/main/java/com/ard/data/noflyzone/domain/Vertex.java | 3
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlDroneInfo.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/WaypointHeadingReq.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlMissionConfig.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPoint.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWayLineCoordinateSysParam.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/ActionGroupReq.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlLineString.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlAction.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/MappingTypeReq.java | 2
ard-route/src/main/java/com/ard/route/domain/dto/ArdNoflyDto.java | 18 +++
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionTrigger.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionGroup.java | 2
ard-route/src/main/java/com/ard/route/service/UavRouteService.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointHeadingParam.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPlacemark.java | 2
ard-route/src/main/java/com/ard/route/domain/sixhe/ArdRouteChange.java | 20 ++++
ard-route/src/main/java/com/ard/route/domain/djuav/RoutePointReq.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointGimbalHeadingParam.java | 2
ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInfoController.java | 10 +-
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionActuatorFuncParam.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlGlobalWaypointHeadingParam.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlMappingHeadingParam.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPayloadInfo.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOverlap.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlParams.java | 10 +-
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPayloadParam.java | 2
ard-route/src/main/java/com/ard/route/domain/djuav/UavRouteReq.java | 2
ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml | 5 +
ard-route/src/main/java/com/ard/route/domain/djuav/PointActionReq.java | 2
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 57 +++++++----
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOuterBoundaryIs.java | 2
ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java | 9 +
50 files changed, 188 insertions(+), 83 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInfoController.java b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInfoController.java
index 5e8c344..09eb7de 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInfoController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInfoController.java
@@ -5,6 +5,7 @@
import com.ard.common.utils.poi.ExcelUtil;
import com.ard.oss.model.MinioUploadResult;
+import com.ard.route.domain.dto.ArdNoflyDto;
import com.ard.route.domain.route.ArdRouteInfo;
import com.ard.route.service.IArdRouteInfoService;
import io.swagger.annotations.Api;
@@ -123,10 +124,9 @@
* 判断行点是否在禁飞区
*/
@ApiOperation("判断行点是否在禁飞区")
- @GetMapping("/noFly/{longitude}/{latitude}")
- public Boolean noFly(@PathVariable("longitude") Double longitude,
- @PathVariable("latitude") Double latitude) {
- return ardRouteInfoService.selectRouteInfomationNoFly(longitude,latitude);
+ @PostMapping("/noFly")
+ public Boolean noFly(@RequestBody ArdNoflyDto ardNoflyDto) {
+ return ardRouteInfoService.selectRouteInfomationNoFly(ardNoflyDto);
}
/**
@@ -134,7 +134,7 @@
*/
// @ApiOperation("上传航线到边缘服务器")
// @PostMapping
-// public AjaxResult uploadRouteInformation(@RequestBody ArdRouteInfor ArdRouteInfor) {
+// public AjaxResult uploadRouteInformation(@RequestBody ArdRouteInfo ArdRouteInfor) {
// return success(ardRouteInfoService.selectArdRouteInforByName(ArdRouteInfor.getName()));
// }
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java b/ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java
index 92df269..24c0144 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java
@@ -1,7 +1,7 @@
package com.ard.web.controller.route;
import com.ard.common.core.domain.AjaxResult;
-import com.ard.route.domain.UavRouteReq;
+import com.ard.route.domain.djuav.UavRouteReq;
import com.ard.route.service.UavRouteService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -9,8 +9,6 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-
-import java.io.IOException;
import static com.ard.common.core.domain.AjaxResult.success;
diff --git a/ard-route/src/main/java/com/ard/route/domain/ActionGroupReq.java b/ard-route/src/main/java/com/ard/route/domain/djuav/ActionGroupReq.java
similarity index 94%
rename from ard-route/src/main/java/com/ard/route/domain/ActionGroupReq.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/ActionGroupReq.java
index 490ed2a..94e48d7 100644
--- a/ard-route/src/main/java/com/ard/route/domain/ActionGroupReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/ActionGroupReq.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain;
+package com.ard.route.domain.djuav;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/CoordinatePointReq.java b/ard-route/src/main/java/com/ard/route/domain/djuav/CoordinatePointReq.java
similarity index 90%
rename from ard-route/src/main/java/com/ard/route/domain/CoordinatePointReq.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/CoordinatePointReq.java
index 1aff0e3..800247a 100644
--- a/ard-route/src/main/java/com/ard/route/domain/CoordinatePointReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/CoordinatePointReq.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain;
+package com.ard.route.domain.djuav;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/MappingTypeReq.java b/ard-route/src/main/java/com/ard/route/domain/djuav/MappingTypeReq.java
similarity index 95%
rename from ard-route/src/main/java/com/ard/route/domain/MappingTypeReq.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/MappingTypeReq.java
index 0d8d0fa..0642603 100644
--- a/ard-route/src/main/java/com/ard/route/domain/MappingTypeReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/MappingTypeReq.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain;
+package com.ard.route.domain.djuav;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/PointActionReq.java b/ard-route/src/main/java/com/ard/route/domain/djuav/PointActionReq.java
similarity index 96%
rename from ard-route/src/main/java/com/ard/route/domain/PointActionReq.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/PointActionReq.java
index 015b1c3..1340cf3 100644
--- a/ard-route/src/main/java/com/ard/route/domain/PointActionReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/PointActionReq.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain;
+package com.ard.route.domain.djuav;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/RoutePointReq.java b/ard-route/src/main/java/com/ard/route/domain/djuav/RoutePointReq.java
similarity index 95%
rename from ard-route/src/main/java/com/ard/route/domain/RoutePointReq.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/RoutePointReq.java
index eff648d..07882b2 100644
--- a/ard-route/src/main/java/com/ard/route/domain/RoutePointReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/RoutePointReq.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain;
+package com.ard.route.domain.djuav;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/UavRouteReq.java b/ard-route/src/main/java/com/ard/route/domain/djuav/UavRouteReq.java
similarity index 98%
rename from ard-route/src/main/java/com/ard/route/domain/UavRouteReq.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/UavRouteReq.java
index 04addc0..9f5a690 100644
--- a/ard-route/src/main/java/com/ard/route/domain/UavRouteReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/UavRouteReq.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain;
+package com.ard.route.domain.djuav;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/WaypointHeadingReq.java b/ard-route/src/main/java/com/ard/route/domain/djuav/WaypointHeadingReq.java
similarity index 91%
rename from ard-route/src/main/java/com/ard/route/domain/WaypointHeadingReq.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/WaypointHeadingReq.java
index 8e6decd..0b2ea18 100644
--- a/ard-route/src/main/java/com/ard/route/domain/WaypointHeadingReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/WaypointHeadingReq.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain;
+package com.ard.route.domain.djuav;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/WaypointTurnReq.java b/ard-route/src/main/java/com/ard/route/domain/djuav/WaypointTurnReq.java
similarity index 91%
rename from ard-route/src/main/java/com/ard/route/domain/WaypointTurnReq.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/WaypointTurnReq.java
index 5c17415..865a049 100644
--- a/ard-route/src/main/java/com/ard/route/domain/WaypointTurnReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/WaypointTurnReq.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain;
+package com.ard.route.domain.djuav;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlAction.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlAction.java
similarity index 90%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlAction.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlAction.java
index 06583c6..a9a9ce4 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlAction.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlAction.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlActionActuatorFuncParam.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionActuatorFuncParam.java
similarity index 98%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlActionActuatorFuncParam.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionActuatorFuncParam.java
index eb7fa1b..27d8800 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlActionActuatorFuncParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionActuatorFuncParam.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlActionGroup.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionGroup.java
similarity index 94%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlActionGroup.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionGroup.java
index d1c1302..6cc4b21 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlActionGroup.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionGroup.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlActionTrigger.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionTrigger.java
similarity index 88%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlActionTrigger.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionTrigger.java
index 8ea5fb9..1a3a1e2 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlActionTrigger.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionTrigger.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlDocument.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlDocument.java
similarity index 92%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlDocument.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlDocument.java
index 8a90b10..d4847e3 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlDocument.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlDocument.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlDroneInfo.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlDroneInfo.java
similarity index 88%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlDroneInfo.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlDroneInfo.java
index c69370c..28d11b9 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlDroneInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlDroneInfo.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlFolder.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlFolder.java
similarity index 97%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlFolder.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlFolder.java
index 806b0f3..3cb2c64 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlFolder.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlFolder.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamImplicit;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlGlobalWaypointHeadingParam.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlGlobalWaypointHeadingParam.java
similarity index 92%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlGlobalWaypointHeadingParam.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlGlobalWaypointHeadingParam.java
index 19b98c9..14b1763 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlGlobalWaypointHeadingParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlGlobalWaypointHeadingParam.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlInfo.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlInfo.java
similarity index 93%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlInfo.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlInfo.java
index d50be81..22620d2 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlInfo.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlLineString.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlLineString.java
similarity index 83%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlLineString.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlLineString.java
index 61b0299..8bce6cc 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlLineString.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlLineString.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlLinearRing.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlLinearRing.java
similarity index 83%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlLinearRing.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlLinearRing.java
index a331e99..0456837 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlLinearRing.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlLinearRing.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlMappingHeadingParam.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlMappingHeadingParam.java
similarity index 91%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlMappingHeadingParam.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlMappingHeadingParam.java
index d26a2c8..2165646 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlMappingHeadingParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlMappingHeadingParam.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlMissionConfig.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlMissionConfig.java
similarity index 96%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlMissionConfig.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlMissionConfig.java
index 80faaba..49a5592 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlMissionConfig.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlMissionConfig.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlOuterBoundaryIs.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOuterBoundaryIs.java
similarity index 84%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlOuterBoundaryIs.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOuterBoundaryIs.java
index 13cbbfe..88e419f 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlOuterBoundaryIs.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOuterBoundaryIs.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlOverlap.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOverlap.java
similarity index 95%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlOverlap.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOverlap.java
index 061b2e3..b4d6eb9 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlOverlap.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOverlap.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlParams.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlParams.java
similarity index 87%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlParams.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlParams.java
index 748dd21..fb78332 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlParams.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlParams.java
@@ -1,9 +1,9 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
-import com.ard.route.domain.MappingTypeReq;
-import com.ard.route.domain.PointActionReq;
-import com.ard.route.domain.WaypointHeadingReq;
-import com.ard.route.domain.WaypointTurnReq;
+import com.ard.route.domain.djuav.MappingTypeReq;
+import com.ard.route.domain.djuav.PointActionReq;
+import com.ard.route.domain.djuav.WaypointHeadingReq;
+import com.ard.route.domain.djuav.WaypointTurnReq;
import lombok.Data;
import java.util.List;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlPayloadInfo.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPayloadInfo.java
similarity index 88%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlPayloadInfo.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPayloadInfo.java
index 8662d08..5dbff23 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlPayloadInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPayloadInfo.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlPayloadParam.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPayloadParam.java
similarity index 95%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlPayloadParam.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPayloadParam.java
index e7cbfa0..aa8a89f 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlPayloadParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPayloadParam.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlPlacemark.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPlacemark.java
similarity index 98%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlPlacemark.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPlacemark.java
index 4bd4725..693dce1 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlPlacemark.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPlacemark.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlPoint.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPoint.java
similarity index 83%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlPoint.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPoint.java
index 666de8a..19aad87 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlPoint.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPoint.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlPolygon.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPolygon.java
similarity index 84%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlPolygon.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPolygon.java
index 25026e3..108db64 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlPolygon.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPolygon.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlWayLineCoordinateSysParam.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWayLineCoordinateSysParam.java
similarity index 94%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlWayLineCoordinateSysParam.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWayLineCoordinateSysParam.java
index 5f4a1af..bcbeac2 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlWayLineCoordinateSysParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWayLineCoordinateSysParam.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointGimbalHeadingParam.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointGimbalHeadingParam.java
similarity index 90%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointGimbalHeadingParam.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointGimbalHeadingParam.java
index 9025f27..a813e84 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointGimbalHeadingParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointGimbalHeadingParam.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointHeadingParam.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointHeadingParam.java
similarity index 92%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointHeadingParam.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointHeadingParam.java
index 5fe75d0..b93c244 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointHeadingParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointHeadingParam.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointTurnParam.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointTurnParam.java
similarity index 89%
rename from ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointTurnParam.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointTurnParam.java
index 5a04cea..79bceea 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointTurnParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointTurnParam.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/RoutePointInfo.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/RoutePointInfo.java
similarity index 86%
rename from ard-route/src/main/java/com/ard/route/domain/kml/RoutePointInfo.java
rename to ard-route/src/main/java/com/ard/route/domain/djuav/kml/RoutePointInfo.java
index d394298..aa9cd7b 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/RoutePointInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/RoutePointInfo.java
@@ -1,8 +1,8 @@
-package com.ard.route.domain.kml;
+package com.ard.route.domain.djuav.kml;
-import com.ard.route.domain.ActionGroupReq;
-import com.ard.route.domain.WaypointHeadingReq;
-import com.ard.route.domain.WaypointTurnReq;
+import com.ard.route.domain.djuav.ActionGroupReq;
+import com.ard.route.domain.djuav.WaypointHeadingReq;
+import com.ard.route.domain.djuav.WaypointTurnReq;
import lombok.Data;
import java.io.Serializable;
diff --git a/ard-route/src/main/java/com/ard/route/domain/dto/ArdNoflyDto.java b/ard-route/src/main/java/com/ard/route/domain/dto/ArdNoflyDto.java
new file mode 100644
index 0000000..84e4467
--- /dev/null
+++ b/ard-route/src/main/java/com/ard/route/domain/dto/ArdNoflyDto.java
@@ -0,0 +1,18 @@
+package com.ard.route.domain.dto;
+
+import com.ard.data.noflyzone.domain.Vertex;
+import lombok.Data;
+
+/**
+ * 禁飞区DTO实体类
+ */
+@Data
+public class ArdNoflyDto {
+
+ /** 原点 第一个节点 */
+ private Vertex current;
+
+ /** 目标点 第二个节点 */
+ private Vertex target;
+
+}
diff --git a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
index b7e5fb9..9f4ec1c 100644
--- a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
@@ -2,7 +2,7 @@
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
-import com.ard.route.domain.UavRouteReq;
+import com.ard.route.domain.djuav.UavRouteReq;
import lombok.Data;
/**
@@ -47,6 +47,13 @@
@Excel(name = "是否只读")
private String readOnly;
+ /** 时间排序
+ * 0：正序
+ * 1：倒序
+ */
+ @Excel(name = "时间排序")
+ private String orderByTime;
+
/**
* 生成kmz文件实体类
*/
diff --git a/ard-route/src/main/java/com/ard/route/domain/sixhe/ArdRouteActions.java b/ard-route/src/main/java/com/ard/route/domain/sixhe/ArdRouteActions.java
new file mode 100644
index 0000000..44b2c46
--- /dev/null
+++ b/ard-route/src/main/java/com/ard/route/domain/sixhe/ArdRouteActions.java
@@ -0,0 +1,11 @@
+package com.ard.route.domain.sixhe;
+
+import lombok.Data;
+
+@Data
+public class ArdRouteActions {
+ private Integer param;
+ private String speakInfo;
+ private Integer type;
+ private Integer waitTime;
+}
diff --git a/ard-route/src/main/java/com/ard/route/domain/sixhe/ArdRouteChange.java b/ard-route/src/main/java/com/ard/route/domain/sixhe/ArdRouteChange.java
new file mode 100644
index 0000000..ae2dbb0
--- /dev/null
+++ b/ard-route/src/main/java/com/ard/route/domain/sixhe/ArdRouteChange.java
@@ -0,0 +1,20 @@
+package com.ard.route.domain.sixhe;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 飞行转换实体类
+ **/
+@Data
+public class ArdRouteChange {
+ private Integer autoSpeed;
+ private Integer finishedAction;
+ private Integer homeHeight;
+ private List<Integer> interests;
+ private Integer isSaveEnergyMode;
+ private Integer loseAction;
+ private Integer maxSpeed;
+ private List<ArdRoutePoints> points;
+}
diff --git a/ard-route/src/main/java/com/ard/route/domain/sixhe/ArdRoutePoints.java b/ard-route/src/main/java/com/ard/route/domain/sixhe/ArdRoutePoints.java
new file mode 100644
index 0000000..a395901
--- /dev/null
+++ b/ard-route/src/main/java/com/ard/route/domain/sixhe/ArdRoutePoints.java
@@ -0,0 +1,22 @@
+package com.ard.route.domain.sixhe;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ArdRoutePoints {
+ private Integer dampingDistance;
+ private Integer flightPathMode;
+ private Integer groupIndex;
+ private Integer heading;
+ private Integer headingMode;
+ private Integer height;
+ private Integer interestIndex;
+ private Double lat;
+ private Double lon;
+ private Integer safeGohomeFlag;
+ private Integer speed;
+
+ private List<ArdRouteActions> actions;
+}
diff --git a/ard-route/src/main/java/com/ard/route/domain/vo/KmzInfoVo.java b/ard-route/src/main/java/com/ard/route/domain/vo/KmzInfoVo.java
index dbc2fd8..2481e15 100644
--- a/ard-route/src/main/java/com/ard/route/domain/vo/KmzInfoVo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/vo/KmzInfoVo.java
@@ -1,6 +1,6 @@
package com.ard.route.domain.vo;
-import com.ard.route.domain.kml.KmlInfo;
+import com.ard.route.domain.djuav.kml.KmlInfo;
import lombok.Data;
import java.io.Serializable;
diff --git a/ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java b/ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java
index 79f459e..d50e794 100644
--- a/ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java
+++ b/ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java
@@ -1,6 +1,8 @@
package com.ard.route.service;
+import com.ard.data.noflyzone.domain.Vertex;
import com.ard.oss.model.MinioUploadResult;
+import com.ard.route.domain.dto.ArdNoflyDto;
import com.ard.route.domain.route.ArdRouteInfo;
import org.springframework.web.multipart.MultipartFile;
@@ -90,10 +92,9 @@
/**
* 判断行点是否在禁飞区
*
- * @param longitude 经度
- * @param latitude 纬度
+ * ardNoflyDto
* @return 结果
*/
- public Boolean selectRouteInfomationNoFly(Double longitude, Double latitude);
+ public Boolean selectRouteInfomationNoFly(ArdNoflyDto ardNoflyDto);
}
diff --git a/ard-route/src/main/java/com/ard/route/service/UavRouteService.java b/ard-route/src/main/java/com/ard/route/service/UavRouteService.java
index eccc00f..47fdb24 100644
--- a/ard-route/src/main/java/com/ard/route/service/UavRouteService.java
+++ b/ard-route/src/main/java/com/ard/route/service/UavRouteService.java
@@ -1,6 +1,6 @@
package com.ard.route.service;
-import com.ard.route.domain.UavRouteReq;
+import com.ard.route.domain.djuav.UavRouteReq;
import com.ard.route.domain.vo.KmzInfoVo;
import com.ard.route.domain.vo.KmzResultVo;
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;
}
}
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
index deab3a5..7eac98f 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
@@ -4,10 +4,11 @@
import cn.hutool.core.collection.CollectionUtil;
import com.ard.oss.service.impl.OssServiceContext;
import com.ard.route.constant.FileTypeConstants;
-import com.ard.route.domain.RoutePointReq;
-import com.ard.route.domain.UavRouteReq;
-import com.ard.route.domain.WaypointHeadingReq;
-import com.ard.route.domain.WaypointTurnReq;
+import com.ard.route.domain.djuav.RoutePointReq;
+import com.ard.route.domain.djuav.UavRouteReq;
+import com.ard.route.domain.djuav.WaypointHeadingReq;
+import com.ard.route.domain.djuav.WaypointTurnReq;
+import com.ard.route.domain.djuav.kml.*;
import com.ard.route.domain.kml.*;
import com.ard.route.domain.route.ArdRouteInfo;
import com.ard.route.domain.vo.KmzInfoVo;
diff --git a/ard-route/src/main/java/com/ard/route/util/InitializationUtils.java b/ard-route/src/main/java/com/ard/route/util/InitializationUtils.java
index 621110a..187f75e 100644
--- a/ard-route/src/main/java/com/ard/route/util/InitializationUtils.java
+++ b/ard-route/src/main/java/com/ard/route/util/InitializationUtils.java
@@ -1,6 +1,7 @@
package com.ard.route.util;
-import com.ard.route.domain.*;
+import com.ard.route.domain.djuav.*;
+import com.ard.route.domain.sixhe.ArdRouteChange;
/**
* 初始化数据
@@ -61,4 +62,8 @@
}
return uavRouteReq;
}
+
+ private void initializationSixHe(){
+ ArdRouteChange ardRouteChange = new ArdRouteChange();
+ }
}
diff --git a/ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java b/ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java
index a650ec9..e18467c 100644
--- a/ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java
+++ b/ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java
@@ -3,7 +3,8 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
-import com.ard.route.domain.*;
+import com.ard.route.domain.djuav.*;
+import com.ard.route.domain.djuav.kml.*;
import com.ard.route.domain.kml.*;
import com.ard.route.enums.kml.*;
import com.ard.route.constant.FileTypeConstants;
diff --git a/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
index ed8a7c2..749a0a5 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
@@ -45,7 +45,12 @@
<if test="payload != null and payload != ''"> and payload = #{payload}</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="path != null and path != ''"> and path = #{path}</if>
+ <if test="groupId != null"> and group_id = #{groupId}</if>
</where>
+ <!-- 动态排序 -->
+ <if test="orderByTime != null and orderByTime != ''">
+ ORDER BY update_time ${orderByTime}
+ </if>
</select>
<select id="selectArdRouteInfoById" parameterType="String" resultMap="ArdRouteInfoResult">
diff --git a/ard-system/src/main/java/com/ard/data/noflyzone/domain/Vertex.java b/ard-system/src/main/java/com/ard/data/noflyzone/domain/Vertex.java
index eae5166..34940df 100644
--- a/ard-system/src/main/java/com/ard/data/noflyzone/domain/Vertex.java
+++ b/ard-system/src/main/java/com/ard/data/noflyzone/domain/Vertex.java
@@ -1,7 +1,10 @@
package com.ard.data.noflyzone.domain;
public class Vertex {
+
+ // 经度
public double x;
+ // 纬度
public double y;
public Vertex() {
--
Gitblit v1.9.3