From 7e17d1e8efc82fee1c6f010a756acbdc6b29d771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 23 Jan 2026 17:22:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9E=9A=E4=B8=BE=E8=A7=A3?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/device/api/domain/AircraftVO.java | 3 ++- .../src/main/java/com/ruoyi/device/api/domain/DockVO.java | 6 ++++-- .../java/com/ruoyi/device/api/domain/DockWithGPSVO.java | 6 ++++-- .../main/java/com/ruoyi/device/api/domain/NetworkVO.java | 3 ++- .../java/com/ruoyi/device/api/domain/PayloadDetailVO.java | 3 ++- .../main/java/com/ruoyi/device/api/domain/PayloadVO.java | 6 ++++-- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AircraftVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AircraftVO.java index f43de7c..8006bcd 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AircraftVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AircraftVO.java @@ -46,7 +46,8 @@ public class AircraftVO implements Serializable { private String aircraftModel; /** 无人机状态 */ - @Schema(description = "无人机状态：POWER_ON_IN_CABIN-舱内开机, POWER_OFF_IN_CABIN-舱内关机, POWER_ON_OUT_CABIN-舱外开机, POWER_OFF_OUT_CABIN-舱外关机, IN_MISSION-任务中, DEBUGGING-调试, OFFLINE-离线") + @Schema(description = "无人机状态: POWER_ON_IN_CABIN-舱内开机, POWER_OFF_IN_CABIN-舱内关机, POWER_ON_OUT_CABIN-舱外开机, POWER_OFF_OUT_CABIN-舱外关机, IN_MISSION-任务中, DEBUGGING-调试, OFFLINE-离线", + allowableValues = {"POWER_ON_IN_CABIN", "POWER_OFF_IN_CABIN", "POWER_ON_OUT_CABIN", "POWER_OFF_OUT_CABIN", "IN_MISSION", "DEBUGGING", "OFFLINE"}) @Excel(name = "无人机状态") private String aircraftStatus; diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockVO.java index 977d038..df147f6 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockVO.java @@ -51,7 +51,8 @@ public class DockVO implements Serializable { private String dockModel; /** 机场状态 */ - @Schema(description = "机场状态：IDLE-空闲中, Debugging-调试, Upgrading-固件升级中, Working-作业中, UNKNOWN-待标定, OFFLINE-离线") + @Schema(description = "机场状态: IDLE-空闲中, Debugging-现场调试/远程调试, Upgrading-固件升级中, Working-作业中, UNKNOWN-待标定, OFFLINE-离线", + allowableValues = {"IDLE", "Debugging", "Upgrading", "Working", "UNKNOWN", "OFFLINE"}) @Excel(name = "机场状态") private String dockStatus; @@ -81,7 +82,8 @@ public class DockVO implements Serializable { private String aircraftModel; /** 无人机状态 */ - @Schema(description = "无人机状态：POWER_ON_IN_CABIN-舱内开机, POWER_OFF_IN_CABIN-舱内关机, POWER_ON_OUT_CABIN-舱外开机, POWER_OFF_OUT_CABIN-舱外关机, IN_MISSION-任务中, DEBUGGING-调试, OFFLINE-离线") + @Schema(description = "无人机状态: POWER_ON_IN_CABIN-舱内开机, POWER_OFF_IN_CABIN-舱内关机, POWER_ON_OUT_CABIN-舱外开机, POWER_OFF_OUT_CABIN-舱外关机, IN_MISSION-任务中, DEBUGGING-调试, OFFLINE-离线", + allowableValues = {"POWER_ON_IN_CABIN", "POWER_OFF_IN_CABIN", "POWER_ON_OUT_CABIN", "POWER_OFF_OUT_CABIN", "IN_MISSION", "DEBUGGING", "OFFLINE"}) @Excel(name = "无人机状态") private String aircraftStatus; diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java index e6b7143..aee5382 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java @@ -43,7 +43,8 @@ public class DockWithGPSVO implements Serializable { @Excel(name = "机场型号") private String dockModel; - @Schema(description = "机场状态：IDLE-空闲中, Debugging-调试, Upgrading-固件升级中, Working-作业中, UNKNOWN-待标定, OFFLINE-离线") + @Schema(description = "机场状态: IDLE-空闲中, Debugging-现场调试/远程调试, Upgrading-固件升级中, Working-作业中, UNKNOWN-待标定, OFFLINE-离线", + allowableValues = {"IDLE", "Debugging", "Upgrading", "Working", "UNKNOWN", "OFFLINE"}) @Excel(name = "机场状态") private String dockStatus; @@ -67,7 +68,8 @@ public class DockWithGPSVO implements Serializable { @Excel(name = "无人机型号") private String aircraftModel; - @Schema(description = "无人机状态：POWER_ON_IN_CABIN-舱内开机, POWER_OFF_IN_CABIN-舱内关机, POWER_ON_OUT_CABIN-舱外开机, POWER_OFF_OUT_CABIN-舱外关机, IN_MISSION-任务中, DEBUGGING-调试, OFFLINE-离线") + @Schema(description = "无人机状态: POWER_ON_IN_CABIN-舱内开机, POWER_OFF_IN_CABIN-舱内关机, POWER_ON_OUT_CABIN-舱外开机, POWER_OFF_OUT_CABIN-舱外关机, IN_MISSION-任务中, DEBUGGING-调试, OFFLINE-离线", + allowableValues = {"POWER_ON_IN_CABIN", "POWER_OFF_IN_CABIN", "POWER_ON_OUT_CABIN", "POWER_OFF_OUT_CABIN", "IN_MISSION", "DEBUGGING", "OFFLINE"}) @Excel(name = "无人机状态") private String aircraftStatus; diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/NetworkVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/NetworkVO.java index 0a3b702..f95ae09 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/NetworkVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/NetworkVO.java @@ -20,7 +20,8 @@ public class NetworkVO implements Serializable private static final long serialVersionUID = 1L; /** 网络类型 */ - @Schema(description = "网络类型") + @Schema(description = "网络类型: FOUR_G-4G, ETHERNET-以太网, WIRED-有线, FIVE_G-5G, TWO_POINT_FOUR_G-2.4G", + allowableValues = {"FOUR_G", "ETHERNET", "WIRED", "FIVE_G", "TWO_POINT_FOUR_G"}) @Excel(name = "网络类型") private String networkType; diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/PayloadDetailVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/PayloadDetailVO.java index 0c717c2..4b83a6a 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/PayloadDetailVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/PayloadDetailVO.java @@ -20,7 +20,8 @@ public class PayloadDetailVO implements Serializable private static final long serialVersionUID = 1L; /** 挂载类型 */ - @Schema(description = "挂载类型") + @Schema(description = "挂载类型: SPEAKER-喊话器, CAMERA-相机, OTHER-其他", + allowableValues = {"SPEAKER", "CAMERA", "OTHER"}) @Excel(name = "挂载类型") private String payloadType; diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/PayloadVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/PayloadVO.java index e407868..bc3a3fc 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/PayloadVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/PayloadVO.java @@ -30,12 +30,14 @@ public class PayloadVO implements Serializable private String payloadName; /** 挂载类型 */ - @Schema(description = "挂载类型") + @Schema(description = "挂载类型: SPEAKER-喊话器, CAMERA-相机, OTHER-其他", + allowableValues = {"SPEAKER", "CAMERA", "OTHER"}) @Excel(name = "挂载类型") private String payloadType; /** 挂载状态 */ - @Schema(description = "挂载状态：ONLINE-在线, OFFLINE-离线") + @Schema(description = "挂载状态: ONLINE-在线, OFFLINE-离线", + allowableValues = {"ONLINE", "OFFLINE"}) @Excel(name = "挂载状态") private String payloadStatus;