From ba967da3b2d0d2f277113602e1d67ef848b7bb9a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 25 Nov 2025 14:33:52 +0800
Subject: [PATCH] 2025-11-25 zwy 增加rth_mode字段，默认为1；实体和DTO中增加@JsonInclude(JsonInclude.Include.NON_NULL)序列化时忽略所有 null 字段
---
ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskFileDTO.java | 3 +++
ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskCreateDTO.java | 16 ++++++++++++++--
ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineJobDTO.java | 2 ++
ard-sample/src/main/java/com/ard/sample/wayline/model/entity/WaylineJobEntity.java | 3 +++
ard-sample/src/main/java/com/ard/sample/wayline/model/param/CreateJobParam.java | 2 ++
5 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineJobDTO.java b/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineJobDTO.java
index 18eaa9a..4fa6365 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineJobDTO.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineJobDTO.java
@@ -52,6 +52,8 @@
private Integer rthAltitude;
+ private Integer rthMode;
+
private Integer outOfControlAction;
private Integer mediaCount;
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskCreateDTO.java b/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskCreateDTO.java
index a5a4f19..a4a0835 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskCreateDTO.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskCreateDTO.java
@@ -1,5 +1,6 @@
package com.ard.sample.wayline.model.dto;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -11,6 +12,8 @@
* @version 1.1
* @date 2022/6/1
*/
+// 序列化时忽略所有 null 字段
+@JsonInclude(JsonInclude.Include.NON_NULL)
@Data
@Builder
@AllArgsConstructor
@@ -61,12 +64,21 @@
private Integer rthAltitude;
/**
+ * 返航高度模式 "0":"智能高度","1":"设定高度"
+ * 智能返航模式下，飞行器将自动规划最佳返航高度。大疆机场当前不支持设置返航高度模式，
+ * 只能选择'设定高度'模式。当环境，光线不满足视觉系统要求时（譬如傍晚阳光直射、夜间弱光无光），
+ * 飞行器将使用您设定的返航高度进行直线返航
+ * */
+ @JsonProperty("rth_mode")
+ private Integer rthMode;
+
+ /**
* 遥控器失控动作 "0":"返航","1":"悬停","2":"降落"
* 失控动作，当前固定传的值是 0，即返航。注意该枚举值定义跟飞控跟机场定义的不一致，机场端会进行转换。
* */
@JsonProperty("out_of_control_action")
private Integer outOfControlAction;
- @JsonProperty("simulate_mission")
- private WaylineSimulateMissionDTO simulateMission;
+// @JsonProperty("simulate_mission")
+// private WaylineSimulateMissionDTO simulateMission;
}
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskFileDTO.java b/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskFileDTO.java
index a6cdc82..d8ce00a 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskFileDTO.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskFileDTO.java
@@ -1,5 +1,6 @@
package com.ard.sample.wayline.model.dto;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -11,6 +12,8 @@
* @version 1.1
* @date 2022/6/1
*/
+// 序列化时忽略所有 null 字段
+@JsonInclude(JsonInclude.Include.NON_NULL)
@Data
@Builder
@AllArgsConstructor
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/model/entity/WaylineJobEntity.java b/ard-sample/src/main/java/com/ard/sample/wayline/model/entity/WaylineJobEntity.java
index 9cbc044..1da4355 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/model/entity/WaylineJobEntity.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/model/entity/WaylineJobEntity.java
@@ -68,6 +68,9 @@
@TableField("rth_altitude")
private Integer rthAltitude;
+ @TableField("rth_mode")
+ private Integer rthMode;
+
@TableField("out_of_control")
private Integer outOfControlAction;
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/model/param/CreateJobParam.java b/ard-sample/src/main/java/com/ard/sample/wayline/model/param/CreateJobParam.java
index a13fa75..242de76 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/model/param/CreateJobParam.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/model/param/CreateJobParam.java
@@ -42,6 +42,8 @@
@Range(max = 2)
private Integer outOfControlAction;
+ private Integer rth_mode;
+
private String parentId;
private Integer loopSum;
--
Gitblit v1.9.3