From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 02 Feb 2026 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 31 ++++++-------------------------
1 files changed, 6 insertions(+), 25 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 69d48af..c5e1d3d 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
@@ -156,6 +156,7 @@
select * from ja_fw_device
<where>
is_deleted = 0
+ and track_status = 1
<if test="query.isAreaSelect != null and query.isAreaSelect == 1">
and (
<choose>
@@ -249,7 +250,6 @@
d.is_deleted = 0
AND d.is_enabled = 1
AND status != 3
- AND track_status = 1
<if test="regionName != null and regionName != ''">
and (d.final_outbound_area = #{regionName}
<!-- 或者设备是共享给当前部门的 -->
@@ -281,7 +281,6 @@
AND is_enabled = 1
AND status != 3
AND device_type = '3'
- AND track_status = 1
<if test="regionName != null and regionName != ''">
and (d.final_outbound_area = #{regionName}
<!-- 或者设备是共享给当前部门的 -->
@@ -331,10 +330,10 @@
d.is_deleted = 0
AND d.is_enabled = 1
AND d.final_outbound_area 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 == 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>
@@ -378,9 +377,6 @@
WHERE
d.is_deleted = 0
and d.is_enabled = 1
- and effective_range_km is not null
- and effective_range_km > 0
- AND track_status = 1
<if test="regionName != null and regionName != ''">
and (d.final_outbound_area = #{regionName}
<!-- 或者设备是共享给当前部门的 -->
@@ -403,9 +399,6 @@
d.is_deleted = 0
and d.is_enabled = 1
AND device_att = '1'
- and effective_range_km is not null
- and effective_range_km > 0
- AND track_status = 1
<if test="regionName != null and regionName != ''">
and (d.final_outbound_area = #{regionName}
<!-- 或者设备是共享给当前部门的 -->
@@ -427,9 +420,6 @@
WHERE d.is_deleted = 0
and d.is_enabled = 1
AND device_att = '2'
- and effective_range_km is not null
- and effective_range_km > 0
- AND track_status = 1
<if test="regionName != null and regionName != ''">
and (d.final_outbound_area = #{regionName}
<!-- 或者设备是共享给当前部门的 -->
@@ -450,9 +440,6 @@
WHERE d.is_deleted = 0
and d.is_enabled = 1
AND device_att = '3'
- and effective_range_km is not null
- and effective_range_km > 0
- AND track_status = 1
<if test="regionName != null and regionName != ''">
and (d.final_outbound_area = #{regionName}
<!-- 或者设备是共享给当前部门的 -->
@@ -473,9 +460,6 @@
WHERE d.is_deleted = 0
and d.is_enabled = 1
AND status in ('1', '2', '3' )
- and effective_range_km is not null
- and effective_range_km > 0
- AND track_status = 1
<if test="regionName != null and regionName != ''">
and (d.final_outbound_area = #{regionName}
<!-- 或者设备是共享给当前部门的 -->
@@ -498,9 +482,6 @@
ja_fw_device d
<where>
d.is_deleted = 0
--- and d.effective_range_km is not null
--- and d.effective_range_km > 0
- and d.track_status = 1
and d.is_enabled = 1
<if test="param2.regionName != null and param2.regionName != ''">
and (d.final_outbound_area = #{param2.regionName}
@@ -575,7 +556,7 @@
<select id="selectNonDeptAreaDevices" resultType="org.sxkj.fw.device.vo.FwDeviceVO">
SELECT
d.*,
- t.out_target,
+ d.final_outbound_area as outTarget,
ps.id AS shareId,
CASE
WHEN ps.id IS NOT NULL THEN TRUE
--
Gitblit v1.9.3