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