From 8585b431e9257333413358eb37c30ae58f74db76 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 13 Aug 2026 15:46:10 +0800
Subject: [PATCH] refactor(database): 优化数据库查询中的字段映射
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 11 +++++++++--
1 files changed, 9 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 530a73f..de3c689 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
@@ -47,6 +47,9 @@
ja_fw_device
<where>
is_deleted = 0
+ <if test="param2.trackStatus != null ">
+ and track_status::text = #{param2.trackStatus}::text
+ </if>
<if test="param2.id != null and param2.id != ''">
and id::text = #{param2.id}::text
</if>
@@ -406,7 +409,7 @@
ja_fw_device d
WHERE
d.is_deleted = 0
- AND d.is_enabled = 1
+ AND d.track_status = 1
AND d.final_outbound_area IS NOT NULL
<if test="effectiveRangeKmIsNotNull != null and effectiveRangeKmIsNotNull == 2">
and (d.effective_range_km is null or d.effective_range_km = 0)
@@ -824,7 +827,11 @@
AND ad.is_deleted = 0
WHERE
d.is_deleted = 0
- AND d.is_enabled = 1
+ AND d.track_status = 1
+ <if test="isEnabled != null">
+ AND d.is_enabled = #{isEnabled}
+ </if>
+ AND d.track_status = 1
AND d.final_outbound_area IS NOT NULL
<if test="regionCode != null and regionCode != ''">
and ( d.final_outbound_area_code::text LIKE concat(#{regionCode}, '%')
--
Gitblit v1.9.3