From 1144bf628058a05ec988bc0288204bc36f1f67e9 Mon Sep 17 00:00:00 2001
From: gyb111222 <gyb@example.com>
Date: Fri, 20 Mar 2026 14:21:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=8B=93=E6=81=92=E7=A9=BA=E5=9F=9F?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E7=BB=84id=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/airline/domain/model/AirlineArea.java     | 5 +++++
 .../com/ruoyi/airline/mapper/entity/AirlineAreaEntity.java   | 5 +++++
 .../airline/service/convert/AirlineAreaServiceConvert.java   | 2 ++
 src/main/resources/mapper/airline/AirlineAreaMapper.xml      | 3 ++-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ruoyi/airline/domain/model/AirlineArea.java b/src/main/java/com/ruoyi/airline/domain/model/AirlineArea.java
index 0f74594..3fe5300 100644
--- a/src/main/java/com/ruoyi/airline/domain/model/AirlineArea.java
+++ b/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;
+
     /**
      * 空域名称
      */
diff --git a/src/main/java/com/ruoyi/airline/mapper/entity/AirlineAreaEntity.java b/src/main/java/com/ruoyi/airline/mapper/entity/AirlineAreaEntity.java
index 983d407..dd13d51 100644
--- a/src/main/java/com/ruoyi/airline/mapper/entity/AirlineAreaEntity.java
+++ b/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;
+
     /**
      * 空域名称
      */
diff --git a/src/main/java/com/ruoyi/airline/service/convert/AirlineAreaServiceConvert.java b/src/main/java/com/ruoyi/airline/service/convert/AirlineAreaServiceConvert.java
index 7a11add..a416659 100644
--- a/src/main/java/com/ruoyi/airline/service/convert/AirlineAreaServiceConvert.java
+++ b/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());
diff --git a/src/main/resources/mapper/airline/AirlineAreaMapper.xml b/src/main/resources/mapper/airline/AirlineAreaMapper.xml
index 1500d0c..97d4c90 100644
--- a/src/main/resources/mapper/airline/AirlineAreaMapper.xml
+++ b/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