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/FwAreaDivideMapper.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 4950426..979404b 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
@@ -262,7 +262,7 @@
ad.area_name,
ad.area_type_keys,
(
- select string_agg(distinct ds.scene_name)
+ 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
@@ -282,9 +282,9 @@
else (
select count(1)
from ja_fw_drone_alarm_record ar
- join ja_fw_device d on d.id = ar.device_id::VARCHAR and d.is_deleted = 0
+ 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, ','))
+ and ad.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
)
end as alarm_count,
case
@@ -294,7 +294,7 @@
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 d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ and ad.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
)
end as counter_count,
case
@@ -305,7 +305,7 @@
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 d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ and ad.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
)
end as counter_success_count
from ja_fw_area_divide ad
@@ -316,7 +316,7 @@
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 d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ and ad.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
)
<if test="param2.id != null and param2.id != ''">
and ad.id = #{param2.id}
@@ -329,7 +329,7 @@
select 1
from ja_fw_defense_scene ds
where ds.is_deleted = 0
- and d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ and ad.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
and ds.scene_type = #{param2.sceneType}
)
</if>
--
Gitblit v1.9.3