From 0491eaf38f41a2569fc00e803af563796d401d99 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Mon, 17 Nov 2025 12:18:38 +0800
Subject: [PATCH] 1.修改getRouteData,判断是否为空。
---
ard-route/src/main/java/com/ard/route/util/InitializationUtils.java | 86 +++++++++++++++++++++++++++++++++++++++++++
ard-route/src/main/java/com/ard/route/domain/sixhe/ArdRoutePoints.java | 12 ++++++
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 4 +
ard-route/src/main/java/com/ard/route/domain/sixhe/ArdRouteChange.java | 9 ++++
4 files changed, 110 insertions(+), 1 deletions(-)
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
index ae2dbb0..d5c0e87 100644
--- 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
@@ -9,12 +9,21 @@
**/
@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
index a395901..5f66794 100644
--- 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
@@ -6,17 +6,29 @@
@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/service/impl/ArdRouteInfoServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
index 207e10f..5e9122f 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
@@ -59,7 +59,9 @@
public ArdRouteInfo selectArdRouteInfoById(String id) {
ArdRouteInfo ardRouteInfo = ardRouteInfoMapper.selectArdRouteInfoById(id);
try {
- ardRouteInfo.setUavRouteReq((UavRouteReq) deserialize(ardRouteInfo.getRouteData()));
+ if (ardRouteInfo.getRouteData() != null){
+ ardRouteInfo.setUavRouteReq((UavRouteReq) deserialize(ardRouteInfo.getRouteData()));
+ }
} catch (IOException | ClassNotFoundException e) {
throw new RuntimeException(e);
}
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 187f75e..54807db 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,7 +1,12 @@
package com.ard.route.util;
import com.ard.route.domain.djuav.*;
+import com.ard.route.domain.sixhe.ArdRouteActions;
import com.ard.route.domain.sixhe.ArdRouteChange;
+import com.ard.route.domain.sixhe.ArdRoutePoints;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* 初始化数据
@@ -63,7 +68,88 @@
return uavRouteReq;
}
+ /**
+ * 初始化数据
+ */
private void initializationSixHe(){
ArdRouteChange ardRouteChange = new ArdRouteChange();
+ ardRouteChange.setAutoSpeed(8);
+ ardRouteChange.setFinishedAction(1);
+ ardRouteChange.setHomeHeight(50);
+ //ardRouteChange.setInterests(0);
+ ardRouteChange.setIsSaveEnergyMode(0);
+ ardRouteChange.setLoseAction(0);
+ ardRouteChange.setMaxSpeed(15);
+
+ List<ArdRoutePoints> points = new ArrayList<>();
+ ArdRoutePoints ardRoutePoints0 = new ArdRoutePoints();
+ ardRoutePoints0.setDampingDistance(0);
+ ardRoutePoints0.setFlightPathMode(1);
+ ardRoutePoints0.setGroupIndex(0);
+ ardRoutePoints0.setHeading(0);
+ ardRoutePoints0.setHeadingMode(0);
+ ardRoutePoints0.setHeight(50);
+ ardRoutePoints0.setInterestIndex(0);
+ ardRoutePoints0.setLat(31.11339916);
+ ardRoutePoints0.setLon(103.75851462);
+ ardRoutePoints0.setSafeGohomeFlag(0);
+ ardRoutePoints0.setSpeed(8);
+ List<ArdRouteActions> actions = new ArrayList<>();
+ ArdRouteActions ardRouteActions0 = new ArdRouteActions();
+ ardRouteActions0.setParam(10);
+ ardRouteActions0.setSpeakInfo("");
+ ardRouteActions0.setType(1);
+ ardRouteActions0.setWaitTime(2);
+ ArdRouteActions ardRouteActions1 = new ArdRouteActions();
+ ardRouteActions1.setParam(10);
+ ardRouteActions1.setSpeakInfo("");
+ ardRouteActions1.setType(1);
+ ardRouteActions1.setWaitTime(2);
+ ArdRouteActions ardRouteActions2 = new ArdRouteActions();
+ ardRouteActions2.setParam(10);
+ ardRouteActions2.setSpeakInfo("");
+ ardRouteActions2.setType(1);
+ ardRouteActions2.setWaitTime(2);
+ actions.add(ardRouteActions0);
+ actions.add(ardRouteActions1);
+ actions.add(ardRouteActions2);
+ points.add(ardRoutePoints0);
+
+ ardRouteChange.setPoints(points);
}
+
+// private ArdRoutePoints buildArdRoutePoints(){
+// ArdRoutePoints ardRoutePoints1 = new ArdRoutePoints();
+// ardRoutePoints1.setDampingDistance(0);
+// ardRoutePoints1.setFlightPathMode(1);
+// ardRoutePoints1.setGroupIndex(0);
+// ardRoutePoints1.setHeading(0);
+// ardRoutePoints1.setHeadingMode(0);
+// ardRoutePoints1.setHeight(50);
+// ardRoutePoints1.setInterestIndex(0);
+// ardRoutePoints1.setLat(31.11339916);
+// ardRoutePoints1.setLon(103.75851462);
+// ardRoutePoints1.setSafeGohomeFlag(0);
+// ardRoutePoints1.setSpeed(8);
+//
+//
+// }
+
+// private ArdRouteActions buildArdRouteActions(){
+// ArdRouteActions ardRouteActions0 = new ArdRouteActions();
+// ardRouteActions0.setParam(10);
+// ardRouteActions0.setSpeakInfo("");
+// ardRouteActions0.setType(1);
+// ardRouteActions0.setWaitTime(2);
+// ArdRouteActions ardRouteActions1 = new ArdRouteActions();
+// ardRouteActions1.setParam(10);
+// ardRouteActions1.setSpeakInfo("");
+// ardRouteActions1.setType(1);
+// ardRouteActions1.setWaitTime(2);
+// ArdRouteActions ardRouteActions2 = new ArdRouteActions();
+// ardRouteActions2.setParam(10);
+// ardRouteActions2.setSpeakInfo("");
+// ardRouteActions2.setType(1);
+// ardRouteActions2.setWaitTime(2);
+// }
}
--
Gitblit v1.9.3