From 209afc32f9e3fd1932dc77457905f52518745bfc Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 09 Jan 2026 17:24:45 +0800
Subject: [PATCH] 防区、场景详情页面增加返回参数

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml
index f0fa9c9..c188bce 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.sxkj.fw.area.mapper.FwDefenseZoneMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="fwDefenseZoneResultMap" type="org.sxkj.fw.area.entity.FwDefenseZoneEntity">
+    <resultMap id="fwDefenseZoneResultMap" type="org.sxkj.fw.area.vo.FwDefenseZoneVO">
         <result column="id" property="id"/>
         <result column="zone_name" property="zoneName"/>
         <result column="zone_area" property="zoneArea"/>
@@ -95,6 +95,28 @@
         </where>
     </select>
 
+    <select id="selectFwDefenseZoneDetail" resultMap="fwDefenseZoneResultMap">
+        select
+        id,
+        zone_name,
+        zone_area,
+        defense_scene_ids,
+        area_divide_ids,
+        device_ids,
+        concat(ST_AsText(geom), ' | ', ST_SRID(geom)) as geom,
+        area_code,
+        create_user,
+        create_dept,
+        create_time,
+        update_user,
+        update_time,
+        status,
+        is_deleted
+        from ja_fw_defense_zone
+        where is_deleted = 0
+          and id = #{id}
+    </select>
+
 
     <select id="exportFwDefenseZone" resultType="org.sxkj.fw.area.excel.FwDefenseZoneExcel">
         SELECT
@@ -157,8 +179,8 @@
             #{createTime},
             #{updateUser},
             #{updateTime},
-            #{status},
-            #{isDeleted}
+            IFNULL(#{status}, '0'),
+            IFNULL(#{isDeleted}, 0)
         )
     </insert>
 

--
Gitblit v1.9.3