From bf45f88ff9ea1ea1d4976f97dbe2a12eae9a52f9 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 05 Feb 2026 10:12:37 +0800
Subject: [PATCH] 反无优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 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 0fd7b2a..29dd3fa 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
@@ -342,13 +342,13 @@
<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 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
@@ -396,10 +396,18 @@
WHERE
is_deleted = 0
<if test="deptList != null and deptList.size > 0">
- and create_dept in
+ and ( create_dept in
<foreach collection="deptList" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
+ <if test="currentDeptId != null and currentDeptId != '' ">
+ or 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
manufacturer
@@ -516,12 +524,23 @@
<select id="selectCockpitDevicePage" resultType="org.sxkj.fw.device.vo.CockpitFwDeviceVO">
select
- d.*
+ d.*,
+ min(ad.id) as area_divide_id,
+ min(dsm.id) as defense_scene_manage_id
from
ja_fw_device d
+ left join ja_fw_area_divide ad
+ on find_in_set(d.id, ad.device_ids) > 0
+ and ad.is_deleted = 0
+ left join ja_fw_defense_scene ds
+ on find_in_set(ad.id, ds.area_divide_ids) > 0
+ and ds.is_deleted = 0
+ left join ja_fw_defense_scene_manage dsm
+ on dsm.defense_scene_id = ds.id
+ and dsm.is_deleted = 0
<where>
- d.is_deleted = 0
- and d.is_enabled = 1
+ d.is_deleted = 0
+ and d.is_enabled = 1
<if test="param2.regionCode != null and param2.regionCode != ''">
and (d.final_outbound_area_code like concat(#{param2.regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
@@ -580,6 +599,7 @@
</foreach>
</if>
</where>
+ group by d.id
</select>
<update id="updateTrackStatusByDeviceId">
--
Gitblit v1.9.3