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/device/mapper/FwDeviceMapper.xml | 557 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 352 insertions(+), 205 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
index 29dd3fa..e59b1c8 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
@@ -86,10 +86,10 @@
and status = #{param2.status}
</if>
<if test="param2.isTrack != null and param2.isTrack == 1">
- and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) > 0
+ and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id::VARCHAR) > 0
</if>
<if test="param2.isTrack != null and param2.isTrack == 2">
- and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) = 0
+ and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id::VARCHAR) = 0
</if>
<if test="param2.deptList != null and param2.deptList.size > 0">
and ( create_dept in
@@ -107,6 +107,8 @@
)
</if>
</where>
+ order by
+ create_time desc
</select>
<select id="selectFwDeviceList" resultMap="fwDeviceResultMap">
@@ -126,7 +128,7 @@
</foreach>
and ad.device_ids is not null
and ad.device_ids != ''
- and find_in_set(ja_fw_device.id, ad.device_ids)
+ and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
)
)
</when>
@@ -141,7 +143,7 @@
and ad.id = #{areaId}
and ad.device_ids is not null
and ad.device_ids != ''
- and find_in_set(ja_fw_device.id, ad.device_ids)
+ and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
)
or not exists (
select 1
@@ -149,7 +151,7 @@
where ad.is_deleted = 0
and ad.device_ids is not null
and ad.device_ids != ''
- and find_in_set(ja_fw_device.id, ad.device_ids)
+ and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
and ad.id != #{areaId}
)
</when>
@@ -160,7 +162,7 @@
where ad.is_deleted = 0
and ad.device_ids is not null
and ad.device_ids != ''
- and find_in_set(ja_fw_device.id, ad.device_ids)
+ and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
)
</otherwise>
</choose>
@@ -171,10 +173,10 @@
and status = #{status}
</if>
<if test="isTrack != null and isTrack == 1">
- and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) > 0
+ and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id::VARCHAR) > 0
</if>
<if test="isTrack != null and isTrack == 2">
- and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) = 0
+ and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id::VARCHAR) = 0
</if>
</where>
</select>
@@ -195,7 +197,7 @@
and ad.id = #{query.areaId}
and ad.device_ids is not null
and ad.device_ids != ''
- and find_in_set(ja_fw_device.id, ad.device_ids)
+ and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
)
or not exists (
select 1
@@ -203,7 +205,7 @@
where ad.is_deleted = 0
and ad.device_ids is not null
and ad.device_ids != ''
- and find_in_set(ja_fw_device.id, ad.device_ids)
+ and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
and ad.id != #{query.areaId}
)
</when>
@@ -214,7 +216,7 @@
where ad.is_deleted = 0
and ad.device_ids is not null
and ad.device_ids != ''
- and find_in_set(ja_fw_device.id, ad.device_ids)
+ and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
)
</otherwise>
</choose>
@@ -224,10 +226,10 @@
and status = #{query.status}
</if>
<if test="query.isTrack != null and query.isTrack == 1">
- and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) > 0
+ and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id::VARCHAR) > 0
</if>
<if test="query.isTrack != null and query.isTrack == 2">
- and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) = 0
+ and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id::VARCHAR) = 0
</if>
and longitude is not null
and longitude != ''
@@ -254,73 +256,102 @@
<!-- 统计设备类型（察打一体同时计入侦测和反制） -->
<select id="statisticalDeviceType" resultType="org.sxkj.fw.cockpit.vo.DeviceStatisticsVO">
SELECT
- CASE split_device_type -- 自定义排序（可选）
- WHEN '1' THEN '侦测设备'
- WHEN '2' THEN '反制设备'
- ELSE '其他'
- END AS type,
- COUNT(*) AS count
+ CASE split_device_type
+ WHEN '1' THEN '侦测设备'
+ WHEN '2' THEN '反制设备'
+ ELSE '其他'
+ END AS type,
+ COUNT(*) AS count
FROM (
- -- 子查询：拆分察打一体设备为侦测/反制两类
- SELECT
- id,
- CASE
- WHEN
- device_type = '3' THEN '1' -- 察打一体拆分为侦测
- ELSE
- device_type
- END AS
- split_device_type
- FROM
- ja_fw_device d
- WHERE
- d.is_deleted = 0
- AND d.is_enabled = 1
- AND status != 3
- <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>
+ -- 子查询：拆分察打一体设备为侦测/反制两类
+ SELECT
+ d.id,
+ CASE
+ WHEN device_type = '3' THEN '1' -- 察打一体拆分为侦测
+ ELSE device_type::VARCHAR
+ END AS split_device_type
+ FROM
+ ja_fw_device d
+ LEFT JOIN ja_fw_area_divide ad
+ /* 修改点1：统一用 VARCHAR 对齐，移除容易崩溃的 ::bigint[] */
+ ON d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ AND ad.is_deleted = 0
+ WHERE
+ d.is_deleted = 0
+ AND d.is_enabled = 1
+ /* 修改点2：修正 bpchar <> integer 报错，给 3 加引号 */
+ AND d.status::VARCHAR != '3'
+ <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
+ /* 修改点3：loan_to_dept_id 强制转 bigint 匹配参数 */
+ WHERE loan_to_dept_id = #{currentDeptId}::bigint
+ AND is_deleted = 0
)
</if>
+ )
+ </if>
+ <if test="flyTime != null">
+ 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 != ''
+ /* 修改点4：ad.id 转 VARCHAR 匹配 ANY */
+ and ad.id::VARCHAR = ANY(string_to_array(replace(ds_sub.area_divide_ids, ' ', ''), ','))
+ and (dsm_sub.effective_date_start is null or dsm_sub.effective_date_start <= #{flyTime})
+ and (dsm_sub.effective_date_end is null or dsm_sub.effective_date_end >= #{flyTime})
+ )
+ </if>
- UNION ALL -- 合并拆分的反制部分
+ UNION ALL -- 合并拆分的反制部分
- SELECT
- id,
- CASE
- WHEN
- device_type = '3' THEN '2' -- 察打一体拆分为反制
- ELSE
- device_type
- END AS
- split_device_type
- FROM
- ja_fw_device d
- WHERE
- d.is_deleted = 0
- AND is_enabled = 1
- AND status != 3
- AND device_type = '3'
- <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>
+ SELECT
+ d.id,
+ CASE
+ WHEN device_type = '3' THEN '2' -- 察打一体拆分为反制
+ ELSE device_type::VARCHAR
+ END AS split_device_type
+ FROM
+ ja_fw_device d
+ LEFT JOIN ja_fw_area_divide ad
+ on d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ AND ad.is_deleted = 0
+ WHERE
+ d.is_deleted = 0
+ AND is_enabled = 1
+ /* 修改点5：修正 bpchar <> integer 报错 */
+ AND d.status::VARCHAR != '3'
+ AND device_type = '3'
+ <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}::bigint
+ AND is_deleted = 0
)
</if>
- ) AS temp
+ )
+ </if>
+ <if test="flyTime != null">
+ 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 != ''
+ and ad.id::VARCHAR = ANY(string_to_array(replace(ds_sub.area_divide_ids, ' ', ''), ','))
+ and (dsm_sub.effective_date_start is null or dsm_sub.effective_date_start <= #{flyTime})
+ and (dsm_sub.effective_date_end is null or dsm_sub.effective_date_end >= #{flyTime})
+ )
+ </if>
+ ) AS temp
GROUP BY split_device_type
ORDER BY split_device_type
</select>
@@ -335,7 +366,7 @@
FROM
ja_fw_device a
LEFT JOIN
- blade_dict_biz b ON (a.device_type = b.dict_key AND b.code = 'deviceType' AND b.parent_id != 0)
+ blade_dict_biz b ON (a.device_type = b.dict_key::VARCHAR AND b.code = 'deviceType' AND b.parent_id != 0)
where a.is_deleted = 0
<if test="deptList != null and deptList.size > 0">
and ( a.create_dept in
@@ -416,145 +447,240 @@
<!-- 查询设备总数 + 无线电/光电/雷达设备数量 -->
<select id="statisticalDeviceAtt" resultType="org.sxkj.fw.cockpit.vo.AlarmStatisticsVO">
SELECT
- -- 设备统计总数
- (SELECT
- COUNT(*)
- FROM
- ja_fw_device d
- WHERE
- d.is_deleted = 0
- and d.is_enabled = 1
- <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>
- ) AS deviceCount,
- -- 无线电设备数量
- (SELECT
- COUNT(*)
- FROM
- ja_fw_device d
- WHERE
- d.is_deleted = 0
- and d.is_enabled = 1
- AND device_att = '1'
- <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>
- ) AS radioCount,
- -- 光电设备数量
- (SELECT
- COUNT(*)
- FROM
- ja_fw_device d
- WHERE d.is_deleted = 0
- and d.is_enabled = 1
- AND device_att = '2'
- <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>
+ -- 设备统计总数
+ (SELECT
+ COUNT(*)
+ FROM
+ ja_fw_device d
+ left join ja_fw_area_divide ad
+ /* 修改点1：统一用 VARCHAR 对齐匹配 */
+ on d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ and ad.is_deleted = 0
+ WHERE
+ d.is_deleted = 0
+ and d.is_enabled = 1
+ <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
+ /* 修改点2：强制参数转为 bigint 以匹配数据库字段 */
+ WHERE loan_to_dept_id = #{currentDeptId}::bigint
+ AND is_deleted = 0
)
</if>
- ) AS opticalCount,
- -- 雷达设备数量
- (SELECT
- COUNT(*)
- FROM ja_fw_device d
- WHERE d.is_deleted = 0
- and d.is_enabled = 1
- AND device_att = '3'
- <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>
- ) AS radarCount,
- -- 设备告警
- (SELECT
- COUNT(*)
- FROM ja_fw_device d
- WHERE d.is_deleted = 0
- and d.is_enabled = 1
- AND status in ('1', '2', '3' )
- <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>
- ) AS deviceAlarmCount
+ )
+ </if>
+ <if test="flyTime != null">
+ 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 匹配文本数组 */
+ and ad.id::VARCHAR = ANY(string_to_array(replace(ds_sub.area_divide_ids, ' ', ''), ','))
+ and (dsm_sub.effective_date_start is null or dsm_sub.effective_date_start <= #{flyTime})
+ and (dsm_sub.effective_date_end is null or dsm_sub.effective_date_end >= #{flyTime})
+ )
+ </if>
+ ) AS deviceCount,
+ -- 无线电设备数量
+ (SELECT
+ COUNT(*)
+ FROM
+ ja_fw_device d
+ left join ja_fw_area_divide ad
+ on d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ and ad.is_deleted = 0
+ WHERE
+ d.is_deleted = 0
+ and d.is_enabled = 1
+ AND device_att = '1'
+ <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}::bigint
+ AND is_deleted = 0
+ )
+ </if>
+ )
+ </if>
+ <if test="flyTime != null">
+ 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 != ''
+ and ad.id::VARCHAR = ANY(string_to_array(replace(ds_sub.area_divide_ids, ' ', ''), ','))
+ and (dsm_sub.effective_date_start is null or dsm_sub.effective_date_start <= #{flyTime})
+ and (dsm_sub.effective_date_end is null or dsm_sub.effective_date_end >= #{flyTime})
+ )
+ </if>
+ ) AS radioCount,
+ -- 光电设备数量
+ (SELECT
+ COUNT(*)
+ FROM
+ ja_fw_device d
+ left join ja_fw_area_divide ad
+ on d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ and ad.is_deleted = 0
+ WHERE d.is_deleted = 0
+ and d.is_enabled = 1
+ AND device_att = '2'
+ <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}::bigint
+ AND is_deleted = 0
+ )
+ </if>
+ )
+ </if>
+ <if test="flyTime != null">
+ 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 != ''
+ and ad.id::VARCHAR = ANY(string_to_array(replace(ds_sub.area_divide_ids, ' ', ''), ','))
+ and (dsm_sub.effective_date_start is null or dsm_sub.effective_date_start <= #{flyTime})
+ and (dsm_sub.effective_date_end is null or dsm_sub.effective_date_end >= #{flyTime})
+ )
+ </if>
+ ) AS opticalCount,
+ -- 雷达设备数量
+ (SELECT
+ COUNT(*)
+ FROM ja_fw_device d
+ left join ja_fw_area_divide ad
+ on d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ and ad.is_deleted = 0
+ WHERE d.is_deleted = 0
+ and d.is_enabled = 1
+ AND device_att = '3'
+ <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}::bigint
+ AND is_deleted = 0
+ )
+ </if>
+ )
+ </if>
+ <if test="flyTime != null">
+ 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 != ''
+ and ad.id::VARCHAR = ANY(string_to_array(replace(ds_sub.area_divide_ids, ' ', ''), ','))
+ and (dsm_sub.effective_date_start is null or dsm_sub.effective_date_start <= #{flyTime})
+ and (dsm_sub.effective_date_end is null or dsm_sub.effective_date_end >= #{flyTime})
+ )
+ </if>
+ ) AS radarCount,
+ -- 设备告警
+ (SELECT
+ COUNT(*)
+ FROM ja_fw_device d
+ left join ja_fw_area_divide ad
+ on d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ and ad.is_deleted = 0
+ WHERE d.is_deleted = 0
+ and d.is_enabled = 1
+ AND d.status in ('1', '2', '3' )
+ <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}::bigint
+ AND is_deleted = 0
+ )
+ </if>
+ )
+ </if>
+ <if test="flyTime != null">
+ 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 != ''
+ and ad.id::VARCHAR = ANY(string_to_array(replace(ds_sub.area_divide_ids, ' ', ''), ','))
+ and (dsm_sub.effective_date_start is null or dsm_sub.effective_date_start <= #{flyTime})
+ and (dsm_sub.effective_date_end is null or dsm_sub.effective_date_end >= #{flyTime})
+ )
+ </if>
+ ) AS deviceAlarmCount
</select>
<select id="selectCockpitDevicePage" resultType="org.sxkj.fw.device.vo.CockpitFwDeviceVO">
select
- d.*,
- min(ad.id) as area_divide_id,
- min(dsm.id) as defense_scene_manage_id
+ d.*,
+ min(ad.id) as area_divide_id,
+ min(dsm.id) as defense_scene_manage_id
from
- ja_fw_device d
+ ja_fw_device d
left join ja_fw_area_divide ad
- on find_in_set(d.id, ad.device_ids) > 0
- and ad.is_deleted = 0
+ /* 修改点1：统一使用 VARCHAR 匹配，去掉容易报错的 ::bigint[] */
+ on d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ and ad.is_deleted = 0
left join ja_fw_defense_scene ds
- on find_in_set(ad.id, ds.area_divide_ids) > 0
- and ds.is_deleted = 0
+ /* 修改点2：ad.id 是 bigint，需转 VARCHAR */
+ on ad.id::VARCHAR = ANY(string_to_array(ds.area_divide_ids, ','))
+ and ds.is_deleted = 0
left join ja_fw_defense_scene_manage dsm
- on dsm.defense_scene_id = ds.id
- and dsm.is_deleted = 0
+ on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR
+ and dsm.is_deleted = 0
<where>
- d.is_deleted = 0
- and d.is_enabled = 1
+ d.is_deleted = 0
+ and d.is_enabled = 1
+ <if test=" param2.flyTime != null">
+ 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 */
+ and ad.id::VARCHAR = ANY(string_to_array(replace(ds_sub.area_divide_ids, ' ', ''), ','))
+ /* 修改点4：日期/时间参数建议显式强转，视数据库类型决定 ::bigint 或 ::timestamp */
+ and (dsm_sub.effective_date_start is null or dsm_sub.effective_date_start <= #{param2.flyTime})
+ and (dsm_sub.effective_date_end is null or dsm_sub.effective_date_end >= #{param2.flyTime})
+ )
+ </if>
<if test="param2.regionCode != null and param2.regionCode != ''">
and (d.final_outbound_area_code like concat(#{param2.regionCode},'%')
- <!-- 或者设备是共享给当前部门的 -->
<if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
or d.id in (
SELECT device_id FROM ja_fw_device_per_share
- WHERE loan_to_dept_id = #{param2.currentDeptId}
+ /* 修改点5：loan_to_dept_id 如果是数字，参数需转 bigint */
+ WHERE loan_to_dept_id = #{param2.currentDeptId}::bigint
AND is_deleted = 0
)
</if>
)
</if>
<if test="param2.id != null and param2.id != ''">
- and d.id = #{param2.id}
+ and d.id = #{param2.id}::bigint
</if>
<if test="param2.deviceName != null and param2.deviceName != ''">
and d.device_name like concat('%',#{param2.deviceName},'%')
@@ -582,24 +708,23 @@
<foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
- <!-- 或者设备是共享给当前部门的 -->
<if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
or d.id in (
SELECT device_id FROM ja_fw_device_per_share
- WHERE loan_to_dept_id = #{param2.currentDeptId}
+ WHERE loan_to_dept_id = #{param2.currentDeptId}::bigint
AND is_deleted = 0
)
</if>
)
</if>
- <if test="param2.deviceStatusList != null and param2.deviceStatusList != ''">
+ <if test="param2.deviceStatusList != null and param2.deviceStatusList.size > 0">
and d.status in
<foreach item="item" collection="param2.deviceStatusList" separator="," open="(" close=")" index="">
- #{item}
+ #{item}::varchar
</foreach>
</if>
</where>
- group by d.id
+ group by d.id
</select>
<update id="updateTrackStatusByDeviceId">
@@ -624,7 +749,7 @@
END AS isShared
FROM
ja_fw_device d
- LEFT JOIN ja_fw_device_per_share ps ON ps.device_id = d.id
+ LEFT JOIN ja_fw_device_per_share ps ON ps.device_id = d.id::VARCHAR
AND ps.loan_to_dept_id = #{currentDeptId}
AND ps.is_deleted = 0
WHERE
@@ -638,25 +763,47 @@
<select id="getDeviceStatistics" resultType="org.sxkj.fw.cockpit.vo.DeviceStatisticsVO">
SELECT
- d.final_outbound_area AS type,
- COUNT(*) AS count
+ d.final_outbound_area AS type,
+ COUNT(*) AS count
FROM
- ja_fw_device d
+ ja_fw_device d
+ LEFT JOIN ja_fw_area_divide ad
+ /* 修改点1：d.id 是数字，匹配文本数组需转 VARCHAR */
+ on d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ AND ad.is_deleted = 0
WHERE
- d.is_deleted = 0
+ 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},'%')
+ and ( d.final_outbound_area_code::text 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}
+ or d.id IN (
+ SELECT device_id::bigint
+ FROM ja_fw_device_per_share
+ WHERE
+ /* 修改点2：强制显式转换参数，防止 bigint = character varying */
+ loan_to_dept_id = #{currentDeptId}::bigint
AND is_deleted = 0
)
</if>
)
</if>
+ <if test="flyTime != null">
+ 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 匹配，去掉不稳定的 ::bigint[] */
+ and ad.id::VARCHAR = ANY(string_to_array(replace(ds_sub.area_divide_ids, ' ', ''), ','))
+ /* 修改点4：日期比对确保类型对等 */
+ and (dsm_sub.effective_date_start is null or dsm_sub.effective_date_start <= #{flyTime})
+ and (dsm_sub.effective_date_end is null or dsm_sub.effective_date_end >= #{flyTime})
+ )
+ </if>
GROUP BY
d.final_outbound_area
</select>
--
Gitblit v1.9.3