From 51c2a670b6b7d031f2cd6ef6c5e8a77bf25df413 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 08 Jan 2026 19:24:00 +0800
Subject: [PATCH] 记录优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 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..b2092ec 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,23 +7,62 @@
<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="purpose" property="purpose"/>
+ <result column="belong_dept" property="belongDept"/>
+ <result column="charger" property="charger"/>
+ <result column="contact_phone" property="contactPhone"/>
<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"/>
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
- <result column="is_deleted" property="isDeleted"/>
+<!-- <result column="is_deleted" property="isDeleted"/>-->
</resultMap>
<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 like concat('%',#{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.belongDept != null and param2.belongDept != ''">
+ and belong_dept = #{param2.belongDept}
+ </if>
+ </where>
</select>
--
Gitblit v1.9.3