From 9905d91ea2d5c316a2f946ba121a91e070ae059f Mon Sep 17 00:00:00 2001 From: gyb Date: Wed, 4 Mar 2026 13:49:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=97=A0=E4=BA=BA?= =?UTF-8?q?=E6=9C=BA=E7=B1=BB=E5=9E=8B=E8=B4=9F=E8=BD=BD=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/api/domain/AirTypeGeneralEnumVO.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AirTypeGeneralEnumVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AirTypeGeneralEnumVO.java index ad03dd0..bc20d9d 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AirTypeGeneralEnumVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AirTypeGeneralEnumVO.java @@ -3,6 +3,8 @@ package com.ruoyi.device.api.domain; import lombok.Data; import java.io.Serializable; +import java.util.List; +import java.util.Map; /** * 无人机类型通用枚举VO @@ -46,6 +48,18 @@ public class AirTypeGeneralEnumVO implements Serializable /** 是否生效:0-失效,1-生效 */ private Integer enabled; + /** 槽位数 */ + private Integer slotCount; + + /** 负载数量限制 */ + private Integer loadLimit; + + /** 配件限制数量 */ + private Integer accessoryLimit; + + /** 可用负载列表(按系列分组) */ + private Map> loadList; + /** * 生成类型编码(domain-type-subType) */ From 93129f495617d26d27a587500e8f515f9e6445c3 Mon Sep 17 00:00:00 2001 From: gyb Date: Wed, 4 Mar 2026 16:41:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=97=A0=E4=BA=BA?= =?UTF-8?q?=E6=9C=BA=E7=B1=BB=E5=9E=8B=E8=B4=9F=E8=BD=BD=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/api/domain/AirLoadTypeVO.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AirLoadTypeVO.java diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AirLoadTypeVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AirLoadTypeVO.java new file mode 100644 index 0000000..08887c2 --- /dev/null +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AirLoadTypeVO.java @@ -0,0 +1,28 @@ +package com.ruoyi.device.api.domain; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 无人机负载类型VO + * + * @author 拓恒 + * @date 2026-03-04 + */ +@Data +public class AirLoadTypeVO implements Serializable { + private static final long serialVersionUID = 1L; + + /** 负载名称 */ + private String loadName; + + /** 负载系列 */ + private String loadSeries; + + /** 负载分类:0-负载,1-配件 */ + private Integer loadCategory; + + /** 槽:1、2 或者-1(-1代表全部槽位可用) */ + private Integer slot; +}