From ad4b0f46d3b0710acca939ce8ee6613181a628f3 Mon Sep 17 00:00:00 2001 From: gyb Date: Mon, 16 Mar 2026 11:47:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/AirlineMarkerGroupDetailVO.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerGroupDetailVO.java diff --git a/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerGroupDetailVO.java b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerGroupDetailVO.java new file mode 100644 index 0000000..89e90ff --- /dev/null +++ b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerGroupDetailVO.java @@ -0,0 +1,36 @@ +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; + +import java.util.List; + +/** + * 空域分组详情 VO + * + * @author 拓恒 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class AirlineMarkerGroupDetailVO extends BaseEntity { + /** + * 分组ID + */ + private Long groupId; + + /** + * 空域列表 + */ + private List airspaceList; + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("groupId", getGroupId()) + .append("airspaceList", getAirspaceList()) + .toString(); + } +} From 608f9e1ffddec43d05b016420c25772c977669be Mon Sep 17 00:00:00 2001 From: gyb Date: Mon, 16 Mar 2026 18:33:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=A0=87=E6=B3=A8?= =?UTF-8?q?=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/domain/AirlineMarkerGroupVO.java | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerGroupVO.java diff --git a/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerGroupVO.java b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerGroupVO.java new file mode 100644 index 0000000..921bcb4 --- /dev/null +++ b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerGroupVO.java @@ -0,0 +1,47 @@ +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; + +import java.util.List; + +/** + * 标注分组 VO + * + * @author 拓恒 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class AirlineMarkerGroupVO extends BaseEntity { + /** + * 分组ID + */ + private Long groupId; + + /** + * 分组名称 + */ + private String groupName; + + /** + * 组关联的标注 + */ + private List groupInfos; + + /** + * 标注数量 + */ + private Integer markerCount; + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("groupId", getGroupId()) + .append("groupName", getGroupName()) + .append("markerCount", getMarkerCount()) + .toString(); + } +} \ No newline at end of file From 618012c9d4cf78a5f4912fb65031396bf4e061d7 Mon Sep 17 00:00:00 2001 From: gyb Date: Mon, 16 Mar 2026 19:28:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=A0=87=E6=B3=A8?= =?UTF-8?q?=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/airline/api/domain/AirlineMarkerGroupVO.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerGroupVO.java b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerGroupVO.java index 921bcb4..bee507f 100644 --- a/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerGroupVO.java +++ b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerGroupVO.java @@ -19,12 +19,12 @@ public class AirlineMarkerGroupVO extends BaseEntity { /** * 分组ID */ - private Long groupId; + private Long id; /** * 分组名称 */ - private String groupName; + private String name; /** * 组关联的标注 @@ -39,8 +39,8 @@ public class AirlineMarkerGroupVO extends BaseEntity { @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("groupId", getGroupId()) - .append("groupName", getGroupName()) + .append("id", getId()) + .append("name", getName()) .append("markerCount", getMarkerCount()) .toString(); } From 85f2a3bab0088eb35dc791e94ff6bea85e6ec97d Mon Sep 17 00:00:00 2001 From: gyb Date: Tue, 17 Mar 2026 09:30:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/airline/api/domain/AirlineFileGroupVO.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineFileGroupVO.java b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineFileGroupVO.java index 1c19619..11a9ce5 100644 --- a/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineFileGroupVO.java +++ b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineFileGroupVO.java @@ -19,12 +19,12 @@ public class AirlineFileGroupVO extends BaseEntity { /** * 用户ID */ - private Long groupId; + private Long id; /** * 分组名称 */ - private String groupName; + private String name; /** * 组关联的航线 @@ -39,8 +39,8 @@ public class AirlineFileGroupVO extends BaseEntity { @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("groupId", groupId) - .append("groupName", groupName) + .append("id", id) + .append("name", name) .toString(); } }