Merge branch 'main' of http://th.local.t-aaron.com:13000/THENG/a-cloud-all

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();
+    }
+}

ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineAreaVO.java

@@ -61,6 +61,21 @@ public class AirlineAreaVO extends BaseEntity {
      */
     private Double radius;
 
+    /**
+     * 最小高度
+     */
+    private Double minHeight;
+
+    /**
+     * 最大高度
+     */
+    private Double maxHeight;
+
+    /**
+     * 时间规则列表
+     */
+    private List<AirlineAreaTimeRuleVO> timeRules;
+
     /**
      * 备注
      */
@@ -93,6 +108,9 @@ public class AirlineAreaVO extends BaseEntity {
                 .append("areaArea", getAreaArea())
                 .append("areaPerimeter", getAreaPerimeter())
                 .append("radius", getRadius())
+                .append("minHeight", getMinHeight())
+                .append("maxHeight", getMaxHeight())
+                .append("timeRules", getTimeRules())
                 .append("remark", getRemark())
                 .toString();
     }

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航线的全局高度