From 0a03503976b73180749a4953a100240078f5d3e4 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 12 Jan 2026 14:58:11 +0800
Subject: [PATCH] 设备关联从场景转到区域

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
index 1e9074f..19b5e74 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
@@ -15,6 +15,7 @@
         <result column="response_mechanism" property="responseMechanism"/>
         <result column="control_level" property="controlLevel"/>
         <result column="police_station_id" property="policeStationId"/>
+        <result column="device_ids" property="deviceIds"/>
         <result column="fly_date_start" property="flyDateStart"/>
         <result column="fly_date_end" property="flyDateEnd"/>
         <result column="area_code" property="areaCode"/>
@@ -44,6 +45,7 @@
         ad.response_mechanism,
         ad.control_level,
         ad.police_station_id,
+        ad.device_ids,
         ad.fly_date_start,
         ad.fly_date_end,
         ad.area_code,
@@ -100,6 +102,9 @@
             <if test="param2.policeStationId != null and param2.policeStationId != ''">
                 and ad.police_station_id = #{param2.policeStationId}
             </if>
+            <if test="param2.deviceIds != null and param2.deviceIds != ''">
+                and ad.device_ids = #{param2.deviceIds}
+            </if>
             <if test="param2.flyDateStart != null and param2.flyDateStart != ''">
                 and ad.fly_date_start &gt;= #{param2.flyDateStart}
             </if>
@@ -125,6 +130,7 @@
         ad.response_mechanism,
         ad.control_level,
         ad.police_station_id,
+        ad.device_ids,
         ad.fly_date_start,
         ad.fly_date_end,
         ad.area_code,
@@ -158,6 +164,7 @@
         response_mechanism,
         control_level,
         police_station_id,
+        device_ids,
         fly_date_start,
         fly_date_end,
         area_code,
@@ -184,6 +191,7 @@
             response_mechanism,
             control_level,
             police_station_id,
+            device_ids,
             fly_date_start,
             fly_date_end,
             area_code,
@@ -216,6 +224,7 @@
             #{responseMechanism},
             #{controlLevel},
             #{policeStationId},
+            #{deviceIds},
             #{flyDateStart},
             #{flyDateEnd},
             #{areaCode},
@@ -249,6 +258,7 @@
             <if test="responseMechanism != null">response_mechanism = #{responseMechanism},</if>
             <if test="controlLevel != null">control_level = #{controlLevel},</if>
             <if test="policeStationId != null">police_station_id = #{policeStationId},</if>
+            <if test="deviceIds != null">device_ids = #{deviceIds},</if>
             <if test="flyDateStart != null">fly_date_start = #{flyDateStart},</if>
             <if test="flyDateEnd != null">fly_date_end = #{flyDateEnd},</if>
             <if test="areaCode != null">area_code = #{areaCode},</if>

--
Gitblit v1.9.3