feat:拓恒空域增加分组id字段

src/main/java/com/ruoyi/airline/domain/model/AirlineArea.java

@@ -20,6 +20,11 @@ public class AirlineArea extends ExBaseEntity {
      */
     private Long id;
 
+    /**
+     * 分组ID
+     */
+    private Long groupId;
+
     /**
      * 空域名称
      */

src/main/java/com/ruoyi/airline/mapper/entity/AirlineAreaEntity.java

@@ -19,6 +19,11 @@ public class AirlineAreaEntity extends ExBaseEntity {
      */
     private Long id;
 
+    /**
+     * 分组ID
+     */
+    private Long groupId;
+
     /**
      * 空域名称
      */

src/main/java/com/ruoyi/airline/service/convert/AirlineAreaServiceConvert.java

@@ -49,6 +49,7 @@ public class AirlineAreaServiceConvert extends BaseConvert<AirlineArea, AirlineA
         }
         AirlineAreaDTO dto = new AirlineAreaDTO();
         dto.setId(model.getId());
+        dto.setGroupId(model.getGroupId());
         dto.setName(model.getName());
         dto.setAreaType(model.getAreaType());
         dto.setStatus(model.getStatus());
@@ -79,6 +80,7 @@ public class AirlineAreaServiceConvert extends BaseConvert<AirlineArea, AirlineA
         
         AirlineArea model = new AirlineArea();
         model.setId(dto.getId());
+        model.setGroupId(dto.getGroupId());
         model.setName(dto.getName());
         model.setAreaType(dto.getAreaType());
         model.setStatus(dto.getStatus());

src/main/resources/mapper/airline/AirlineAreaMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- 结果映射 -->
     <resultMap id="AirlineAreaResult" type="com.ruoyi.airline.mapper.entity.AirlineAreaEntity">
         <id property="id" column="id" />
+        <result property="groupId" column="group_id" />
         <result property="name" column="name" />
         <result property="areaType" column="area_type" />
         <result property="status" column="status" />
@@ -96,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 根据用户ID查询空域列表 -->
     <select id="selectAreaListByUserId" parameterType="com.ruoyi.airline.mapper.entity.AirlineAreaEntity" resultMap="AirlineAreaResult">
-        select distinct aa.id, aa.name, aa.area_type, aa.status, aa.points, aa.shape, aa.area_area, aa.area_perimeter, aa.radius, aa.min_height, aa.max_height, aa.create_by, aa.create_time, aa.update_by, aa.update_time, aa.remark
+        select distinct aa.id, aagi.group_id, aa.name, aa.area_type, aa.status, aa.points, aa.shape, aa.area_area, aa.area_perimeter, aa.radius, aa.min_height, aa.max_height, aa.create_by, aa.create_time, aa.update_by, aa.update_time, aa.remark
         from airline_area aa
         left join airline_area_group_info aagi on aa.id = aagi.area_id
         left join airline_area_group aag on aagi.group_id = aag.group_id