From f7cf57b99def748f2981ff4811b9ab435b5df856 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 26 Jan 2026 18:51:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 15 ++++++++++++++-
1 files changed, 14 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 4c6b154..e98a476 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
@@ -38,7 +38,7 @@
<select id="selectFwDevicePage" resultMap="fwDeviceResultMap">
- select * from ja_fw_device
+ select *, (select count(*) from ja_fw_device_track tmp where ja_fw_device.id = tmp.device_id) out_count from ja_fw_device
<where>
is_deleted = 0
<if test="param2.id != null and param2.id != ''">
@@ -80,6 +80,12 @@
</if>
<if test="param2.status != null">
and status = #{param2.status}
+ </if>
+ <if test="param2.isTrack != null and param2.isTrack == 1">
+ and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) > 0
+ </if>
+ <if test="param2.isTrack != null and param2.isTrack == 2">
+ and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) = 0
</if>
</where>
</select>
@@ -225,6 +231,13 @@
WHERE
d.is_deleted = 0
AND t.out_target IS NOT NULL
+ <if test="effectiveRangeKmIsNotNull != null and effectiveRangeKmIsNotNull == 1">
+ and d.effective_range_km is not null
+ and d.effective_range_km > 0
+ </if>
+ <if test="effectiveRangeKmIsNotNull != null and effectiveRangeKmIsNotNull == 2">
+ and (d.effective_range_km is null or d.effective_range_km = 0)
+ </if>
GROUP BY
t.out_target;
</select>
--
Gitblit v1.9.3