From 3dcef55348087d16bb6d2c5f604f3cfa52425fb8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 15:05:07 +0800
Subject: [PATCH] opt: sql改造其他模块改造9
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml | 111 ++++++++++++++++++++++++++++---------------------------
1 files changed, 57 insertions(+), 54 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
index ac2b129..970e5e5 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
@@ -457,73 +457,76 @@
from ja_fw_area_divide ad
left join ja_fw_police_station ps on ps.id::VARCHAR = ad.police_station_id::VARCHAR and ps.is_deleted = 0
inner join (
- SELECT
- d.id
- FROM
- ja_fw_device d
- WHERE
- 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 != '' ">
- 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.id
- ) dd on dd.id = ANY(string_to_array(replace(ad.device_ids, ' ', ''), ',')::bigint[])
+ SELECT
+ d.id
+ FROM
+ ja_fw_device d
+ WHERE
+ 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 != '' ">
+ or d.id in (
+ SELECT device_id FROM ja_fw_device_per_share
+ /* 修改点1：参数强制转为 bigint 匹配数据库字段 */
+ WHERE loan_to_dept_id = #{currentDeptId}::bigint
+ AND is_deleted = 0
+ )
+ </if>
+ )
+ </if>
+ GROUP BY
+ d.id
+ /* 修改点2：dd.id 是 bigint，转 VARCHAR 匹配文本数组，去掉不稳定的 ::bigint[] */
+ ) dd on dd.id::VARCHAR = ANY(string_to_array(replace(ad.device_ids, ' ', ''), ','))
<where>
ad.is_deleted = 0
<if test="isSetSceneManage != null and isSetSceneManage == 1">
and exists (
select 1
- from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0
- where ds.is_deleted = 0
- and ds.area_divide_ids is not null
- and ds.area_divide_ids != ''
- and ad.id = ANY(string_to_array(replace(ds.area_divide_ids, ' ', ''), ',')::bigint[])
+ from ja_fw_defense_scene ds_sub
+ join ja_fw_defense_scene_manage dsm_sub on dsm_sub.defense_scene_id::VARCHAR = ds_sub.id::VARCHAR and dsm_sub.is_deleted = 0
+ where ds_sub.is_deleted = 0
+ and ds_sub.area_divide_ids is not null
+ and ds_sub.area_divide_ids != ''
+ /* 修改点3：ad.id 转 VARCHAR 匹配 ANY */
+ and ad.id::VARCHAR = ANY(string_to_array(replace(ds_sub.area_divide_ids, ' ', ''), ','))
)
</if>
<if test="isSetSceneManage != null and isSetSceneManage == 1 and flyTime != null">
and exists (
select 1
- from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0
- where ds.is_deleted = 0
- and ds.area_divide_ids is not null
- and ds.area_divide_ids != ''
- and ad.id = ANY(string_to_array(replace(ds.area_divide_ids, ' ', ''), ',')::bigint[])
- and (dsm.effective_date_start is null or dsm.effective_date_start <= #{flyTime})
- and (dsm.effective_date_end is null or dsm.effective_date_end >= #{flyTime})
+ from ja_fw_defense_scene ds_sub2
+ join ja_fw_defense_scene_manage dsm_sub2 on dsm_sub2.defense_scene_id::VARCHAR = ds_sub2.id::VARCHAR and dsm_sub2.is_deleted = 0
+ where ds_sub2.is_deleted = 0
+ and ds_sub2.area_divide_ids is not null
+ and ds_sub2.area_divide_ids != ''
+ and ad.id::VARCHAR = ANY(string_to_array(replace(ds_sub2.area_divide_ids, ' ', ''), ','))
+ and (dsm_sub2.effective_date_start is null or dsm_sub2.effective_date_start <= #{flyTime})
+ and (dsm_sub2.effective_date_end is null or dsm_sub2.effective_date_end >= #{flyTime})
)
</if>
<if test="filterSelected != null and filterSelected == 1">
and (
not exists (
select 1
- from ja_fw_defense_scene ds
- where ds.is_deleted = 0
- and ds.area_divide_ids is not null
- and ds.area_divide_ids != ''
- and ad.id = ANY(string_to_array(replace(ds.area_divide_ids, ' ', ''), ',')::bigint[])
+ from ja_fw_defense_scene ds_sub3
+ where ds_sub3.is_deleted = 0
+ and ds_sub3.area_divide_ids is not null
+ and ds_sub3.area_divide_ids != ''
+ and ad.id::VARCHAR = ANY(string_to_array(replace(ds_sub3.area_divide_ids, ' ', ''), ','))
)
<if test="sceneId != null">
or exists (
select 1
- from ja_fw_defense_scene ds
- where ds.is_deleted = 0
- and ds.id = #{sceneId}
- and ds.area_divide_ids is not null
- and ds.area_divide_ids != ''
- and ad.id = ANY(string_to_array(replace(ds.area_divide_ids, ' ', ''), ',')::bigint[])
+ from ja_fw_defense_scene ds_sub4
+ where ds_sub4.is_deleted = 0
+ and ds_sub4.id = #{sceneId}::bigint
+ and ds_sub4.area_divide_ids is not null
+ and ds_sub4.area_divide_ids != ''
+ and ad.id::VARCHAR = ANY(string_to_array(replace(ds_sub4.area_divide_ids, ' ', ''), ','))
)
</if>
)
@@ -531,18 +534,18 @@
<if test="sceneId != null and (filterSelected == null or filterSelected != 1)">
and exists (
select 1
- from ja_fw_defense_scene ds
- where ds.is_deleted = 0
- and ds.id = #{sceneId}
- and ds.area_divide_ids is not null
- and ds.area_divide_ids != ''
- and ad.id = ANY(string_to_array(replace(ds.area_divide_ids, ' ', ''), ',')::bigint[])
+ from ja_fw_defense_scene ds_sub5
+ where ds_sub5.is_deleted = 0
+ and ds_sub5.id = #{sceneId}::bigint
+ and ds_sub5.area_divide_ids is not null
+ and ds_sub5.area_divide_ids != ''
+ and ad.id::VARCHAR = ANY(string_to_array(replace(ds_sub5.area_divide_ids, ' ', ''), ','))
)
</if>
<if test="areaTypeKeyList != null and areaTypeKeyList.size > 0">
and (
<foreach collection="areaTypeKeyList" item="key" separator=" or ">
- ARRAY_POSITION(string_to_array(ad.area_type_keys, ','), #{key}) IS NOT NULL
+ ARRAY_POSITION(string_to_array(ad.area_type_keys, ','), #{key}::VARCHAR) IS NOT NULL
</foreach>
)
</if>
--
Gitblit v1.9.3