From 8ac34cbae4ea8cc47194f51389a4e2dddebcc7d5 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 13:55:20 +0800
Subject: [PATCH] opt: sql改造其他模块改造7
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml | 48 +++++++++++++++++++++++++++---------------------
1 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
index 5ebbd1b..aeb8b0a 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
@@ -26,7 +26,7 @@
dsm.*,
ds.scene_name as defense_scene_name
from ja_fw_defense_scene_manage dsm
- left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
+ left join ja_fw_defense_scene ds on ds.id::VARCHAR = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0
<where>
dsm.is_deleted = 0
<if test="param2.name != null and param2.name != ''">
@@ -46,7 +46,7 @@
dsm.*,
ds.scene_name as defense_scene_name
from ja_fw_defense_scene_manage dsm
- left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
+ left join ja_fw_defense_scene ds on ds.id::VARCHAR = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0
where dsm.is_deleted = 0
and dsm.id = #{id}
</select>
@@ -61,23 +61,25 @@
else length(ds.area_divide_ids) - length(replace(ds.area_divide_ids, ',', '')) + 1
end as area_count,
(
- select ifnull(sum(
- case
- when ad.device_ids is null or ad.device_ids = '' then 0
- else length(ad.device_ids) - length(replace(ad.device_ids, ',', '')) + 1
- end
- ), 0)
+ SELECT COALESCE(
+ SUM( -- 这里已经删除了那两个反引号 ``
+ CASE
+ WHEN ad.device_ids IS NULL OR ad.device_ids = '' THEN 0
+ ELSE length(ad.device_ids) - length(replace(ad.device_ids, ',', '')) + 1
+ END
+ ), 0
+ )
from ja_fw_area_divide ad
where ad.is_deleted = 0
- and find_in_set(ad.id, ds.area_divide_ids) > 0
+ and ad.id::VARCHAR = ANY(string_to_array(ds.area_divide_ids, ','))
) as device_count
from ja_fw_defense_scene_manage dsm
- left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
+ left join ja_fw_defense_scene ds on ds.id::VARCHAR = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0
<where>
dsm.is_deleted = 0
<if test="time != null">
- and (dsm.effective_date_start is null or dsm.effective_date_start <= #{time})
- and (dsm.effective_date_end is null or dsm.effective_date_end >= #{time})
+ and (dsm.effective_date_start is null or dsm.effective_date_start <= #{time}::timestamp)
+ and (dsm.effective_date_end is null or dsm.effective_date_end >= #{time}::timestamp)
</if>
</where>
</select>
@@ -102,8 +104,8 @@
SELECT
ad.device_ids
FROM ja_fw_defense_scene_manage dsm
- LEFT JOIN ja_fw_defense_scene ds ON ds.id = dsm.defense_scene_id AND ds.is_deleted = 0
- LEFT JOIN ja_fw_area_divide ad ON FIND_IN_SET(ad.id, ds.area_divide_ids) > 0 AND ad.is_deleted = 0
+ LEFT JOIN ja_fw_defense_scene ds ON ds.id::VARCHAR = dsm.defense_scene_id::VARCHAR AND ds.is_deleted = 0
+ LEFT JOIN ja_fw_area_divide ad ON ad.id = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[]) AND ad.is_deleted = 0
WHERE dsm.id = #{id}
) ad ON CHAR_LENGTH(ad.device_ids) - CHAR_LENGTH(REPLACE(ad.device_ids, ',', '')) >= numbers.n - 1
WHERE ad.device_ids IS NOT NULL AND ad.device_ids != ''
@@ -114,8 +116,8 @@
dsm.*,
ds.scene_name as defense_scene_name
from ja_fw_defense_scene_manage dsm
- left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
- left join ja_fw_area_divide ad on FIND_IN_SET(ad.id, ds.area_divide_ids) > 0 and ad.is_deleted = 0
+ left join ja_fw_defense_scene ds on ds.id::VARCHAR = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0
+ left join ja_fw_area_divide ad on ad.id = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[]) and ad.is_deleted = 0
inner join (
SELECT
d.id
@@ -125,12 +127,12 @@
d.is_deleted = 0
AND d.is_enabled = 1
AND d.final_outbound_area IS NOT NULL
- <if test="regionCode != null and regionCode != ''">
- and ( d.final_outbound_area_code like concat(#{regionCode},'%')
- <if test="currentDeptId != null and currentDeptId != '' ">
+ <if test="fwBaseInfo.regionCode != null and fwBaseInfo.regionCode != ''">
+ and ( d.final_outbound_area_code like concat(#{fwBaseInfo.regionCode},'%')
+ <if test="fwBaseInfo.currentDeptId != null and fwBaseInfo.currentDeptId != '' ">
or d.id in (
SELECT device_id FROM ja_fw_device_per_share
- WHERE loan_to_dept_id = #{currentDeptId}
+ WHERE loan_to_dept_id = #{fwBaseInfo.currentDeptId}
AND is_deleted = 0
)
</if>
@@ -138,9 +140,13 @@
</if>
GROUP BY
d.id
- ) dd on find_in_set(dd.id, ad.device_ids)
+ ) dd on dd.id = ANY(string_to_array(replace(ad.device_ids, ' ', ''), ',')::bigint[])
<where>
dsm.is_deleted = 0
+ <if test="time != null">
+ and (dsm.effective_date_start is null or dsm.effective_date_start <= #{time})
+ and (dsm.effective_date_end is null or dsm.effective_date_end >= #{time})
+ </if>
</where>
</select>
--
Gitblit v1.9.3