From dcb19bc57178e4fe2d289f0547f3ac8f2332ebc9 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 03 Nov 2025 11:11:21 +0800
Subject: [PATCH] 2025-11-3 zwy 整理代码，增加JsonProperty注解，与JSON字段对应并加注释
---
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/BatteryStateReceiver.java | 27 +++++++++++++++++++++++++++
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/BatteryReceiver.java | 15 +++++++++++++++
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DistanceLimitStatusReceiver.java | 7 +++++++
3 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/BatteryReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/BatteryReceiver.java
index 115666f..7c7e07e 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/BatteryReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/BatteryReceiver.java
@@ -16,18 +16,33 @@
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
public class BatteryReceiver {
// zwy 2025-10-14 修改增加注解对应json字段
+ /**
+ * 电池详细信息 array {"size": -, "item_type": struct}
+ * */
@JsonProperty("batteries")
private List<BatteryStateReceiver> batteries;
+ /**
+ * 电池的总剩余电量 int {"max":100,"min":0}
+ * */
@JsonProperty("capacity_percent")
private Integer capacityPercent;
+ /**
+ * 强制降落电量百分比 int {"max":100,"min":0}
+ * */
@JsonProperty("landing_power")
private Integer landingPower;
+ /**
+ * 剩余飞行时间 int {"unit_name":"秒 / s"}
+ * */
@JsonProperty("remain_flight_time")
private Integer remainFlightTime;
+ /**
+ * 返航所需电量百分比 int {"max":100,"min":0}
+ * */
@JsonProperty("return_home_power")
private Integer returnHomePower;
}
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/BatteryStateReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/BatteryStateReceiver.java
index c31c9f0..eae269a 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/BatteryStateReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/BatteryStateReceiver.java
@@ -16,30 +16,57 @@
//zwy 2025-10-14 修改增加注解对应json字段
+ /**
+ * 固件版本 text
+ * */
@JsonProperty("firmware_version")
private String firmwareVersion;
+ /**
+ * 电池序号 int {"min":"0"}
+ * */
@JsonProperty("index")
private Integer index;
+ /**
+ * 电池循环次数 int
+ * */
@JsonProperty("loop_times")
private Integer loopTimes;
+ /**
+ * 电池剩余电量 int {"max":100,"min":0}
+ * */
@JsonProperty("capacity_percent")
private Integer capacityPercent;
+ /**
+ * 电池序列号（SN） text
+ * */
@JsonProperty("sn")
private String sn;
+ /**
+ * 电池子类型 enum_int {}
+ * */
@JsonProperty("sub_type")
private Integer subType;
+ /**
+ * 温度 float {"unit_name":"摄氏度 / °C"}
+ * */
@JsonProperty("temperature")
private Float temperature;
+ /**
+ * 电池类型 enum_int {}
+ * */
@JsonProperty("type")
private Integer type;
+ /**
+ * 电压 int {"unit_name":"毫伏 / mV"}
+ * */
@JsonProperty("voltage")
private Integer voltage;
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DistanceLimitStatusReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DistanceLimitStatusReceiver.java
index 602e1f5..e9495e6 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DistanceLimitStatusReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DistanceLimitStatusReceiver.java
@@ -11,6 +11,7 @@
import java.util.Objects;
/**
+ * 飞行器限远状态
* The state of the drone's limited distance
* @author sean
* @version 1.3
@@ -22,9 +23,15 @@
@NoArgsConstructor
public class DistanceLimitStatusReceiver extends BasicDeviceProperty {
+ /**
+ * 是否开启限远 enum_int {"0":"未设置","1":"已设置"}
+ * */
@JsonProperty("state")
private Integer state;
+ /**
+ * 限远距离 int {"max":"8000","min":"15","step":"1","unit_name":"米 / m"}
+ * */
@JsonProperty("distance_limit")
private Integer distanceLimit;
--
Gitblit v1.9.3