jagzwxm/ja_manage.git

			@@ -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. 场景名称聚合 (已补全参数和类型)
			(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
			from ja_fw_area_divide ad

			-- 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)
			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 d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))) 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
			WHERE ee.is_deleted = 0
			AND d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))) 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
			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
			<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>