From eeb3b5c9c794a35d7b7f3c8e56f9eef8eb8d3451 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 01 Apr 2026 17:20:19 +0800
Subject: [PATCH] opt:兼容人大金仓
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 160 insertions(+), 17 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..73a6a12 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">
@@ -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>
@@ -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 != ''
@@ -263,7 +265,7 @@
FROM (
-- 子查询：拆分察打一体设备为侦测/反制两类
SELECT
- id,
+ d.id,
CASE
WHEN
device_type = '3' THEN '1' -- 察打一体拆分为侦测
@@ -273,10 +275,13 @@
split_device_type
FROM
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
WHERE
d.is_deleted = 0
AND d.is_enabled = 1
- AND status != 3
+ AND d.status != 3
<if test="regionCode != null and regionCode != ''">
and (d.final_outbound_area_code like concat(#{regionCode}, '%')
<!-- 或者设备是共享给当前部门的 -->
@@ -289,11 +294,24 @@
</if>
)
</if>
+ <if test="flyTime != null">
+ and exists (
+ select 1
+ from ja_fw_defense_scene ds
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = 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 find_in_set(ad.id, replace(ds.area_divide_ids, ' ', ''))
+ 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>
UNION ALL -- 合并拆分的反制部分
SELECT
- id,
+ d.id,
CASE
WHEN
device_type = '3' THEN '2' -- 察打一体拆分为反制
@@ -303,10 +321,13 @@
split_device_type
FROM
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
WHERE
d.is_deleted = 0
AND is_enabled = 1
- AND status != 3
+ AND d.status != 3
AND device_type = '3'
<if test="regionCode != null and regionCode != ''">
and (d.final_outbound_area_code like concat(#{regionCode}, '%')
@@ -320,6 +341,19 @@
</if>
)
</if>
+ <if test="flyTime != null">
+ and exists (
+ select 1
+ from ja_fw_defense_scene ds
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = 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 find_in_set(ad.id, replace(ds.area_divide_ids, ' ', ''))
+ 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>
) AS temp
GROUP BY split_device_type
ORDER BY split_device_type
@@ -335,7 +369,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
@@ -421,6 +455,9 @@
COUNT(*)
FROM
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
WHERE
d.is_deleted = 0
and d.is_enabled = 1
@@ -436,17 +473,33 @@
</if>
)
</if>
+ <if test="flyTime != null">
+ and exists (
+ select 1
+ from ja_fw_defense_scene ds
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = 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 find_in_set(ad.id, replace(ds.area_divide_ids, ' ', ''))
+ 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>
) AS deviceCount,
-- 无线电设备数量
(SELECT
COUNT(*)
FROM
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
WHERE
d.is_deleted = 0
and d.is_enabled = 1
AND device_att = '1'
- <if test="regionCode != null and regionCode != ''">
+ <if test="regionCode != null and regionCode != ''">
and (d.final_outbound_area_code like concat(#{regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
@@ -458,12 +511,28 @@
</if>
)
</if>
+ <if test="flyTime != null">
+ and exists (
+ select 1
+ from ja_fw_defense_scene ds
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = 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 find_in_set(ad.id, replace(ds.area_divide_ids, ' ', ''))
+ 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>
) AS radioCount,
-- 光电设备数量
(SELECT
COUNT(*)
FROM
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
WHERE d.is_deleted = 0
and d.is_enabled = 1
AND device_att = '2'
@@ -479,15 +548,31 @@
</if>
)
</if>
+ <if test="flyTime != null">
+ and exists (
+ select 1
+ from ja_fw_defense_scene ds
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = 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 find_in_set(ad.id, replace(ds.area_divide_ids, ' ', ''))
+ 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>
) AS opticalCount,
-- 雷达设备数量
(SELECT
COUNT(*)
FROM 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
WHERE d.is_deleted = 0
and d.is_enabled = 1
AND device_att = '3'
- <if test="regionCode != null and regionCode != ''">
+ <if test="regionCode != null and regionCode != ''">
and (d.final_outbound_area_code like concat(#{regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
@@ -499,15 +584,31 @@
</if>
)
</if>
+ <if test="flyTime != null">
+ and exists (
+ select 1
+ from ja_fw_defense_scene ds
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = 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 find_in_set(ad.id, replace(ds.area_divide_ids, ' ', ''))
+ 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>
) AS radarCount,
-- 设备告警
(SELECT
COUNT(*)
FROM 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
WHERE d.is_deleted = 0
and d.is_enabled = 1
- AND status in ('1', '2', '3' )
- <if test="regionCode != null and regionCode != ''">
+ 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 != '' ">
@@ -517,6 +618,19 @@
AND is_deleted = 0
)
</if>
+ )
+ </if>
+ <if test="flyTime != null">
+ and exists (
+ select 1
+ from ja_fw_defense_scene ds
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = 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 find_in_set(ad.id, replace(ds.area_divide_ids, ' ', ''))
+ 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>
) AS deviceAlarmCount
@@ -536,11 +650,24 @@
on find_in_set(ad.id, ds.area_divide_ids) > 0
and ds.is_deleted = 0
left join ja_fw_defense_scene_manage dsm
- on dsm.defense_scene_id = ds.id
+ on dsm.defense_scene_id = ds.id::VARCHAR
and dsm.is_deleted = 0
<where>
d.is_deleted = 0
and d.is_enabled = 1
+ <if test=" param2.flyTime != null">
+ and exists (
+ select 1
+ from ja_fw_defense_scene ds
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = 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 find_in_set(ad.id, replace(ds.area_divide_ids, ' ', ''))
+ and (dsm.effective_date_start is null or dsm.effective_date_start <= #{param2.flyTime})
+ and (dsm.effective_date_end is null or dsm.effective_date_end >= #{param2.flyTime})
+ )
+ </if>
<if test="param2.regionCode != null and param2.regionCode != ''">
and (d.final_outbound_area_code like concat(#{param2.regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
@@ -624,7 +751,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
@@ -642,6 +769,9 @@
COUNT(*) AS count
FROM
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
WHERE
d.is_deleted = 0
AND d.is_enabled = 1
@@ -657,6 +787,19 @@
</if>
)
</if>
+ <if test="flyTime != null">
+ and exists (
+ select 1
+ from ja_fw_defense_scene ds
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = 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 find_in_set(ad.id, replace(ds.area_divide_ids, ' ', ''))
+ 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>
GROUP BY
d.final_outbound_area
</select>
--
Gitblit v1.9.3