From bbc3d8a4b43256e6cafefc7ab33f34e1459aed9b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 15:02:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml |   94 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 93 insertions(+), 1 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 7b280a4..cadf928 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
@@ -4,11 +4,103 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="fwAreaDivideResultMap" type="org.sxkj.fw.area.entity.FwAreaDivideEntity">
+        <result column="id" property="id"/>
+        <result column="area_name" property="areaName"/>
+        <result column="longitude" property="longitude"/>
+        <result column="latitude" property="latitude"/>
+        <result column="area_size" property="areaSize"/>
+        <result column="geom" property="geom"/>
+        <result column="area_type" property="areaType"/>
+        <result column="trigger_condition" property="triggerCondition"/>
+        <result column="response_mechanism" property="responseMechanism"/>
+        <result column="control_level" property="controlLevel"/>
+        <result column="police_station_id" property="policeStationId"/>
+        <result column="fly_time_start" property="flyTimeStart"/>
+        <result column="fly_time_end" property="flyTimeEnd"/>
+        <result column="fly_date_start" property="flyDateStart"/>
+        <result column="fly_date_end" property="flyDateEnd"/>
+        <result column="area_code" property="areaCode"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
     </resultMap>
 
 
     <select id="selectFwAreaDividePage" resultMap="fwAreaDivideResultMap">
-        select * from ja_fw_area_divide where is_deleted = 0
+        select * from ja_fw_area_divide
+        <where>
+            is_deleted = 0
+            <if test="param2.id != null and param2.id != ''">
+                and id = #{param2.id}
+            </if>
+            <if test="param2.areaName != null and param2.areaName != ''">
+                and area_name like concat('%', #{param2.areaName}, '%')
+            </if>
+            <if test="param2.longitude != null and param2.longitude != ''">
+                and longitude = #{param2.longitude}
+            </if>
+            <if test="param2.latitude != null and param2.latitude != ''">
+                and latitude = #{param2.latitude}
+            </if>
+            <if test="param2.areaSize != null and param2.areaSize != ''">
+                and area_size = #{param2.areaSize}
+            </if>
+            <if test="param2.geom != null and param2.geom != ''">
+                and geom = #{param2.geom}
+            </if>
+            <if test="param2.areaType != null and param2.areaType != ''">
+                and area_type = #{param2.areaType}
+            </if>
+            <if test="param2.triggerCondition != null and param2.triggerCondition != ''">
+                and trigger_condition = #{param2.triggerCondition}
+            </if>
+            <if test="param2.responseMechanism != null and param2.responseMechanism != ''">
+                and response_mechanism = #{param2.responseMechanism}
+            </if>
+            <if test="param2.controlLevel != null and param2.controlLevel != ''">
+                and control_level = #{param2.controlLevel}
+            </if>
+            <if test="param2.policeStationId != null and param2.policeStationId != ''">
+                and police_station_id = #{param2.policeStationId}
+            </if>
+            <if test="param2.flyTimeStart != null and param2.flyTimeStart != ''">
+                and fly_time_start &gt;= #{param2.flyTimeStart}
+            </if>
+            <if test="param2.flyTimeEnd != null and param2.flyTimeEnd != ''">
+                and fly_time_end &lt;= #{param2.flyTimeEnd}
+            </if>
+            <if test="param2.flyDateStart != null and param2.flyDateStart != ''">
+                and fly_date_start &gt;= #{param2.flyDateStart}
+            </if>
+            <if test="param2.flyDateEnd != null and param2.flyDateEnd != ''">
+                and fly_date_end &lt;= #{param2.flyDateEnd}
+            </if>
+            <if test="param2.areaCode != null and param2.areaCode != ''">
+                and area_code = #{param2.areaCode}
+            </if>
+            <if test="param2.createUser != null and param2.createUser != ''">
+                and create_user = #{param2.createUser}
+            </if>
+            <if test="param2.createDept != null and param2.createDept != ''">
+                and create_dept = #{param2.createDept}
+            </if>
+            <if test="param2.createTime != null and param2.createTime != ''">
+                and create_time = #{param2.createTime}
+            </if>
+            <if test="param2.updateUser != null and param2.updateUser != ''">
+                and update_user = #{param2.updateUser}
+            </if>
+            <if test="param2.updateTime != null and param2.updateTime != ''">
+                and update_time = #{param2.updateTime}
+            </if>
+            <if test="param2.status != null and param2.status != ''">
+                and status = #{param2.status}
+            </if>
+        </where>
     </select>
 
 

--
Gitblit v1.9.3