From be244e45191586a53c65b8bff01362db954fd683 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Tue, 02 Jul 2024 19:07:24 +0800
Subject: [PATCH] 航线飞行
---
src/main/java/com/dji/sample/wayline/model/param/CreateJobParam.java | 3 +++
src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskCreateDTO.java | 2 ++
src/main/java/com/dji/sample/wayline/service/impl/IWayLineTaskServiceImpl.java | 1 +
src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java | 1 +
src/main/java/com/dji/sample/wayline/model/dto/WaylineJobDTO.java | 1 +
5 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/model/dto/WaylineJobDTO.java b/src/main/java/com/dji/sample/wayline/model/dto/WaylineJobDTO.java
index 9044fba..e2810fa 100644
--- a/src/main/java/com/dji/sample/wayline/model/dto/WaylineJobDTO.java
+++ b/src/main/java/com/dji/sample/wayline/model/dto/WaylineJobDTO.java
@@ -56,6 +56,7 @@
private Integer code;
private Integer rthAltitude;
+ private Integer rthMode;
private Integer outOfControlAction;
diff --git a/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskCreateDTO.java b/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskCreateDTO.java
index 7f2e332..ab04dea 100644
--- a/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskCreateDTO.java
+++ b/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskCreateDTO.java
@@ -30,6 +30,8 @@
private Integer rthAltitude;
+ private Integer rthMode;
+
private Integer outOfControlAction;
private WaylineTaskReadyConditionDTO readyConditions;
diff --git a/src/main/java/com/dji/sample/wayline/model/param/CreateJobParam.java b/src/main/java/com/dji/sample/wayline/model/param/CreateJobParam.java
index b59ead0..6a64943 100644
--- a/src/main/java/com/dji/sample/wayline/model/param/CreateJobParam.java
+++ b/src/main/java/com/dji/sample/wayline/model/param/CreateJobParam.java
@@ -38,6 +38,9 @@
private Integer rthAltitude;
@NotNull
+ private Integer rthMode;
+
+ @NotNull
@Range(max = 2)
private Integer outOfControlAction;
diff --git a/src/main/java/com/dji/sample/wayline/service/impl/IWayLineTaskServiceImpl.java b/src/main/java/com/dji/sample/wayline/service/impl/IWayLineTaskServiceImpl.java
index 4c6df84..e5b50af 100644
--- a/src/main/java/com/dji/sample/wayline/service/impl/IWayLineTaskServiceImpl.java
+++ b/src/main/java/com/dji/sample/wayline/service/impl/IWayLineTaskServiceImpl.java
@@ -66,6 +66,7 @@
.taskType(param.getTaskType())
.waylineType(param.getWaylineType())
.rthAltitude(param.getRthAltitude())
+ .rthMode(param.getRthMode())
.outOfControlAction(param.getOutOfControlAction()).build();
}
diff --git a/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java b/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
index 91cf612..56d741d 100644
--- a/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
+++ b/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -367,6 +367,7 @@
.taskType(waylineJob.getTaskType())
.waylineType(waylineJob.getWaylineType())
.rthAltitude(waylineJob.getRthAltitude())
+ .rthMode(waylineJob.getRthMode())
.outOfControlAction(waylineJob.getOutOfControlAction())
.file(WaylineTaskFileDTO.builder()
.url(MinioUrlUtils.getUrl(url))
--
Gitblit v1.9.3