From 2b1ac349e0b26c78c16a2db404ddb26319e6277c Mon Sep 17 00:00:00 2001 From: gyb Date: Mon, 2 Mar 2026 09:53:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E8=88=AA=E7=BA=BF?= =?UTF-8?q?=E9=99=90=E9=AB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/airline/api/domain/AirlineAreaVO.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineAreaVO.java b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineAreaVO.java index f9089d5..9e000e7 100644 --- a/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineAreaVO.java +++ b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineAreaVO.java @@ -61,6 +61,16 @@ public class AirlineAreaVO extends BaseEntity { */ private Double radius; + /** + * 最小高度 + */ + private Double minHeight; + + /** + * 最大高度 + */ + private Double maxHeight; + /** * 备注 */ @@ -93,6 +103,8 @@ public class AirlineAreaVO extends BaseEntity { .append("areaArea", getAreaArea()) .append("areaPerimeter", getAreaPerimeter()) .append("radius", getRadius()) + .append("minHeight", getMinHeight()) + .append("maxHeight", getMaxHeight()) .append("remark", getRemark()) .toString(); } From 8d6424f80022f44713f898c57f15a81164ebb0fe Mon Sep 17 00:00:00 2001 From: gyb Date: Mon, 2 Mar 2026 10:05:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E7=A9=BA=E5=9F=9F?= =?UTF-8?q?=E9=99=90=E6=97=B6=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/domain/AirlineAreaTimeRuleVO.java | 76 +++++++++++++++++++ .../airline/api/domain/AirlineAreaVO.java | 6 ++ 2 files changed, 82 insertions(+) create mode 100644 ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineAreaTimeRuleVO.java diff --git a/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineAreaTimeRuleVO.java b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineAreaTimeRuleVO.java new file mode 100644 index 0000000..04fb109 --- /dev/null +++ b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineAreaTimeRuleVO.java @@ -0,0 +1,76 @@ +package com.ruoyi.airline.api.domain; + +import com.ruoyi.common.core.web.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 空域时间规则 VO + * + * @author 拓恒 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class AirlineAreaTimeRuleVO extends BaseEntity { + /** + * 主键ID + */ + private Long id; + + /** + * 空域ID + */ + private Long areaId; + + /** + * 限制类型：0是永久 1：单次，2：自定义 + */ + private Integer restrictType; + + /** + * 日期范围 + */ + private Object dateRange; + + /** + * 时间范围 + */ + private Object timeRange; + + /** + * 重复粒度值：0,1,2:日，周，月 restrictType=0时生效 + */ + private Integer granularity; + + /** + * 粒度循环周期：整数值，每1天、每1周，每1个月 + */ + private Integer repetFrequency; + + /** + * 重复粒度具体时间 granularity = 0时，该值为空，不生效；granularity = 1时，granularityTimes最多7个值（1,2,3,4,5,6,7分别周一周二。。。周日），granularity = 2时，granularityTimes最多12个值，（1,2,3,4,5,6,7。。12分别是1月，2月.。。12月） + */ + private Object granularityTimes; + + /** + * 备注 + */ + private String remark; + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("areaId", getAreaId()) + .append("restrictType", getRestrictType()) + .append("dateRange", getDateRange()) + .append("timeRange", getTimeRange()) + .append("granularity", getGranularity()) + .append("repetFrequency", getRepetFrequency()) + .append("granularityTimes", getGranularityTimes()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineAreaVO.java b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineAreaVO.java index 9e000e7..8fa5ea2 100644 --- a/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineAreaVO.java +++ b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineAreaVO.java @@ -71,6 +71,11 @@ public class AirlineAreaVO extends BaseEntity { */ private Double maxHeight; + /** + * 时间规则列表 + */ + private List timeRules; + /** * 备注 */ @@ -105,6 +110,7 @@ public class AirlineAreaVO extends BaseEntity { .append("radius", getRadius()) .append("minHeight", getMinHeight()) .append("maxHeight", getMaxHeight()) + .append("timeRules", getTimeRules()) .append("remark", getRemark()) .toString(); } From 246693e0eab090202e2195a82b300fceed8a1b0c Mon Sep 17 00:00:00 2001 From: gyb Date: Mon, 2 Mar 2026 15:02:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E8=88=AA=E7=BA=BF?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../airline/api/domain/AirlineFileVO.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineFileVO.java b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineFileVO.java index 01c30d2..fefbbc9 100644 --- a/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineFileVO.java +++ b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineFileVO.java @@ -68,6 +68,30 @@ public class AirlineFileVO { */ private Integer status; + /** + * 爬升模式 + */ + private String climbMode; + + /** + * 海拔高度 + */ + private Double altitude; + + /** + * 飞行速度 + */ + private Double flightSpeed; + + /** + * 全局航点高度 + */ + private Double globalWaypointHeight; + + /** + * 拍照模式 + */ + private String photoMode; /** * kmz航线的全局高度