From 527b5bd9e98e9b4a979ad0b8bb14907f6589659d Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 26 Nov 2025 16:48:47 +0800
Subject: [PATCH] 2025-11-26 zwy websocket发给前端代码调整

---
 ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskProgressExt.java      |   14 +++++++
 ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskProgress.java         |    3 +
 ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskProgressReceiver.java |    4 ++
 ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineBreakPoint.java           |   41 ++++++++++++++++++++
 4 files changed, 62 insertions(+), 0 deletions(-)

diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineBreakPoint.java b/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineBreakPoint.java
new file mode 100644
index 0000000..0d706d3
--- /dev/null
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineBreakPoint.java
@@ -0,0 +1,41 @@
+package com.ard.sample.wayline.model.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class WaylineBreakPoint {
+
+    @JsonProperty("index")
+    private Integer index;
+
+    @JsonProperty("state")
+    private Integer state;
+
+    @JsonProperty("progress")
+    private float progress;
+
+    @JsonProperty("wayline_id")
+    private Integer wayline_id;
+
+    @JsonProperty("break_reason")
+    private Integer break_reason;
+
+    @JsonProperty("latitude")
+    private float latitude;
+
+    @JsonProperty("longitude")
+    private float longitude;
+
+    @JsonProperty("height")
+    private float height;
+
+    @JsonProperty("attitude_pitch")
+    private float attitude_pitch;
+
+    @JsonProperty("attitude_roll")
+    private float attitude_roll;
+
+    @JsonProperty("attitude_head")
+    private float attitude_head;
+}
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskProgress.java b/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskProgress.java
index 75c7976..b3c052a 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskProgress.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskProgress.java
@@ -1,5 +1,6 @@
 package com.ard.sample.wayline.model.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 /**
@@ -10,7 +11,9 @@
 @Data
 public class WaylineTaskProgress {
 
+    @JsonProperty("current_step")
     private Integer currentStep;
 
+    @JsonProperty("percent")
     private Integer percent;
 }
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskProgressExt.java b/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskProgressExt.java
index 9f3670d..a404ef2 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskProgressExt.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskProgressExt.java
@@ -1,5 +1,6 @@
 package com.ard.sample.wayline.model.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 /**
@@ -10,11 +11,24 @@
 @Data
 public class WaylineTaskProgressExt {
 
+    @JsonProperty("current_waypoint_index")
     private Integer currentWaypointIndex;
 
+    @JsonProperty("wayline_mission_state")
+    private Integer waylineMissionState;
+
+    @JsonProperty("media_count")
     private Integer mediaCount;
 
+    @JsonProperty("flight_id")
     private String flightId;
 
+    @JsonProperty("track_id")
     private String trackId;
+
+    @JsonProperty("break_point")
+    private WaylineBreakPoint breakPoint;
+
+    @JsonProperty("wayline_id")
+    private Integer wayline_id;
 }
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskProgressReceiver.java b/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskProgressReceiver.java
index ae3fd5a..5ca6406 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskProgressReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineTaskProgressReceiver.java
@@ -1,5 +1,6 @@
 package com.ard.sample.wayline.model.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 /**
@@ -10,10 +11,13 @@
 @Data
 public class WaylineTaskProgressReceiver {
 
+    @JsonProperty("ext")
     private WaylineTaskProgressExt ext;
 
+    @JsonProperty("progress")
     private WaylineTaskProgress progress;
 
+    @JsonProperty("status")
     private String status;
 
 }

--
Gitblit v1.9.3