From 57d1dc78f42bfa13406748ff72fe2ddfcc997ab8 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 14 Oct 2025 18:30:46 +0800
Subject: [PATCH] 2025-10-14 修改增加注解对应json字段
---
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/OsdPayloadReceiver.java | 12 +
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DroneBatteryMaintenanceInfoReceiver.java | 10 +
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/PositionStateReceiver.java | 33 ++++
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/OsdDockReceiver.java | 175 +++++++++++++++++++++++++
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/BatteryReceiver.java | 8 +
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/ObstacleAvoidanceReceiver.java | 4
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DroneChargeStateReceiver.java | 11 +
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/StorageReceiver.java | 9 +
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/NetworkStateReceiver.java | 21 ++
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/AlternateLandPointReceiver.java | 19 ++
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/OsdSubDeviceReceiver.java | 31 ++++
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/BatteryStateReceiver.java | 12 +
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DockWirelessLinkReceiver.java | 36 +++++
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DeviceMaintainStatusReceiver.java | 6
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DistanceLimitStatusReceiver.java | 3
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DockMediaFileDetailReceiver.java | 7
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DockSubDeviceReceiver.java | 18 ++
17 files changed, 408 insertions(+), 7 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/AlternateLandPointReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/AlternateLandPointReceiver.java
index 1c288c8..b7a90f9 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/AlternateLandPointReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/AlternateLandPointReceiver.java
@@ -1,5 +1,6 @@
package com.ard.sample.manage.model.receiver;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
/**
@@ -9,12 +10,28 @@
*/
@Data
public class AlternateLandPointReceiver {
-
+ //zwy 2025-10-14 修改增加注解对应json字段
+ /**
+ * 纬度 float {}
+ * */
+ @JsonProperty("latitude")
private Double latitude;
+ /**
+ * 经度 float {}
+ * */
+ @JsonProperty("longitude")
private Double longitude;
+ /**
+ * 安全高度(备降转移高) float {}
+ * */
+ @JsonProperty("safe_land_height")
private Double safeLandHeight;
+ /**
+ * 是否设置备降点 enum_int {"0":"未设置","1":"已设置"}
+ * */
+ @JsonProperty("is_configured")
private Integer isConfigured;
}
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 768fb7f..115666f 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
@@ -1,5 +1,6 @@
package com.ard.sample.manage.model.receiver;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import lombok.Data;
@@ -14,14 +15,19 @@
@Data
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
public class BatteryReceiver {
-
+ // zwy 2025-10-14 修改增加注解对应json字段
+ @JsonProperty("batteries")
private List<BatteryStateReceiver> batteries;
+ @JsonProperty("capacity_percent")
private Integer capacityPercent;
+ @JsonProperty("landing_power")
private Integer landingPower;
+ @JsonProperty("remain_flight_time")
private Integer remainFlightTime;
+ @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 098b116..c31c9f0 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
@@ -1,5 +1,6 @@
package com.ard.sample.manage.model.receiver;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import lombok.Data;
@@ -13,22 +14,33 @@
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
public class BatteryStateReceiver {
+ //zwy 2025-10-14 修改增加注解对应json字段
+
+ @JsonProperty("firmware_version")
private String firmwareVersion;
+ @JsonProperty("index")
private Integer index;
+ @JsonProperty("loop_times")
private Integer loopTimes;
+ @JsonProperty("capacity_percent")
private Integer capacityPercent;
+ @JsonProperty("sn")
private String sn;
+ @JsonProperty("sub_type")
private Integer subType;
+ @JsonProperty("temperature")
private Float temperature;
+ @JsonProperty("type")
private Integer type;
+ @JsonProperty("voltage")
private Integer voltage;
}
\ No newline at end of file
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DeviceMaintainStatusReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DeviceMaintainStatusReceiver.java
index 2d954a4..812c600 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DeviceMaintainStatusReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DeviceMaintainStatusReceiver.java
@@ -1,10 +1,12 @@
package com.ard.sample.manage.model.receiver;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.util.List;
/**
+ * 保养信息
* @author sean
* @version 1.3
* @date 2022/11/3
@@ -12,5 +14,9 @@
@Data
public class DeviceMaintainStatusReceiver {
+ /**
+ * 保养信息数组 array {"size": -, "item_type": struct}
+ * */
+ @JsonProperty("maintain_status_array")
private List<MaintainStatusReceiver> maintainStatusArray;
}
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 012afdd..602e1f5 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
@@ -2,6 +2,7 @@
import com.ard.sample.manage.model.dto.BasicDeviceProperty;
import com.ard.sample.manage.model.enums.StateSwitchEnum;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -21,8 +22,10 @@
@NoArgsConstructor
public class DistanceLimitStatusReceiver extends BasicDeviceProperty {
+ @JsonProperty("state")
private Integer state;
+ @JsonProperty("distance_limit")
private Integer distanceLimit;
private static final int DISTANCE_MAX = 8000;
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DockMediaFileDetailReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DockMediaFileDetailReceiver.java
index 6050db5..cdf6614 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DockMediaFileDetailReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DockMediaFileDetailReceiver.java
@@ -1,5 +1,6 @@
package com.ard.sample.manage.model.receiver;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
/**
@@ -9,6 +10,10 @@
*/
@Data
public class DockMediaFileDetailReceiver {
-
+ //zwy 2025-10-14 修改注解json对应字段
+ /**
+ * 待上传数量 int
+ * */
+ @JsonProperty("remain_upload")
private Integer remainUpload;
}
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DockSubDeviceReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DockSubDeviceReceiver.java
index c4d1712..dd4c940 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DockSubDeviceReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DockSubDeviceReceiver.java
@@ -1,5 +1,6 @@
package com.ard.sample.manage.model.receiver;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
/**
@@ -10,11 +11,28 @@
@Data
public class DockSubDeviceReceiver {
+ //zwy 2025-10-14 增加注解对应json字段
+ /**
+ * 子设备序列号（SN） text
+ * */
+ @JsonProperty("device_sn")
private String deviceSn;
+ /**
+ * 机场停机坪上的飞行器开机状态 enum_int {"0":"关机","1":"开机"}
+ * */
+ @JsonProperty("device_online_status")
private Integer deviceOnlineStatus;
+ /**
+ * 机场停机坪上的飞行器是否与机场对频 enum_int {"0":"未对频","1":"已对频"}
+ * */
+ @JsonProperty("device_paired")
private Integer devicePaired;
+ /**
+ * "0-67-0"这样的数据
+ * */
+ @JsonProperty("device_model_key")
private String deviceModelKey;
}
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DockWirelessLinkReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DockWirelessLinkReceiver.java
index 817f1a3..a4baa70 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DockWirelessLinkReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DockWirelessLinkReceiver.java
@@ -11,28 +11,64 @@
@Data
public class DockWirelessLinkReceiver {
+ // zwy 2025-10-14 修改注解与json对应关系
+ /**
+ * 4G 频段 float
+ * */
@JsonProperty("4g_freq_band")
private Float fourGFreqBand;
+ /**
+ * 地端 4G 信号质量 int {"max":"5","min":"0","step":"1"}
+ * */
@JsonProperty("4g_gnd_quality")
private Integer fourGGndQuality;
+ /**
+ * 4G 链路连接状态 enum_int {"0":"未连接","1":"已连接"}
+ * */
@JsonProperty("4g_link_state")
private Integer fourGLinkState;
+ /**
+ * 总体 4G 信号质量 int {"max":"5","min":"0","step":"1"}
+ * */
@JsonProperty("4g_quality")
private Integer fourGQuality;
+ /**
+ * 天端 4G 信号质量 int {"max":"5","min":"0","step":"1"}
+ * */
@JsonProperty("4g_uav_quality")
private Integer fourGUavQuality;
+ /**
+ * 飞行器上 Dongle 数量 int
+ * */
+ @JsonProperty("dongle_number")
private Integer dongleNumber;
+ /**
+ * 机场的图传链路模式 enum_int {"0":"SDR 模式","1":"4G 融合模式"}
+ * */
+ @JsonProperty("link_workmode")
private Integer linkWorkmode;
+ /**
+ * SDR 频段 float
+ * */
+ @JsonProperty("sdr_freq_band")
private Float sdrFreqBand;
+ /**
+ * SDR 链路连接状态 enum_int {"0":"未连接","1":"已连接"}
+ * */
+ @JsonProperty("sdr_link_state")
private Integer sdrLinkState;
+ /**
+ * SDR 信号质量 int {"max":"5","min":"0","step":"1"}
+ * */
+ @JsonProperty("sdr_quality")
private Integer sdrQuality;
}
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DroneBatteryMaintenanceInfoReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DroneBatteryMaintenanceInfoReceiver.java
index e54058f..433c4a3 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DroneBatteryMaintenanceInfoReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DroneBatteryMaintenanceInfoReceiver.java
@@ -1,8 +1,10 @@
package com.ard.sample.manage.model.receiver;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
/**
+ * 飞行器电池保养信息
* @author sean
* @version 1.4
* @date 2022/11/3
@@ -10,7 +12,15 @@
@Data
public class DroneBatteryMaintenanceInfoReceiver {
+ /**
+ * 保养状态 enum_int {"0":"无需保养","1":"待保养","2":"正在保养"}
+ * */
+ @JsonProperty("maintenance_state")
private Integer maintenanceState;
+ /**
+ * 电池保养剩余时间 int {"unit_name":"小时 / h"}
+ * */
+ @JsonProperty("maintenance_time_left")
private Long maintenanceTimeLeft;
}
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DroneChargeStateReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DroneChargeStateReceiver.java
index 1a5efd2..7121fc6 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DroneChargeStateReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DroneChargeStateReceiver.java
@@ -1,5 +1,6 @@
package com.ard.sample.manage.model.receiver;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
/**
@@ -9,8 +10,16 @@
*/
@Data
public class DroneChargeStateReceiver {
-
+ // zwy 2025-10-14 修改增加注解对应json字段
+ /**
+ * 充电状态 enum_int {"0":"空闲","1":"充电中"}
+ * */
+ @JsonProperty("state")
private Integer state;
+ /**
+ * 电量百分比 int {"max":"100","min":"0"}
+ * */
+ @JsonProperty("capacity_percent")
private Integer capacityPercent;
}
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/NetworkStateReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/NetworkStateReceiver.java
index 3d1e034..edd1b6f 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/NetworkStateReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/NetworkStateReceiver.java
@@ -1,5 +1,6 @@
package com.ard.sample.manage.model.receiver;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
/**
@@ -9,10 +10,28 @@
*/
@Data
public class NetworkStateReceiver {
-
+ //zwy 2025-10-14 修改增加注解对应json字段
+ /**
+ * 网络类型 enum_int {"1":"4G","2":"以太网"}
+ * */
+ @JsonProperty("type")
private Integer type;
+ /**
+ * 网络质量 enum_int
+ * "0":"无信号"
+ * "1":"差"
+ * "2":"较差"
+ * "3":"一般"
+ * "4":"较好"
+ * "5":"好"
+ * */
+ @JsonProperty("quality")
private Integer quality;
+ /**
+ * 网络速率 float {"unit_name":"千字节每秒 / KB/s"}
+ * */
+ @JsonProperty("rate")
private Float rate;
}
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/ObstacleAvoidanceReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/ObstacleAvoidanceReceiver.java
index 7438503..f955b93 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/ObstacleAvoidanceReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/ObstacleAvoidanceReceiver.java
@@ -2,6 +2,7 @@
import com.ard.sample.manage.model.dto.BasicDeviceProperty;
import com.ard.sample.manage.model.enums.StateSwitchEnum;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -16,10 +17,13 @@
@Data
public class ObstacleAvoidanceReceiver extends BasicDeviceProperty {
+ @JsonProperty("horizon")
private Integer horizon;
+ @JsonProperty("upside")
private Integer upside;
+ @JsonProperty("downside")
private Integer downside;
@Override
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/OsdDockReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/OsdDockReceiver.java
index 9720ac4..060d22d 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/OsdDockReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/OsdDockReceiver.java
@@ -1,5 +1,6 @@
package com.ard.sample.manage.model.receiver;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
/**
@@ -10,79 +11,253 @@
@Data
public class OsdDockReceiver {
+ /**
+ * 网络状态 struct
+ * */
+ @JsonProperty("network_state")
private NetworkStateReceiver networkState;
+ /**
+ * 飞行器是否在舱 enum_int {"0":"舱外","1":"舱内"}
+ * */
+ @JsonProperty("drone_in_dock")
private Integer droneInDock;
+ /**
+ * 飞行器充电状态 struct
+ * */
+ @JsonProperty("drone_charge_state")
private DroneChargeStateReceiver droneChargeState;
+ /**
+ * 降雨量 enum_int
+ * "0":"无雨"
+ * "1":"小雨"
+ * "2":"中雨"
+ * "3":"大雨"
+ * */
+ @JsonProperty("rainfall")
private Integer rainfall;
+ /**
+ * 风速 float {"unit_name":"米每秒 / m/s"}
+ * */
+ @JsonProperty("wind_speed")
private Float windSpeed;
+ /**
+ * 环境温度 float {"unit_name":"摄氏度 / °C"}
+ * */
+ @JsonProperty("environment_temperature")
private Float environmentTemperature;
+ /**
+ * 舱内温度 float {"unit_name":"摄氏度 / °C"}
+ * */
+ @JsonProperty("temperature")
private Float temperature;
+ /**
+ * 舱内湿度 float {"unit_name":"相对湿度 / %RH"}
+ * */
+ @JsonProperty("humidity")
private Integer humidity;
+ /**
+ * 纬度 double {"max":"90","min":"-90","step":"0.01"}
+ * */
+ @JsonProperty("latitude")
private Double latitude;
+ /**
+ * 经度 double {"max":"180","min":"-180","step":"0.01"}
+ * */
+ @JsonProperty("longitude")
private Double longitude;
+ /**
+ * 椭球高度 double {"unit_name":"米 / m"}
+ * */
+ @JsonProperty("height")
private Double height;
+ /**
+ * 备降点 struct
+ * */
+ @JsonProperty("alternate_land_point")
private AlternateLandPointReceiver alternateLandPoint;
+ /**
+ * 首次上电时间 int {"unit_name":"毫秒 / ms"}
+ * */
+ @JsonProperty("first_power_on")
private Long firstPowerOn;
+ /**
+ * 搜星状态 struct
+ * */
+ @JsonProperty("position_state")
private PositionStateReceiver positionState;
+ /**
+ * 存储容量 struct
+ * */
+ @JsonProperty("storage")
private StorageReceiver storage;
+ /**
+ * 机场状态 enum_int
+ * "0":"空闲中",
+ * "1":"现场调试",
+ * "2":"远程调试",
+ * "3":"固件升级中",
+ * "4":"作业中",
+ * "5":"待标定"
+ * */
+ @JsonProperty("mode_code")
private Integer modeCode;
+ /**
+ * 舱盖状态 enum_int
+ * "0":"关闭",
+ * "1":"打开",
+ * "2":"半开",
+ * "3":"舱盖状态异常"
+ * */
+ @JsonProperty("cover_state")
private Integer coverState;
+ /**
+ * 补光灯状态 enum_int {"0":"关闭","1":"打开"}
+ * */
+ @JsonProperty("supplement_light_state")
private Integer supplementLightState;
+ /**
+ * 紧急停止按钮状态 enum_int {"0":"关闭","1":"开启"}
+ * */
+ @JsonProperty("emergency_stop_state")
private Integer emergencyStopState;
+ /**
+ * 空调模式 上云文档中没有注释
+ * */
+ @JsonProperty("air_conditioner_mode")
private Integer airConditionerMode;
+ /**
+ * 电池运行模式 enum_int {"1":"计划模式","2":"待命模式"}
+ * */
+ @JsonProperty("battery_store_mode")
private Integer batteryStoreMode;
+ /**
+ * 机场声光报警状态 enum_int {"0":"关闭","1":"开启"}
+ * */
+ @JsonProperty("alarm_state")
private Integer alarmState;
+ /**
+ * 推杆状态 enum_int {"0":"关闭","1":"打开","2":"半开","3":"推杆状态异常"}
+ * */
+ @JsonProperty("putter_state")
private Integer putterState;
+ /**
+ * 子设备状态 struct
+ * */
+ @JsonProperty("sub_device")
private DockSubDeviceReceiver subDevice;
+ /**
+ * 机场累计作业次数 int {"unit_name":"次 / count"}
+ * */
+ @JsonProperty("job_number")
private Integer jobNumber;
+ /**
+ * 机场累计运行时长 int {"unit_name":"秒 / s"}
+ * */
+ @JsonProperty("acc_time")
private Long accTime;
+ /**
+ * 机场激活时间(unix 时间戳) int {"unit_name":"秒 / s"}
+ * */
+ @JsonProperty("activation_time")
private Long activationTime;
+ /**
+ * 保养信息 struct
+ * */
+ @JsonProperty("maintain_status")
private DeviceMaintainStatusReceiver maintainStatus;
+ /**
+ * 市电电压 int {"unit_name":"伏特 / V"}
+ * */
+ @JsonProperty("electric_supply_voltage")
private Integer electricSupplyVoltage;
+ /**
+ * 工作电压 int {"unit_name":"毫伏 / mV"}
+ * */
+ @JsonProperty("working_voltage")
private Integer workingVoltage;
+ /**
+ * 工作电流 float {"unit_name":"毫安 / mA"}
+ * */
+ @JsonProperty("working_current")
private Integer workingCurrent;
+ /**
+ * 机场备用电池信息 struct
+ * */
+ @JsonProperty("backup_battery")
private BackupBatteryReceiver backupBattery;
+ /**
+ * 飞行器电池保养信息 struct
+ * */
+ @JsonProperty("drone_battery_maintenance_info")
private DroneBatteryMaintenanceInfoReceiver droneBatteryMaintenanceInfo;
+ /**
+ * 机场任务状态 enum_int
+ * "0":"作业准备中",
+ * "1":"飞行作业中",
+ * "2":"作业后状态恢复",
+ * "3":"自定义飞行区更新中",
+ * "4":"地形障碍物更新中",
+ * "5":"任务空闲",
+ * "255":"飞行器异常",
+ * "256":"未知状态"
+ * */
+ @JsonProperty("flighttask_step_code")
private Integer flighttaskStepCode;
+ /**
+ * 飞行任务准备容量 上云文档中没有
+ * */
+ @JsonProperty("flighttask_prepare_capacity")
private Integer flighttaskPrepareCapacity;
+ /**
+ * 媒体文件上传细节 struct
+ * */
+ @JsonProperty("media_file_detail")
private DockMediaFileDetailReceiver mediaFileDetail;
+ /**
+ *
+ * */
+ @JsonProperty("sdr")
private DockSdrReceiver sdr;
+ /**
+ * 图传链路 struct
+ * */
+ @JsonProperty("wireless_link")
private DockWirelessLinkReceiver wirelessLink;
}
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/OsdPayloadReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/OsdPayloadReceiver.java
index f3f838b..5f694d0 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/OsdPayloadReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/OsdPayloadReceiver.java
@@ -1,5 +1,6 @@
package com.ard.sample.manage.model.receiver;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
/**
@@ -10,6 +11,11 @@
@Data
public class OsdPayloadReceiver {
+ // zwy 2025-10-14 修改增加注解对应json字段
+ /**
+ * 负载编号 text
+ * */
+ @JsonProperty("payload_index")
private String payloadIndex;
private Double gimbalPitch;
@@ -18,16 +24,22 @@
private Double gimbalYaw;
+ @JsonProperty("measure_target_altitude")
private Double measureTargetAltitude;
+ @JsonProperty("measure_target_distance")
private Double measureTargetDistance;
+ @JsonProperty("measure_target_latitude")
private Double measureTargetLatitude;
+ @JsonProperty("measure_target_longitude")
private Double measureTargetLongitude;
+ @JsonProperty("measure_target_error_state")
private Integer measureTargetErrorState;
+ @JsonProperty("version")
private Integer version;
}
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/OsdSubDeviceReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/OsdSubDeviceReceiver.java
index 45ccf3b..df78e79 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/OsdSubDeviceReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/OsdSubDeviceReceiver.java
@@ -1,6 +1,7 @@
package com.ard.sample.manage.model.receiver;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import lombok.Data;
@@ -16,55 +17,83 @@
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
public class OsdSubDeviceReceiver {
-
+ // zwy 2025-10-14 修改增加注解对应json字段
+ @JsonProperty("attitude_head")
private Float attitudeHead;
+ @JsonProperty("attitude_pitch")
private Double attitudePitch;
+ @JsonProperty("attitude_roll")
private Double attitudeRoll;
+ @JsonProperty("elevation")
private Double elevation;
+ @JsonProperty("battery")
private BatteryReceiver battery;
+ @JsonProperty("firmware_version")
private String firmwareVersion;
+ @JsonProperty("gear")
private Integer gear;
+ @JsonProperty("height")
private Double height;
+ @JsonProperty("home_distance")
private Double homeDistance;
+ @JsonProperty("horizontal_speed")
private Float horizontalSpeed;
+ @JsonProperty("latitude")
private Double latitude;
+ @JsonProperty("longitude")
private Double longitude;
+ @JsonProperty("mode_code")
private Integer modeCode;
+ @JsonProperty("total_flight_distance")
private Double totalFlightDistance;
+ @JsonProperty("total_flight_time")
private Double totalFlightTime;
+ @JsonProperty("vertical_speed")
private Float verticalSpeed;
+ @JsonProperty("wind_direction")
private Double windDirection;
+ @JsonProperty("wind_speed")
private Float windSpeed;
+ /**
+ * 搜星状态 struct
+ * */
+ @JsonProperty("position_state")
private PositionStateReceiver positionState;
+ @JsonProperty("payloads")
private List<OsdPayloadReceiver> payloads;
+ @JsonProperty("storage")
private StorageReceiver storage;
+ @JsonProperty("night_lights_state")
private Integer nightLightsState;
+ @JsonProperty("height_limit")
private Integer heightLimit;
+ @JsonProperty("distance_limit_status")
private DistanceLimitStatusReceiver distanceLimitStatus;
+ @JsonProperty("obstacle_avoidance")
private ObstacleAvoidanceReceiver obstacleAvoidance;
}
\ No newline at end of file
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/PositionStateReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/PositionStateReceiver.java
index 8282b5f..8988e15 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/PositionStateReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/PositionStateReceiver.java
@@ -1,5 +1,6 @@
package com.ard.sample.manage.model.receiver;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import lombok.Data;
@@ -12,14 +13,44 @@
@Data
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
public class PositionStateReceiver {
-
+ // zwy 2025-10-14 修改增加注解对应json字段
+ /**
+ * 是否标定 enum_int {"0":"未标定","1":"已标定"}
+ * */
+ @JsonProperty("is_calibration")
private Integer isCalibration;
+ /**
+ * GPS 搜星数量 int
+ * */
+ @JsonProperty("gps_number")
private Integer gpsNumber;
+ /**
+ * 是否收敛 enum_int
+ * "0":"未开始",
+ * "1":"收敛中",
+ * "2":"收敛成功",
+ * "3":"收敛失败"
+ * */
+ @JsonProperty("is_fixed")
private Integer isFixed;
+ /**
+ * 搜星档位 enum_int
+ * "1":"1档",
+ * "2":"2档",
+ * "3":"3档",
+ * "4":"4档",
+ * "5":"5档",
+ * "10":"RTK fixed"
+ * */
+ @JsonProperty("quality")
private Integer quality;
+ /**
+ * RTK 搜星数量 int
+ * */
+ @JsonProperty("rtk_number")
private Integer rtkNumber;
}
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/StorageReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/StorageReceiver.java
index 699d5a2..9dc786f 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/StorageReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/StorageReceiver.java
@@ -1,5 +1,6 @@
package com.ard.sample.manage.model.receiver;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
/**
@@ -10,7 +11,15 @@
@Data
public class StorageReceiver {
+ /**
+ * 总容量 int {"unit_name":"千字节 / KB"}
+ * */
+ @JsonProperty("total")
private Long total;
+ /**
+ * 已使用容量 int {"unit_name":"千字节 / KB"}
+ * */
+ @JsonProperty("used")
private Long used;
}
--
Gitblit v1.9.3