From 777eeea75ffc628d024ded81f19deff78f4f42af Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 08 Jan 2026 16:18:41 +0800
Subject: [PATCH] 报警记录导出

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 57 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
index a603709..1213545 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
@@ -7,11 +7,19 @@
         <result column="id" property="id"/>
         <result column="device_name" property="deviceName"/>
         <result column="device_type" property="deviceType"/>
+        <result column="device_att" property="deviceAtt"/>
         <result column="device_model" property="deviceModel"/>
         <result column="device_specification" property="deviceSpecification"/>
         <result column="manufacturer" property="manufacturer"/>
         <result column="source" property="source"/>
         <result column="remark" property="remark"/>
+        <result column="battery_pct" property="batteryPct"/>
+        <result column="azimuth" property="azimuth"/>
+        <result column="elevation" property="elevation"/>
+        <result column="detect_target_cnt" property="detectTargetCnt"/>
+        <result column="effective_range_km" property="effectiveRangeKm"/>
+        <result column="work_mode" property="workMode"/>
+        <result column="area_code" property="areaCode"/>
         <result column="create_user" property="createUser"/>
         <result column="create_dept" property="createDept"/>
         <result column="create_time" property="createTime"/>
@@ -23,7 +31,55 @@
 
 
     <select id="selectFwDevicePage" resultMap="fwDeviceResultMap">
-        select * from ja_fw_device where is_deleted = 0
+        select * from ja_fw_device
+        <where>
+            is_deleted = 0
+            <if test="param2.id != null and param2.id != ''">
+                and id = #{param2.id}
+            </if>
+            <if test="param2.deviceName != null and param2.deviceName != ''">
+                and device_name = #{param2.deviceName}
+            </if>
+            <if test="param2.deviceType != null and param2.deviceType != ''">
+                and device_type = #{param2.deviceType}
+            </if>
+            <if test="param2.deviceModel != null and param2.deviceModel != ''">
+                and device_model = #{param2.deviceModel}
+            </if>
+            <if test="param2.deviceSpecification != null and param2.deviceSpecification != ''">
+                and device_specification = #{param2.deviceSpecification}
+            </if>
+            <if test="param2.manufacturer != null and param2.manufacturer != ''">
+                and manufacturer = #{param2.manufacturer}
+            </if>
+            <if test="param2.source != null and param2.source != ''">
+                and source = #{param2.source}
+            </if>
+            <if test="param2.remark != null and param2.remark != ''">
+                and remark = #{param2.remark}
+            </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>
+            <if test="param2.isDeleted != null and param2.isDeleted != ''">
+                and is_deleted = #{param2.isDeleted}
+            </if>
+        </where>
     </select>
 
 

--
Gitblit v1.9.3