From 74756c657109a4e48dd6c0b4d8959cdab89b33a9 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 28 Jan 2026 20:10:29 +0800
Subject: [PATCH] update-区域划分表结构调整
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml | 81 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 79 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml
index b1fc448..bd5ba5c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml
@@ -4,16 +4,93 @@
<!-- 通用查询映射结果 -->
<resultMap id="fwDroneFlightRecordResultMap" type="org.sxkj.fw.record.entity.FwDroneFlightRecordEntity">
+ <result column="id" property="id"/>
+ <result column="device_id" property="deviceId"/>
+ <result column="drone_name" property="droneName"/>
+ <result column="serial_no" property="serialNo"/>
+ <result column="alarm_time" property="alarmTime"/>
+ <result column="trigger_type" property="triggerType"/>
+ <result column="stay_duration" property="stayDuration"/>
+ <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="selectFwDroneFlightRecordPage" resultMap="fwDroneFlightRecordResultMap">
- select * from ja_fw_drone_flight_record where is_deleted = 0
+ select dfr.* from ja_fw_drone_flight_record dfr
+ <where>
+ dfr.is_deleted = 0
+ <if test="param2.deviceId != null and param2.deviceId != ''">
+ and dfr.device_id = #{param2.deviceId}
+ </if>
+ <if test="param2.droneName != null and param2.droneName != ''">
+ and dfr.drone_name like CONCAT('%', #{param2.droneName}, '%')
+ </if>
+ <if test="param2.serialNo != null and param2.serialNo != ''">
+ and dfr.serial_no = #{param2.serialNo}
+ </if>
+ <if test="param2.alarmTime != null and param2.alarmTime != ''">
+ and dfr.alarm_time = #{param2.alarmTime}
+ </if>
+ <if test="param2.triggerType != null and param2.triggerType != ''">
+ and dfr.trigger_type = #{param2.triggerType}
+ </if>
+ <if test="param2.stayDuration != null and param2.stayDuration != ''">
+ and dfr.stay_duration = #{param2.stayDuration}
+ </if>
+ <if test="param2.areaCode != null and param2.areaCode != ''">
+ and dfr.area_code = #{param2.areaCode}
+ </if>
+ <if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != ''">
+ and dfr.alarm_time BETWEEN #{param2.startTime} AND #{param2.endTime}
+ </if>
+ <if test="param2.deviceType != null and param2.deviceType != ''">
+ and dfr.device_type = #{param2.deviceType}
+ </if>
+ <if test="param2.areaName != null and param2.areaName != ''">
+ and dfr.area_name like CONCAT('%', #{param2.areaName}, '%')
+ </if>
+ <if test="param2.deptList != null and param2.deptList.size > 0">
+ and dfr.create_dept in
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
+ </where>
</select>
<select id="exportFwDroneFlightRecord" resultType="org.sxkj.fw.record.excel.FwDroneFlightRecordExcel">
- SELECT * FROM ja_fw_drone_flight_record ${ew.customSqlSegment}
+ SELECT
+ dfr.id,
+ dfr.drone_name,
+ dfr.serial_no,
+ dfr.alarm_time,
+ dfr.area_name,
+ dfr.trigger_type,
+ dfr.stay_duration,
+ dfrd.longitude,
+ dfrd.latitude,
+ dfrd.point_time
+ FROM
+ ja_fw_drone_flight_record dfr
+ left join
+ ja_fw_drone_flight_record_detail dfrd on dfr.id = dfrd.flight_record_id
+ <where>
+ dfr.is_deleted = 0
+ <if test="ids != null and ids.size() > 0">
+ and dfr.id in
+ <foreach item="item" collection="ids" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ </where>
</select>
</mapper>
--
Gitblit v1.9.3