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 | 211 +++++++++++++++++++++++++---------------------------
1 files changed, 102 insertions(+), 109 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 979404b..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
@@ -258,65 +258,55 @@
end as control_effect
from (
select
- ad.id,
- ad.area_name,
- ad.area_type_keys,
- (
- select string_agg(distinct ds.scene_name, ',')
- 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
+ ad.id,
+ ad.area_name,
+ ad.area_type_keys,
+ -- 1. 场景名称聚合 (已补全 string_agg 参数并统一类型)
+ (SELECT string_agg(DISTINCT ds.scene_name, ',')
+ 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 ad.id::VARCHAR = ANY(string_to_array(ds.area_divide_ids, ','))) AS scene_name,
- (
- select string_agg(distinct ds.scene_type, ',')
- 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 ad.id::VARCHAR = ANY(string_to_array(ds.area_divide_ids, ','))) AS scene_name,
- case
- when ad.device_ids is null or trim(ad.device_ids) = '' then 0
- else length(replace(ad.device_ids, ' ', '')) - length(replace(replace(ad.device_ids, ' ', ''), ',', '')) + 1
- end as device_count,
- case
- when ad.device_ids is null or trim(ad.device_ids) = '' then 0
- else (
- select count(1)
- from ja_fw_drone_alarm_record ar
- join ja_fw_device d on d.id::VARCHAR = ar.device_id::VARCHAR and d.is_deleted = 0
- where ar.is_deleted = 0
- and ad.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
- )
- end as alarm_count,
- case
- when ad.device_ids is null or trim(ad.device_ids) = '' then 0
- else (
- select count(1)
- from ja_fw_effect_eval ee
- join ja_fw_device d on d.id = ee.device_id::VARCHAR and d.is_deleted = 0
- where ee.is_deleted = 0
- and ad.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
- )
- end as counter_count,
- case
- when ad.device_ids is null or trim(ad.device_ids) = '' then 0
- else (
- select count(1)
- from ja_fw_effect_eval ee
- join ja_fw_device d on d.id = ee.device_id::VARCHAR and d.is_deleted = 0
- where ee.is_deleted = 0
- and ee.counter_effect = '1'
- and ad.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
- )
- end as counter_success_count
+
+ -- 2. 场景类型聚合 (修正别名重复)
+ (SELECT string_agg(DISTINCT ds.scene_type, ',')
+ 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 ad.id::VARCHAR = ANY(string_to_array(ds.area_divide_ids, ','))) AS scene_type,
+
+ -- 3. 设备数量计算
+ CASE WHEN ad.device_ids IS NULL OR trim(ad.device_ids) = '' THEN 0
+ ELSE length(replace(ad.device_ids, ' ', '')) - length(replace(replace(ad.device_ids, ' ', ''), ',', '')) + 1 END AS device_count,
+
+ -- 4. 告警数量统计 (确保 d.id::VARCHAR 对齐) ANY(string_to_array(replace(ad.device_ids, ' ', ''), ',')::bigint[])
+ CASE WHEN ad.device_ids IS NULL OR trim(ad.device_ids) = '' THEN 0
+ ELSE (SELECT count(1) FROM ja_fw_drone_alarm_record ar
+ JOIN ja_fw_device d ON d.id::bigint = ar.device_id::bigint AND d.is_deleted = 0
+ WHERE ar.is_deleted = 0
+ AND d.id::bigint = ANY(string_to_array(replace(ad.device_ids, ' ', ''), ',')::bigint[])) END AS alarm_count,
+
+ -- 5. 效果评估数量统计 (修正点：d.id::VARCHAR)
+ CASE WHEN ad.device_ids IS NULL OR trim(ad.device_ids) = '' THEN 0
+ ELSE (SELECT count(1) FROM ja_fw_effect_eval ee
+ JOIN ja_fw_device d ON d.id::bigint = ee.device_id::bigint AND d.is_deleted = 0
+ WHERE ee.is_deleted = 0
+ AND d.id::bigint = ANY(string_to_array(replace(ad.device_ids, ' ', ''), ',')::bigint[])) END AS counter_count,
+
+ -- 6. 成功反制数量统计 (修正点：d.id::VARCHAR)
+ CASE WHEN ad.device_ids IS NULL OR trim(ad.device_ids) = '' THEN 0
+ ELSE (SELECT count(1) FROM ja_fw_effect_eval ee
+ JOIN ja_fw_device d ON d.id::bigint = ee.device_id::bigint AND d.is_deleted = 0
+ WHERE ee.is_deleted = 0 AND ee.counter_effect = '1'
+ AND d.id::bigint = ANY(string_to_array(replace(ad.device_ids, ' ', ''), ',')::bigint[])) END AS counter_success_count
from ja_fw_area_divide ad
<where>
ad.is_deleted = 0
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 ad.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ 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 ad.id::VARCHAR = ANY(string_to_array(ds.area_divide_ids, ','))
)
<if test="param2.id != null and param2.id != ''">
and ad.id = #{param2.id}
@@ -329,7 +319,7 @@
select 1
from ja_fw_defense_scene ds
where ds.is_deleted = 0
- and ad.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ and ad.id::VARCHAR = ANY(string_to_array(ds.area_divide_ids, ','))
and ds.scene_type = #{param2.sceneType}
)
</if>
@@ -467,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>
)
@@ -541,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