From 54898304203f3ea0c132899dca4341dc182d13de Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 28 Jan 2026 17:20:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 150 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 136 insertions(+), 14 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 f0fb0bb..73d37ea 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
@@ -39,7 +39,10 @@
<select id="selectFwDevicePage" resultMap="fwDeviceResultMap">
- select * from ja_fw_device
+ select
+ *
+ from
+ ja_fw_device
<where>
is_deleted = 0
<if test="param2.id != null and param2.id != ''">
@@ -87,6 +90,12 @@
</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
+ </if>
+ <if test="param2.deptList != null and param2.deptList.size > 0">
+ and create_dept in
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
</if>
</where>
</select>
@@ -175,6 +184,12 @@
AND status != 3
AND effective_range_km is not null
AND effective_range_km > 0
+ <if test="deptList != null and deptList.size > 0">
+ and create_dept in
+ <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
UNION ALL -- 合并拆分的反制部分
@@ -195,6 +210,12 @@
AND device_type = '3'
AND effective_range_km is not null
AND effective_range_km > 0
+ <if test="deptList != null and deptList.size > 0">
+ and create_dept in
+ <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
) AS temp
GROUP BY split_device_type
ORDER BY split_device_type
@@ -202,13 +223,22 @@
<!-- 获取设备类型统计数据 -->
<select id="getDeviceTypeStatistics" resultType="org.sxkj.fw.device.vo.DeviceTypeStatisticsVO">
- SELECT a.device_type,b.dict_value AS device_type_value,count(*) device_count, (SELECT COUNT(*) FROM ja_fw_device where is_deleted = 0) as total_devices
- 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
- ) where a.is_deleted = 0
+ SELECT
+ a.device_type,
+ b.dict_value AS device_type_value,
+ count(*) device_count,
+ (SELECT COUNT(*) FROM ja_fw_device where is_deleted = 0) as total_devices
+ 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)
+ where a.is_deleted = 0
+ <if test="deptList != null and deptList.size > 0">
+ and a.create_dept in
+ <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
group by a.device_type,b.dict_value
</select>
@@ -245,8 +275,14 @@
<if test="effectiveRangeKmIsNotNull != null and effectiveRangeKmIsNotNull == 2">
and (d.effective_range_km is null or d.effective_range_km = 0)
</if>
+ <if test="deptList != null and deptList.size > 0">
+ and d.create_dept in
+ <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
GROUP BY
- t.out_target;
+ t.out_target
</select>
<!-- 设备生产厂商统计 -->
@@ -258,6 +294,12 @@
ja_fw_device
WHERE
is_deleted = 0
+ <if test="deptList != null and deptList.size > 0">
+ and create_dept in
+ <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
GROUP BY
manufacturer
</select>
@@ -266,15 +308,89 @@
<select id="statisticalDeviceAtt" resultType="org.sxkj.fw.cockpit.vo.AlarmStatisticsVO">
SELECT
-- 设备统计总数
- (SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 0 and effective_range_km is not null and effective_range_km > 0) AS deviceCount,
+ (SELECT
+ COUNT(*)
+ FROM
+ ja_fw_device
+ WHERE
+ is_deleted = 0
+ and
+ effective_range_km is not null
+ and
+ effective_range_km > 0
+ <if test="deptList != null and deptList.size > 0">
+ and create_dept in
+ <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
+ ) AS deviceCount,
-- 无线电设备数量
- (SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 0 AND device_att = '1' and effective_range_km is not null and effective_range_km > 0) AS radioCount,
+ (SELECT
+ COUNT(*)
+ FROM
+ ja_fw_device
+ WHERE
+ is_deleted = 0
+ AND
+ device_att = '1'
+ and
+ effective_range_km is not null
+ and
+ effective_range_km > 0
+ <if test="deptList != null and deptList.size > 0">
+ and create_dept in
+ <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
+ ) AS radioCount,
-- 光电设备数量
- (SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 0 AND device_att = '2'and effective_range_km is not null and effective_range_km > 0) AS opticalCount,
+ (SELECT
+ COUNT(*)
+ FROM
+ ja_fw_device
+ WHERE is_deleted = 0
+ AND device_att = '2'
+ and effective_range_km is not null
+ and effective_range_km > 0
+ <if test="deptList != null and deptList.size > 0">
+ and create_dept in
+ <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
+ ) AS opticalCount,
-- 雷达设备数量
- (SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 0 AND device_att = '3' and effective_range_km is not null and effective_range_km > 0) AS radarCount,
+ (SELECT
+ COUNT(*)
+ FROM ja_fw_device
+ WHERE is_deleted = 0
+ AND device_att = '3'
+ and effective_range_km is not null
+ and effective_range_km > 0
+ <if test="deptList != null and deptList.size > 0">
+ and create_dept in
+ <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
+ ) AS radarCount,
-- 设备告警
- (SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 0 AND status in ('1', '2', '3' ) and effective_range_km is not null and effective_range_km > 0) AS deviceAlarmCount;
+ (SELECT
+ COUNT(*)
+ FROM ja_fw_device
+ WHERE is_deleted = 0
+ AND status in ('1', '2', '3' )
+ and effective_range_km is not null
+ and effective_range_km > 0
+ <if test="deptList != null and deptList.size > 0">
+ and create_dept in
+ <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
+ ) AS deviceAlarmCount
</select>
<select id="selectCockpitDevicePage" resultType="org.sxkj.fw.device.vo.CockpitFwDeviceVO">
@@ -326,6 +442,12 @@
<if test="param2.belongDept != null and param2.belongDept != ''">
and d.belong_dept = #{param2.belongDept}
</if>
+ <if test="param2.deptList != null and param2.deptList.size > 0">
+ and d.create_dept in
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
<if test="param2.deviceStatusList != null and param2.deviceStatusList != ''">
and d.status in
<foreach item="item" collection="param2.deviceStatusList" separator="," open="(" close=")" index="">
--
Gitblit v1.9.3