From 66133ef2ccd18ec004e6be8a052725bed088aaf1 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 03 Feb 2026 10:15:24 +0800
Subject: [PATCH] 反制优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
index 79969c8..261401d 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
@@ -32,28 +32,31 @@
<select id="selectFwEffectEvalPage" resultMap="fwEffectEvalResultMap">
select
- *
- from
- ja_fw_effect_eval
+ ee.*,
+ group_concat(distinct ad.area_name separator ',') as area_name,
+ group_concat(distinct ds.scene_name separator ',') as scene_name
+ from ja_fw_effect_eval ee
+ left join ja_fw_area_divide ad on find_in_set(ee.device_id, ad.device_ids) and ad.is_deleted = 0
+ left join ja_fw_defense_scene ds on find_in_set(ad.id, ds.area_divide_ids) and ds.is_deleted = 0
<where>
- is_deleted = 0
+ ee.is_deleted = 0
<if test="param2.deviceName != null and param2.deviceName != ''">
- and device_name like concat('%', #{param2.deviceName}, '%')
+ and ee.device_name like concat('%', #{param2.deviceName}, '%')
</if>
<if test="param2.deviceType != null and param2.deviceType != ''">
- and device_type = #{param2.deviceType}
+ and ee.device_type = #{param2.deviceType}
</if>
<if test="param2.counterEffect != null and param2.counterEffect != ''">
- and counter_effect = #{param2.counterEffect}
+ and ee.counter_effect = #{param2.counterEffect}
</if>
<if test="param2.deptList != null and param2.deptList.size > 0">
- and (create_dept in
+ and (ee.create_dept in
<foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
<!-- 或者设备是共享给当前部门的 -->
<if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
- or device_id in (
+ or ee.device_id in (
SELECT device_id FROM ja_fw_device_per_share
WHERE loan_to_dept_id = #{param2.currentDeptId}
AND is_deleted = 0
@@ -61,6 +64,7 @@
</if>
)
</if>
+ group by ee.id -- 按主表主键分组
</where>
</select>
--
Gitblit v1.9.3