From 8585b431e9257333413358eb37c30ae58f74db76 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 13 Aug 2026 15:46:10 +0800
Subject: [PATCH] refactor(database): 优化数据库查询中的字段映射
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml | 381 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 271 insertions(+), 110 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 71cf5bc..47c700f 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
@@ -23,6 +23,7 @@
<resultMap id="fwAreaDivideStatisticsResultMap" type="org.sxkj.fw.area.vo.FwAreaDivideStatisticsVO">
<result column="id" property="id"/>
<result column="area_name" property="areaName"/>
+ <result column="area_type_keys" property="areaTypeKeys"/>
<result column="scene_name" property="sceneName"/>
<result column="scene_type" property="sceneType"/>
<result column="device_count" property="deviceCount"/>
@@ -42,7 +43,7 @@
from
ja_fw_area_divide ad
left join
- ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
+ ja_fw_police_station ps on ps.id::VARCHAR = ad.police_station_id::VARCHAR and ps.is_deleted = 0
<where>
ad.is_deleted = 0
<if test="param2.id != null and param2.id != ''">
@@ -75,6 +76,13 @@
<if test="param2.areaCode != null and param2.areaCode != ''">
and ad.area_code = #{param2.areaCode}
</if>
+ <if test="param2.areaTypeKeyList != null and param2.areaTypeKeyList.size > 0">
+ and (
+ <foreach collection="param2.areaTypeKeyList" item="key" separator=" or ">
+ ARRAY_POSITION(string_to_array(ad.area_type_keys, ','), #{key}::text) IS NOT NULL
+ </foreach>
+ )
+ </if>
<if test="param2.deptList != null and param2.deptList.size > 0">
and ad.create_dept in
<foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
@@ -91,9 +99,39 @@
ps.contact_person as police_station_contact_person,
ps.contact_phone as police_station_contact_phone
from ja_fw_area_divide ad
- left join ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
+ left join ja_fw_police_station ps on ps.id::VARCHAR = ad.police_station_id::VARCHAR and ps.is_deleted = 0
<where>
- ad.is_deleted = 0
+ ad.is_deleted = 0
+ <if test="deptList != null and deptList.size > 0">
+ and ad.create_dept in
+ <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
+ <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[])
+ )
+ </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})
+ )
+ </if>
<if test="filterSelected != null and filterSelected == 1">
and (
not exists (
@@ -102,7 +140,7 @@
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
- and find_in_set(ad.id, replace(ds.area_divide_ids, ' ', ''))
+ and ad.id = ANY(string_to_array(replace(ds.area_divide_ids, ' ', ''), ',')::bigint[])
)
<if test="sceneId != null">
or exists (
@@ -112,7 +150,7 @@
and ds.id = #{sceneId}
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
- and find_in_set(ad.id, replace(ds.area_divide_ids, ' ', ''))
+ and ad.id = ANY(string_to_array(replace(ds.area_divide_ids, ' ', ''), ',')::bigint[])
)
</if>
)
@@ -125,7 +163,14 @@
and ds.id = #{sceneId}
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
- and find_in_set(ad.id, replace(ds.area_divide_ids, ' ', ''))
+ and ad.id = ANY(string_to_array(replace(ds.area_divide_ids, ' ', ''), ',')::bigint[])
+ )
+ </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}::text) IS NOT NULL
+ </foreach>
)
</if>
</where>
@@ -144,7 +189,7 @@
<if test="deviceIds != null and deviceIds.size > 0">
and (
<foreach collection="deviceIds" item="deviceId" separator=" or ">
- find_in_set(#{deviceId}, replace(ad.device_ids, ' ', ''))
+ #{deviceId} = ANY(string_to_array(replace(ad.device_ids, ' ', ''), ',')::bigint[])
</foreach>
)
</if>
@@ -164,7 +209,7 @@
<if test="areaIds != null and areaIds.size > 0">
and (
<foreach collection="areaIds" item="areaId" separator=" or ">
- find_in_set(#{areaId}, replace(ds.area_divide_ids, ' ', ''))
+ #{areaId} = ANY(string_to_array(replace(ds.area_divide_ids, ' ', ''), ',')::bigint[])
</foreach>
)
</if>
@@ -178,7 +223,7 @@
ad.is_deleted = 0
and ad.device_ids is not null
and ad.device_ids != ''
- and find_in_set(#{deviceId}, replace(ad.device_ids, ' ', ''))
+ and #{deviceId} = ANY(string_to_array(replace(ad.device_ids, ' ', ''), ',')::bigint[])
</where>
</select>
@@ -189,106 +234,106 @@
ps.contact_person as police_station_contact_person,
ps.contact_phone as police_station_contact_phone
from ja_fw_area_divide ad
- left join ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
+ left join ja_fw_police_station ps on ps.id::VARCHAR = ad.police_station_id::VARCHAR and ps.is_deleted = 0
where ad.is_deleted = 0
and ad.id = #{id}
</select>
<select id="selectFwAreaDivideStatisticsPage" resultMap="fwAreaDivideStatisticsResultMap">
select
- stats.id,
- stats.area_name,
- stats.scene_name,
- stats.scene_type,
- stats.device_count,
- stats.alarm_count,
- stats.counter_count,
- stats.counter_success_count,
- case
- when stats.counter_count = 0 then '/'
- when stats.counter_success_count * 100.0 / stats.counter_count >= 80 then '好'
- when stats.counter_success_count * 100.0 / stats.counter_count >= 60 then '一般'
- else '差'
- end as control_effect
+ stats.id,
+ stats.area_name,
+ stats.area_type_keys,
+ stats.scene_name,
+ stats.scene_type,
+ stats.device_count,
+ stats.alarm_count,
+ stats.counter_count,
+ stats.counter_success_count,
+ case
+ when stats.counter_count = 0 then '/'
+ when stats.counter_success_count * 100.0 / stats.counter_count >= 80 then '好'
+ when stats.counter_success_count * 100.0 / stats.counter_count >= 60 then '一般'
+ else '差'
+ end as control_effect
from (
- select
- ad.id,
- ad.area_name,
- (
- select group_concat(distinct ds.scene_name)
+ 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::text = ds.id::text AND dsm.is_deleted = 0
+ WHERE ds.is_deleted = 0
+ AND ad.id::text = 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::text = ds.id::text AND dsm.is_deleted = 0
+ WHERE ds.is_deleted = 0
+ AND ad.id::text = ANY(string_to_array(ds.area_divide_ids, ','))) AS scene_type,
+
+ 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 = ar.device_id AND d.is_deleted = 0
+ WHERE ar.is_deleted = 0
+ AND d.id = ANY(string_to_array(replace(ad.device_ids, ' ', ''), ',')::bigint[])) 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 AND d.is_deleted = 0
+ WHERE ee.is_deleted = 0
+ AND d.id = ANY(string_to_array(replace(ad.device_ids, ' ', ''), ',')::bigint[])) 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 AND d.is_deleted = 0
+ WHERE ee.is_deleted = 0 AND ee.counter_effect = '1'
+ AND d.id = 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::text = ds.id::text AND dsm.is_deleted = 0
+ WHERE ds.is_deleted = 0
+ AND ad.id::text = ANY(string_to_array(ds.area_divide_ids, ','))
+ )
+ <if test="param2.id != null and param2.id != ''">
+ and ad.id = #{param2.id}::bigint
+ </if>
+ <if test="param2.areaName != null and param2.areaName != ''">
+ and ad.area_name like concat('%', #{param2.areaName}, '%')
+ </if>
+ <if test="param2.sceneType != null and param2.sceneType != ''">
+ and exists (
+ select 1
from ja_fw_defense_scene ds
where ds.is_deleted = 0
- and find_in_set(ad.id, ds.area_divide_ids)
- ) as scene_name,
- (
- select group_concat(distinct ds.scene_type)
- from ja_fw_defense_scene ds
- where ds.is_deleted = 0
- and find_in_set(ad.id, ds.area_divide_ids)
- ) as scene_type,
- 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 = ar.device_id and d.is_deleted = 0
- where ar.is_deleted = 0
- and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
+ and ad.id::text = ANY(string_to_array(ds.area_divide_ids, ','))
+ and ds.scene_type = #{param2.sceneType}
)
- 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 and d.is_deleted = 0
- where ee.is_deleted = 0
- and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
+ </if>
+ <if test="param2.areaCode != null and param2.areaCode != ''">
+ and ad.area_code = #{param2.areaCode}
+ </if>
+ <if test="param2.areaTypeKeyList != null and param2.areaTypeKeyList.size > 0">
+ and (
+ <foreach collection="param2.areaTypeKeyList" item="key" separator=" or ">
+ array_position(string_to_array(ad.area_type_keys, ','), #{key}::text) is not null
+ </foreach>
)
- 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 and d.is_deleted = 0
- where ee.is_deleted = 0
- and ee.counter_effect = 'success'
- and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
- )
- end as counter_success_count
- from ja_fw_area_divide ad
- <where>
- ad.is_deleted = 0
- <if test="param2.id != null and param2.id != ''">
- and ad.id = #{param2.id}
- </if>
- <if test="param2.areaName != null and param2.areaName != ''">
- and ad.area_name like concat('%', #{param2.areaName}, '%')
- </if>
- <if test="param2.sceneType != null and param2.sceneType != ''">
- and exists (
- select 1
- from ja_fw_defense_scene ds
- where ds.is_deleted = 0
- and find_in_set(ad.id, ds.area_divide_ids)
- and ds.scene_type = #{param2.sceneType}
- )
- </if>
- <if test="param2.areaCode != null and param2.areaCode != ''">
- and ad.area_code = #{param2.areaCode}
- </if>
- <if test="param2.deptList != null and param2.deptList.size > 0">
- and ad.create_dept in
- <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
- #{deptId}
- </foreach>
- </if>
- </where>
+ </if>
+ <if test="param2.deptList != null and param2.deptList.size > 0">
+ and ad.create_dept in
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}::bigint
+ </foreach>
+ </if>
+ </where>
) stats
</select>
@@ -296,6 +341,7 @@
select
stats.id,
stats.area_name,
+ stats.area_type_keys,
stats.scene_name,
stats.scene_type,
stats.device_count,
@@ -312,17 +358,18 @@
select
ad.id,
ad.area_name,
+ ad.area_type_keys,
(
- select group_concat(distinct ds.scene_name)
+ select string_agg(distinct ds.scene_name, ',')
from ja_fw_defense_scene ds
where ds.is_deleted = 0
- and find_in_set(ad.id, ds.area_divide_ids)
+ and ad.id = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[])
) as scene_name,
(
- select group_concat(distinct ds.scene_type)
+ select string_agg(distinct ds.scene_type, ',')
from ja_fw_defense_scene ds
where ds.is_deleted = 0
- and find_in_set(ad.id, ds.area_divide_ids)
+ and ad.id = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[])
) as scene_type,
case
when ad.device_ids is null or trim(ad.device_ids) = '' then 0
@@ -333,9 +380,9 @@
else (
select count(1)
from ja_fw_drone_alarm_record ar
- join ja_fw_device d on d.id = ar.device_id and d.is_deleted = 0
+ join ja_fw_device d on d.id = ar.device_id::VARCHAR and d.is_deleted = 0
where ar.is_deleted = 0
- and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
+ and d.id = ANY(string_to_array(replace(ad.device_ids, ' ', ''), ',')::bigint[])
)
end as alarm_count,
case
@@ -343,9 +390,9 @@
else (
select count(1)
from ja_fw_effect_eval ee
- join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
+ join ja_fw_device d on d.id = ee.device_id::VARCHAR and d.is_deleted = 0
where ee.is_deleted = 0
- and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
+ and d.id = ANY(string_to_array(replace(ad.device_ids, ' ', ''), ',')::bigint[])
)
end as counter_count,
case
@@ -353,10 +400,10 @@
else (
select count(1)
from ja_fw_effect_eval ee
- join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
+ 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 = 'success'
- and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
+ and d.id = ANY(string_to_array(replace(ad.device_ids, ' ', ''), ',')::bigint[])
)
end as counter_success_count
from ja_fw_area_divide ad
@@ -393,6 +440,120 @@
status,
is_deleted
FROM ja_fw_area_divide ${ew.customSqlSegment}
+ </select>
+
+ <select id="selectFwAreaDivideListCockpit" resultType="org.sxkj.fw.area.vo.FwAreaDivideVO">
+ select
+ ad.*,
+ ps.station_name as police_station_name,
+ ps.contact_person as police_station_contact_person,
+ ps.contact_phone as police_station_contact_phone
+ 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
+ /* 修改点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_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_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_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_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>
+ )
+ </if>
+ <if test="sceneId != null and (filterSelected == null or filterSelected != 1)">
+ and exists (
+ select 1
+ 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}::VARCHAR) IS NOT NULL
+ </foreach>
+ )
+ </if>
+ </where>
+ </select>
+
+ <select id="checkAreaBindScene" resultType="java.lang.Boolean">
+ select
+ count(1)
+ from ja_fw_defense_scene_manage dsm
+ left join ja_fw_defense_scene ds on ds.id::VARCHAR = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0
+ where ds.is_deleted = 0
+ and #{areaId} = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[])
+ and dsm.is_deleted = 0
</select>
<insert id="insertWithGeom" parameterType="org.sxkj.fw.area.entity.FwAreaDivideEntity" useGeneratedKeys="true" keyProperty="id">
@@ -432,8 +593,8 @@
#{createTime},
#{updateUser},
#{updateTime},
- IFNULL(#{status}, '0'),
- IFNULL(#{isDeleted}, 0)
+ COALESCE(#{status}, '0'),
+ COALESCE(#{isDeleted}, 0)
)
</insert>
--
Gitblit v1.9.3