From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 51 ++++++++++++++++++++++++---------------------------
1 files changed, 24 insertions(+), 27 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..d44b2e0 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}
<!-- 或者设备是共享给当前部门的 -->
@@ -312,10 +311,18 @@
blade_dict_biz b ON (a.device_type = b.dict_key AND b.code = 'deviceType' AND b.parent_id != 0)
where a.is_deleted = 0
<if test="deptList != null and deptList.size > 0">
- and a.create_dept in
+ and ( a.create_dept in
<foreach collection="deptList" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
+ <!-- <if test="currentDeptId != null and currentDeptId != '' "> -->
+ <!-- or a.id in ( -->
+ <!-- SELECT device_id FROM ja_fw_device_per_share -->
+ <!-- WHERE loan_to_dept_id = #{currentDeptId} -->
+ <!-- AND is_deleted = 0 -->
+ <!-- ) -->
+ <!-- </if> -->
+ )
</if>
group by a.device_type,b.dict_value
</select>
@@ -331,18 +338,26 @@
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>
<if test="deptList != null and deptList.size > 0">
- and d.create_dept in
+ and ( d.create_dept in
<foreach collection="deptList" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
+ <if test="currentDeptId != null and currentDeptId != '' ">
+ or d.id in (
+ SELECT device_id FROM ja_fw_device_per_share
+ WHERE loan_to_dept_id = #{currentDeptId}
+ AND is_deleted = 0
+ )
+ </if>
+ )
</if>
GROUP BY
d.final_outbound_area
@@ -378,9 +393,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 +415,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 +436,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 +456,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 +476,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 +498,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 +572,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