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 76cb782..8635735 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 @@ -41,6 +41,21 @@ public class AirlineAreaVO extends BaseEntity { */ private List points; + /** + * 面积 + */ + private Double areaArea; + + /** + * 周长 + */ + private Double areaPerimeter; + + /** + * 半径 + */ + private Double radius; + /** * 备注 */ @@ -70,6 +85,9 @@ public class AirlineAreaVO extends BaseEntity { .append("areaType", getAreaType()) .append("status", getStatus()) .append("points", getPoints()) + .append("areaArea", getAreaArea()) + .append("areaPerimeter", getAreaPerimeter()) + .append("radius", getRadius()) .append("remark", getRemark()) .toString(); } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java index eb9f783..d71cb01 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java @@ -7,12 +7,14 @@ import java.util.Map; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; /** * Entity基类 * * @author ruoyi */ +@Data public class BaseEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -35,6 +37,9 @@ public class BaseEntity implements Serializable @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; + /** 支持更新时间正序,倒排 */ + private String updateTimeOrderBy; + /** 备注 */ private String remark; @@ -42,66 +47,9 @@ public class BaseEntity implements Serializable @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map params; - public String getSearchValue() - { - return searchValue; - } - - public void setSearchValue(String searchValue) - { - this.searchValue = searchValue; - } - - public String getCreateBy() - { - return createBy; - } - - public void setCreateBy(String createBy) - { - this.createBy = createBy; - } - - public Date getCreateTime() - { - return createTime; - } - - public void setCreateTime(Date createTime) - { - this.createTime = createTime; - } - - public String getUpdateBy() - { - return updateBy; - } - - public void setUpdateBy(String updateBy) - { - this.updateBy = updateBy; - } - - public Date getUpdateTime() - { - return updateTime; - } - - public void setUpdateTime(Date updateTime) - { - this.updateTime = updateTime; - } - - public String getRemark() - { - return remark; - } - - public void setRemark(String remark) - { - this.remark = remark; - } - + /** + * 获取请求参数 + */ public Map getParams() { if (params == null) @@ -110,9 +58,4 @@ public class BaseEntity implements Serializable } return params; } - - public void setParams(Map params) - { - this.params = params; - } }