From bfac293c7866f92e074f7c8bf92e6548e1ce3768 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Fri, 28 Nov 2025 16:45:13 +0800
Subject: [PATCH] 1.哈尔滨增加，另一个Minio配置。
---
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/KmlActionGroup.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/KmlFolder.java | 2 +
ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java | 7 +--
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPlacemark.java | 1
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointGimbalHeadingParam.java | 2 +
ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java | 3 +
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/KmlDocument.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 | 1
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/KmlPayloadInfo.java | 2 +
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOverlap.java | 18 +++++----
ard-route/src/main/java/com/ard/route/domain/djuav/kml/RoutePointInfo.java | 15 -------
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlLinearRing.java | 2 +
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlDroneInfo.java | 2 +
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlParams.java | 1
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPayloadParam.java | 2 +
ard-route/src/main/java/com/ard/route/util/ToolUtils.java | 11 +++++
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/PointActionReq.java | 1
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWayLineCoordinateSysParam.java | 2 +
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 10 +++-
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOuterBoundaryIs.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 | 3 +
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionTrigger.java | 2 +
30 files changed, 76 insertions(+), 33 deletions(-)
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 24c0144..ccd44ae 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
@@ -5,7 +5,6 @@
import com.ard.route.service.UavRouteService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -24,7 +23,7 @@
* 编辑kmz文件
*/
@ApiOperation("编辑kmz文件")
- @PreAuthorize("@ss.hasPermi('route:kmz:updateKmz')")
+ //@PreAuthorize("@ss.hasPermi('route:kmz:updateKmz')")
@PostMapping("/updateKmz/{fileName}")
public AjaxResult updateKmz(@RequestBody UavRouteReq uavRouteReq,
@PathVariable("fileName") String fileName){
@@ -35,7 +34,7 @@
* 生成kmz文件
*/
@ApiOperation("生成kmz文件")
- @PreAuthorize("@ss.hasPermi('route:kmz:buildKmz')")
+ //@PreAuthorize("@ss.hasPermi('route:kmz:buildKmz')")
@PostMapping("/buildKmz/{fileName}")
public AjaxResult buildKmz(@RequestBody UavRouteReq uavRouteReq,
@PathVariable("fileName") String fileName){
@@ -46,7 +45,7 @@
* 解析kmz文件
*/
@ApiOperation("解析kmz文件")
- @PreAuthorize("@ss.hasPermi('route:kmz:parseKmz')")
+ //@PreAuthorize("@ss.hasPermi('route:kmz:parseKmz')")
@PostMapping("/parseKmz")
public AjaxResult parseKmz(@RequestParam("fileUrl") String fileUrl){
return success(routeService.parseKmz(fileUrl));
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/PointActionReq.java b/ard-route/src/main/java/com/ard/route/domain/djuav/PointActionReq.java
index 1340cf3..d46226f 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/PointActionReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/PointActionReq.java
@@ -2,7 +2,6 @@
import lombok.Data;
-//import java.io.Serial;
import java.io.Serializable;
@Data
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlAction.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlAction.java
index a9a9ce4..a1dac35 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlAction.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlAction.java
@@ -1,10 +1,12 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@Data
@XStreamAlias("wpml:action")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlAction {
@XStreamAlias("wpml:actionId")
@@ -16,4 +18,5 @@
@XStreamAlias("wpml:actionActuatorFuncParam")
private KmlActionActuatorFuncParam actionActuatorFuncParam;
+
}
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionActuatorFuncParam.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionActuatorFuncParam.java
index 27d8800..f8c1358 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionActuatorFuncParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionActuatorFuncParam.java
@@ -1,10 +1,12 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@Data
@XStreamAlias("wpml:actionActuatorFuncParam")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlActionActuatorFuncParam {
// takePhoto & startRecord & stopRecord
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionGroup.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionGroup.java
index 6cc4b21..489fb5b 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionGroup.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionGroup.java
@@ -1,5 +1,6 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@@ -7,6 +8,7 @@
@Data
@XStreamAlias("wpml:actionGroup")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlActionGroup {
@XStreamAlias("wpml:actionGroupId")
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionTrigger.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionTrigger.java
index 1a3a1e2..41598b5 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionTrigger.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlActionTrigger.java
@@ -1,10 +1,12 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@Data
@XStreamAlias("wpml:actionTrigger")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlActionTrigger {
@XStreamAlias("wpml:actionTriggerType")
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlDocument.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlDocument.java
index d4847e3..0293f1f 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlDocument.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlDocument.java
@@ -1,10 +1,12 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@Data
@XStreamAlias("Document")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlDocument {
@XStreamAlias("wpml:author")
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlDroneInfo.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlDroneInfo.java
index 28d11b9..f59e3b0 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlDroneInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlDroneInfo.java
@@ -1,10 +1,12 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@Data
@XStreamAlias("wpml:droneInfo")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlDroneInfo {
@XStreamAlias("wpml:droneEnumValue")
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlFolder.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlFolder.java
index 3cb2c64..926efe9 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlFolder.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlFolder.java
@@ -1,5 +1,6 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamImplicit;
import lombok.Data;
@@ -8,6 +9,7 @@
@Data
@XStreamAlias("Folder")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlFolder {
@XStreamAlias("wpml:templateType")
private String templateType;
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlGlobalWaypointHeadingParam.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlGlobalWaypointHeadingParam.java
index 14b1763..cd3cdd5 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlGlobalWaypointHeadingParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlGlobalWaypointHeadingParam.java
@@ -1,10 +1,12 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@Data
@XStreamAlias("wpml:globalWaypointHeadingParam")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlGlobalWaypointHeadingParam {
@XStreamAlias("wpml:waypointHeadingMode")
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlLineString.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlLineString.java
index 8bce6cc..b6d310c 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlLineString.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlLineString.java
@@ -1,10 +1,12 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@Data
@XStreamAlias("LineString")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlLineString {
@XStreamAlias("coordinates")
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlLinearRing.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlLinearRing.java
index 0456837..a729bf8 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlLinearRing.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlLinearRing.java
@@ -1,10 +1,12 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@Data
@XStreamAlias("LinearRing")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlLinearRing {
@XStreamAlias("coordinates")
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlMappingHeadingParam.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlMappingHeadingParam.java
index 2165646..a02fae2 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlMappingHeadingParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlMappingHeadingParam.java
@@ -14,5 +14,6 @@
@XStreamAlias("wpml:actionActuatorFunc")
private String actionActuatorFunc;
+
}
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlMissionConfig.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlMissionConfig.java
index 49a5592..507a158 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlMissionConfig.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlMissionConfig.java
@@ -1,10 +1,12 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@Data
@XStreamAlias("wpml:missionConfig")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlMissionConfig {
@XStreamAlias("wpml:flyToWaylineMode")
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOuterBoundaryIs.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOuterBoundaryIs.java
index 88e419f..1a8b796 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOuterBoundaryIs.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOuterBoundaryIs.java
@@ -1,10 +1,12 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@Data
@XStreamAlias("outerBoundaryIs")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlOuterBoundaryIs {
@XStreamAlias("LinearRing")
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOverlap.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOverlap.java
index b4d6eb9..8896dd0 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOverlap.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOverlap.java
@@ -1,34 +1,36 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@Data
@XStreamAlias("wpml:overlap")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlOverlap {
- @XStreamAlias("orthoLidarOverlapH")
+ @XStreamAlias("wpml:orthoLidarOverlapH")
private String orthoLidarOverlapH;
- @XStreamAlias("orthoLidarOverlapW")
+ @XStreamAlias("wpml:orthoLidarOverlapW")
private String orthoLidarOverlapW;
- @XStreamAlias("orthoCameraOverlapH")
+ @XStreamAlias("wpml:orthoCameraOverlapH")
private String orthoCameraOverlapH;
- @XStreamAlias("orthoCameraOverlapW")
+ @XStreamAlias("wpml:orthoCameraOverlapW")
private String orthoCameraOverlapW;
- @XStreamAlias("inclinedLidarOverlapH")
+ @XStreamAlias("wpml:inclinedLidarOverlapH")
private String inclinedLidarOverlapH;
- @XStreamAlias("inclinedLidarOverlapW")
+ @XStreamAlias("wpml:inclinedLidarOverlapW")
private String inclinedLidarOverlapW;
- @XStreamAlias("inclinedCameraOverlapH")
+ @XStreamAlias("wpml:inclinedCameraOverlapH")
private String inclinedCameraOverlapH;
- @XStreamAlias("inclinedCameraOverlapW")
+ @XStreamAlias("wpml:inclinedCameraOverlapW")
private String inclinedCameraOverlapW;
}
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlParams.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlParams.java
index fb78332..0bcfa3a 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlParams.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlParams.java
@@ -84,7 +84,6 @@
*/
private String imageFormat;
-
/**
* 建图航拍、倾斜摄影、航带飞行模板参数
*/
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPayloadInfo.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPayloadInfo.java
index 5dbff23..f6e074d 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPayloadInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPayloadInfo.java
@@ -1,10 +1,12 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@Data
@XStreamAlias("wpml:payloadInfo")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlPayloadInfo {
@XStreamAlias("wpml:payloadEnumValue")
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPayloadParam.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPayloadParam.java
index aa8a89f..37fa8d0 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPayloadParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPayloadParam.java
@@ -1,5 +1,6 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@@ -8,6 +9,7 @@
*/
@Data
@XStreamAlias("wpml:payloadParam")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlPayloadParam {
@XStreamAlias("wpml:payloadPositionIndex")
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPlacemark.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPlacemark.java
index 693dce1..73f9f2c 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPlacemark.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPlacemark.java
@@ -138,4 +138,5 @@
@XStreamAlias("LineString")
private KmlLineString lineString;
+
}
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPoint.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPoint.java
index 19aad87..87bbbdf 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPoint.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPoint.java
@@ -1,10 +1,12 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@Data
@XStreamAlias("Point")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlPoint {
@XStreamAlias("coordinates")
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPolygon.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPolygon.java
index 108db64..58f447f 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPolygon.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlPolygon.java
@@ -1,10 +1,12 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@Data
@XStreamAlias("Polygon")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlPolygon {
@XStreamAlias("outerBoundaryIs")
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWayLineCoordinateSysParam.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWayLineCoordinateSysParam.java
index bcbeac2..82f1325 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWayLineCoordinateSysParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWayLineCoordinateSysParam.java
@@ -1,5 +1,6 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@@ -8,6 +9,7 @@
*/
@Data
@XStreamAlias("wpml:waylineCoordinateSysParam")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlWayLineCoordinateSysParam {
@XStreamAlias("wpml:coordinateMode")
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointGimbalHeadingParam.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointGimbalHeadingParam.java
index a813e84..4ef14db 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointGimbalHeadingParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointGimbalHeadingParam.java
@@ -1,10 +1,12 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@Data
@XStreamAlias("wpml:waypointGimbalHeadingParam")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlWaypointGimbalHeadingParam {
@XStreamAlias("wpml:waypointGimbalPitchAngle")
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointHeadingParam.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointHeadingParam.java
index b93c244..caebba1 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointHeadingParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointHeadingParam.java
@@ -1,10 +1,12 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@Data
@XStreamAlias("wpml:waypointHeadingParam")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlWaypointHeadingParam {
@XStreamAlias("wpml:waypointHeadingMode")
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointTurnParam.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointTurnParam.java
index 79bceea..45614f6 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointTurnParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlWaypointTurnParam.java
@@ -1,10 +1,12 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@Data
@XStreamAlias("wpml:waypointTurnParam")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlWaypointTurnParam {
@XStreamAlias("wpml:waypointTurnMode")
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/RoutePointInfo.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/RoutePointInfo.java
index aa9cd7b..b3bd5ad 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/RoutePointInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/RoutePointInfo.java
@@ -61,19 +61,4 @@
*/
private Boolean isStartAndEndPoint = false;
- /**
- * 等时拍照间隔时间 单位s
- */
- private Double timeInterval;
-
- /**
- * 等距拍照间隔距离 单位m
- */
- private Double distanceInterval;
-
- /**
- * 停止间隔拍照航点编号
- */
- private Integer endIntervalRouteIndex;
-
}
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 c89d015..4d0faaa 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
@@ -153,8 +153,8 @@
return 0;
}
ardRouteInfo.setPath(kmzResult.getPath());
+ ardRouteInfo.setPointCount(getPointCount(ardRouteInfo));
}
- ardRouteInfo.setPointCount(getPointCount(ardRouteInfo));
return ardRouteInfoMapper.updateArdRouteInfo(ardRouteInfo);
}
@@ -176,8 +176,12 @@
// 删除航线(kmz)文件
for (String id : ids) {
ArdRouteInfo information = ardRouteInfoMapper.selectArdRouteInfoById(id);
- ossService.deleteObject("kmz", subStringMinioUrlName(information.getPath()));
- ossDockService.deleteObject("kmz", subStringMinioUrlName(information.getPath1()));
+ if (information.getPath() != null){
+ ossService.deleteObject("kmz", subStringMinioUrlName(information.getPath()));
+ }
+ if (information.getPath1() != null){
+ ossDockService.deleteObject("kmz", subStringMinioUrlName(information.getPath1()));
+ }
}
return ardRouteInfoMapper.deleteArdRouteInfoByIds(ids);
}
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 2aa60eb..3573eeb 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
@@ -36,12 +36,13 @@
*/
public static KmlInfo parseKml(InputStream inputStream) {
XStream xStream = new XStream();
- xStream.allowTypes(new Class[]{KmlInfo.class, KmlAction.class, KmlWayLineCoordinateSysParam.class, KmlPoint.class});
+ xStream.allowTypes(new Class[]{KmlInfo.class, KmlAction.class, KmlWayLineCoordinateSysParam.class, KmlPoint.class, KmlActionGroup.class});
xStream.alias("kml", KmlInfo.class);
xStream.processAnnotations(KmlInfo.class);
xStream.autodetectAnnotations(true);
xStream.ignoreUnknownElements();
xStream.addImplicitCollection(KmlActionGroup.class, "action");
+ xStream.addImplicitCollection(KmlPlacemark.class, "actionGroup");
return (KmlInfo) xStream.fromXML(inputStream);
}
diff --git a/ard-route/src/main/java/com/ard/route/util/ToolUtils.java b/ard-route/src/main/java/com/ard/route/util/ToolUtils.java
index d392f34..74d2202 100644
--- a/ard-route/src/main/java/com/ard/route/util/ToolUtils.java
+++ b/ard-route/src/main/java/com/ard/route/util/ToolUtils.java
@@ -125,4 +125,15 @@
return Integer.valueOf(parts[1]);
}
+ public static Double getDoublePoint(String str,String type) {
+ String[] parts = str.split(",");
+ if ("lon".equals(type)) {
+ return Double.parseDouble(parts[0].trim());
+ }
+ if ("lat".equals(type)){
+ return Double.parseDouble(parts[1].trim());
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.3