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/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("id", id)
-                .append("groupName", groupName)
+                .append("name", name)
                 .toString();
     }
 }

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<AirlineMarkerVO> airspaceList;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("groupId", getGroupId())
+                .append("airspaceList", getAirspaceList())
+                .toString();
+    }
+}

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 id;
+
+    /**
+     * 分组名称
+     */
+    private String name;
+
+    /**
+     * 组关联的标注
+     */
+    private List<AirlineMarkerVO> groupInfos;
+
+    /**
+     * 标注数量
+     */
+    private Integer markerCount;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("name", getName())
+                .append("markerCount", getMarkerCount())
+                .toString();
+    }
+}