From fefe259f19a251d90d17d8a42e04f6332a4cad3e Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 23 Jan 2026 15:37:30 +0800
Subject: [PATCH] sql 优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
index 762bb35..b132290 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
@@ -21,14 +21,13 @@
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
- <result column="is_deleted" property="isDeleted"/>
</resultMap>
<select id="selectFwDefenseScenePage" resultMap="fwDefenseSceneResultMap">
select * from ja_fw_defense_scene
<where>
- is_deleted = 0
+ and is_deleted = 0
<if test="param2.id != null and param2.id != ''">
and id = #{param2.id}
</if>
@@ -87,14 +86,9 @@
select ds.* from ja_fw_defense_scene ds
<where>
ds.is_deleted = 0
- <choose>
- <when test="areaId != null">
- and ds.area_divide_ids is not null
- and ds.area_divide_ids != ''
- and find_in_set(#{areaId}, replace(ds.area_divide_ids, ' ', ''))
- </when>
- <when test="filterSelected != null and filterSelected == 1">
- and not exists (
+ <if test="filterSelected != null and filterSelected == 1">
+ and (
+ not exists (
select 1
from ja_fw_defense_zone dz
where dz.is_deleted = 0
@@ -102,8 +96,24 @@
and dz.defense_scene_ids != ''
and find_in_set(ds.id, dz.defense_scene_ids)
)
- </when>
- </choose>
+ <if test="zoneId != null">
+ or exists (
+ select 1
+ from ja_fw_defense_zone dz
+ where dz.is_deleted = 0
+ and dz.id = #{zoneId}
+ and dz.defense_scene_ids is not null
+ and dz.defense_scene_ids != ''
+ and find_in_set(ds.id, dz.defense_scene_ids)
+ )
+ </if>
+ )
+ </if>
+ <if test="areaId != null and (filterSelected == null or filterSelected != 1)">
+ and ds.area_divide_ids is not null
+ and ds.area_divide_ids != ''
+ and find_in_set(#{areaId}, replace(ds.area_divide_ids, ' ', ''))
+ </if>
</where>
</select>
--
Gitblit v1.9.3