From 80190d87ee000f6433da66dcd45c0af56e7db581 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 14:47:07 +0800
Subject: [PATCH] opt: sql改造其他模块改造9
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 1e1851f..ac2b129 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
@@ -261,45 +261,45 @@
ad.id,
ad.area_name,
ad.area_type_keys,
- -- 1. 场景名称聚合 (已补全参数和类型)
+ -- 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,
- -- 2. 场景类型聚合
+ -- 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. 设备数量统计
+ -- 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)
+ -- 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::VARCHAR = ar.device_id::VARCHAR AND d.is_deleted = 0
+ 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::VARCHAR = ANY(string_to_array(ad.device_ids, ','))) END AS alarm_count,
+ 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::VARCHAR = ee.device_id::VARCHAR AND d.is_deleted = 0
+ 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::VARCHAR = ANY(string_to_array(ad.device_ids, ','))) END AS counter_count,
+ 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::VARCHAR = ee.device_id::VARCHAR AND d.is_deleted = 0
+ 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::VARCHAR = ANY(string_to_array(ad.device_ids, ','))) END AS counter_success_count
- from ja_fw_area_divide ad
+ 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 (
--
Gitblit v1.9.3