From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 742 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 479 insertions(+), 263 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..de3c689 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
@@ -34,31 +34,36 @@
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
+ <result column="use_date" property="useDate"/>
+ <result column="service_life" property="serviceLife"/>
<!-- <result column="is_deleted" property="isDeleted"/>-->
</resultMap>
<select id="selectFwDevicePage" resultMap="fwDeviceResultMap">
select
- *
+ *
from
- ja_fw_device
+ ja_fw_device
<where>
- is_deleted = 0
+ is_deleted = 0
+ <if test="param2.trackStatus != null ">
+ and track_status::text = #{param2.trackStatus}::text
+ </if>
<if test="param2.id != null and param2.id != ''">
- and id = #{param2.id}
+ and id::text = #{param2.id}::text
</if>
<if test="param2.deviceName != null and param2.deviceName != ''">
and device_name like concat('%',#{param2.deviceName},'%')
</if>
<if test="param2.deviceType != null and param2.deviceType != ''">
- and device_type = #{param2.deviceType}
+ and device_type::text = #{param2.deviceType}::text
</if>
<if test="param2.deviceModel != null and param2.deviceModel != ''">
- and device_model = #{param2.deviceModel}
+ and device_model::text = #{param2.deviceModel}::text
</if>
<if test="param2.deviceSpecification != null and param2.deviceSpecification != ''">
- and device_specification = #{param2.deviceSpecification}
+ and device_specification::text = #{param2.deviceSpecification}::text
</if>
<if test="param2.effectiveRangeKmIsNotNull != null and param2.effectiveRangeKmIsNotNull == 1">
and effective_range_km is not null
@@ -68,45 +73,52 @@
and (effective_range_km is null or effective_range_km = 0)
</if>
<if test="param2.manufacturer != null and param2.manufacturer != ''">
- and manufacturer = #{param2.manufacturer}
+ and manufacturer::text = #{param2.manufacturer}::text
</if>
<if test="param2.source != null and param2.source != ''">
- and source = #{param2.source}
+ and source::text = #{param2.source}::text
</if>
<if test="param2.belongDept != null and param2.belongDept != ''">
- and belong_dept = #{param2.belongDept}
+ and belong_dept::text = #{param2.belongDept}::text
+ </if>
+ <if test="param2.useDate != null">
+ and use_date = #{param2.useDate}
+ </if>
+ <if test="param2.serviceLife != null">
+ and service_life = #{param2.serviceLife}
</if>
<if test="param2.deviceStatusList != null and param2.deviceStatusList != ''">
- and status in
+ and status::text in
<foreach item="item" collection="param2.deviceStatusList" separator="," open="(" close=")" index="">
- #{item}
+ #{item}::text
</foreach>
</if>
<if test="param2.status != null">
- and status = #{param2.status}
+ and status::text = #{param2.status}::text
</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::text = tmp.device_id::text) > 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::text = tmp.device_id::text) = 0
</if>
<if test="param2.deptList != null and param2.deptList.size > 0">
- and ( create_dept in
+ and ( create_dept::text in
<foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
- #{deptId}
+ #{deptId}::text
</foreach>
- <!-- 或者设备是共享给当前部门的 -->
<if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
- or id in (
- SELECT device_id FROM ja_fw_device_per_share
- WHERE loan_to_dept_id = #{param2.currentDeptId}
+ or id::text in (
+ SELECT device_id::text FROM ja_fw_device_per_share
+ WHERE loan_to_dept_id = #{param2.currentDeptId}::bigint
AND is_deleted = 0
)
</if>
)
</if>
</where>
+ order by
+ create_time desc
</select>
<select id="selectFwDeviceList" resultMap="fwDeviceResultMap">
@@ -126,7 +138,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 +153,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 +161,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 +172,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 +183,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>
@@ -186,48 +198,51 @@
and track_status = 1
<if test="query.isAreaSelect != null and query.isAreaSelect == 1">
and (
- <choose>
- <when test="query.areaId != null">
- exists (
- select 1
- from ja_fw_area_divide ad
- where ad.is_deleted = 0
- 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)
- )
- or not exists (
- select 1
- from ja_fw_area_divide ad
- 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 ad.id != #{query.areaId}
- )
- </when>
- <otherwise>
- not exists (
- select 1
- from ja_fw_area_divide ad
- 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)
- )
- </otherwise>
- </choose>
+ <choose>
+ <when test="query.areaId != null">
+ exists (
+ select 1
+ from ja_fw_area_divide ad
+ where ad.is_deleted = 0
+ /* 修改点1：参数对齐 */
+ and ad.id::text = #{query.areaId}::text
+ and ad.device_ids is not null
+ and ad.device_ids != ''
+ /* 修改点2：使用 text 匹配文本数组，去掉不稳定的 ::bigint[] */
+ and ja_fw_device.id::text = ANY(string_to_array(replace(ad.device_ids, ' ', ''), ','))
+ )
+ or not exists (
+ select 1
+ from ja_fw_area_divide ad
+ where ad.is_deleted = 0
+ and ad.device_ids is not null
+ and ad.device_ids != ''
+ and ja_fw_device.id::text = ANY(string_to_array(replace(ad.device_ids, ' ', ''), ','))
+ and ad.id::text != #{query.areaId}::text
+ )
+ </when>
+ <otherwise>
+ not exists (
+ select 1
+ from ja_fw_area_divide ad
+ where ad.is_deleted = 0
+ and ad.device_ids is not null
+ and ad.device_ids != ''
+ and ja_fw_device.id::text = ANY(string_to_array(replace(ad.device_ids, ' ', ''), ','))
+ )
+ </otherwise>
+ </choose>
)
</if>
<if test="query.status != null">
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
+ /* 修改点3：解决 Position 575 报错，双向转 text */
+ and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id::text = tmp.device_id::text) > 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::text = tmp.device_id::text) = 0
</if>
and longitude is not null
and longitude != ''
@@ -235,12 +250,14 @@
and latitude != ''
<if test="query.polygons != null and query.polygons.size > 0">
and (
- <foreach collection="query.polygons" item="polygon" separator=" OR ">
- ST_Contains(
- ST_SRID(ST_GeomFromText(#{polygon}), 4326),
- ST_GeomFromText(CONCAT('POINT(', latitude, ' ', longitude, ')'), 4326)
- )
- </foreach>
+ <foreach collection="query.polygons" item="polygon" separator=" OR ">
+ public.st_contains(
+ /* 直接在构造时指定 4326 */
+ public.st_geomfromtext(#{polygon}::text, 4326),
+ /* 将经纬度拼接为点，并指定坐标系 */
+ public.st_geomfromtext(CONCAT('POINT(', longitude, ' ', latitude, ')'), 4326)
+ )
+ </foreach>
)
</if>
</where>
@@ -254,73 +271,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 +381,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
@@ -363,7 +409,7 @@
ja_fw_device d
WHERE
d.is_deleted = 0
- AND d.is_enabled = 1
+ AND d.track_status = 1
AND d.final_outbound_area IS NOT NULL
<if test="effectiveRangeKmIsNotNull != null and effectiveRangeKmIsNotNull == 2">
and (d.effective_range_km is null or d.effective_range_km = 0)
@@ -416,145 +462,276 @@
<!-- 查询设备总数 + 无线电/光电/雷达设备数量 -->
<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.id,
+ d.device_sn,
+ d.airport_id,
+ d.device_name,
+ d.device_type,
+ d.device_att,
+ d.device_model,
+ d.device_specification,
+ d.manufacturer,
+ d.source,
+ d.purpose,
+ d.belong_dept,
+ d.charger,
+ d.contact_phone,
+ d.remark,
+ d.battery_pct,
+ d.azimuth,
+ d.elevation,
+ d.detect_target_cnt,
+ d.effective_range_km,
+ d.work_mode,
+ d.area_code,
+ d.track_status,
+ d.final_outbound_area,
+ d.final_outbound_area_code,
+ d.is_enabled,
+ d.create_user,
+ d.create_dept,
+ d.create_time,
+ d.update_user,
+ d.update_time,
+ d.status,
+ d.is_deleted,
+ d.use_date,
+ d.service_life,
+ NULLIF(trim(d.latitude::text), '')::double precision AS latitude,
+ NULLIF(trim(d.longitude::text), '')::double precision AS longitude,
+ 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 +759,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">
@@ -621,11 +797,14 @@
CASE
WHEN ps.id IS NOT NULL THEN TRUE
ELSE FALSE
- END AS isShared
+ END AS isShared
FROM
ja_fw_device d
- LEFT JOIN ja_fw_device_per_share ps ON ps.device_id = d.id
- AND ps.loan_to_dept_id = #{currentDeptId}
+ /* 修改点1：建议使用 ::text，且如果 id 本身是数字类型，能不转就不转以优化索引，
+ 这里保留转换逻辑但改为更通用的 text */
+ LEFT JOIN ja_fw_device_per_share ps ON ps.device_id::text = d.id::text
+ /* 修改点2：核心修复！显式转换参数为 bigint，匹配数据库字段类型 */
+ AND ps.loan_to_dept_id = #{currentDeptId}::bigint
AND ps.is_deleted = 0
WHERE
d.is_deleted = 0
@@ -638,27 +817,64 @@
<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
- AND d.is_enabled = 1
+ d.is_deleted = 0
+ AND d.track_status = 1
+ <if test="isEnabled != null">
+ AND d.is_enabled = #{isEnabled}
+ </if>
+ AND d.track_status = 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>
+ <!-- 批量更新设备启用状态 -->
+ <update id="batchUpdateIsEnabled">
+ UPDATE ja_fw_device
+ SET is_enabled = #{isEnabled}
+ WHERE id IN
+ <foreach collection="deviceIds" item="id" open="(" separator="," close=")">
+ #{id}::bigint
+ </foreach>
+ AND is_deleted = 0
+ </update>
+
</mapper>
--
Gitblit v1.9.3