From 9e4e138cfacbb831986d74e2cbfa36967435a700 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 26 Jan 2026 11:29:17 +0800
Subject: [PATCH] 新增外部字段
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 140 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 117 insertions(+), 23 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 9cf89bc..4c6b154 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
@@ -23,6 +23,8 @@
<result column="detect_target_cnt" property="detectTargetCnt"/>
<result column="effective_range_km" property="effectiveRangeKm"/>
<result column="work_mode" property="workMode"/>
+ <result column="latitude" property="latitude"/>
+ <result column="longitude" property="longitude"/>
<result column="area_code" property="areaCode"/>
<result column="device_sn" property="deviceSn"/>
<result column="create_user" property="createUser"/>
@@ -76,6 +78,9 @@
#{item}
</foreach>
</if>
+ <if test="param2.status != null">
+ and status = #{param2.status}
+ </if>
</where>
</select>
@@ -119,6 +124,9 @@
</choose>
)
</if>
+ <if test="status != null">
+ and status = #{status}
+ </if>
</where>
</select>
@@ -139,55 +147,141 @@
FROM (
-- 子查询：拆分察打一体设备为侦测/反制两类
SELECT
- id,
+ id,
CASE
- WHEN device_type = '3' THEN '1' -- 察打一体拆分为侦测
- ELSE device_type
- END AS split_device_type
- FROM ja_fw_device
- WHERE is_deleted = 0 -- 排除已删除数据
+ WHEN
+ device_type = '3' THEN '1' -- 察打一体拆分为侦测
+ ELSE
+ device_type
+ END AS
+ split_device_type
+ FROM
+ ja_fw_device
+ WHERE
+ is_deleted = 0
+ AND status != 3
+ AND effective_range_km is not null
+ AND effective_range_km > 0
UNION ALL -- 合并拆分的反制部分
SELECT
- id,
+ id,
CASE
- WHEN device_type = '3' THEN '2' -- 察打一体拆分为反制
- ELSE device_type
- END AS split_device_type
- FROM ja_fw_device
- WHERE is_deleted = 0
- AND device_type != '3' -- 避免普通设备重复统计
+ WHEN
+ device_type = '3' THEN '2' -- 察打一体拆分为反制
+ ELSE
+ device_type
+ END AS
+ split_device_type
+ FROM
+ ja_fw_device
+ WHERE
+ is_deleted = 0
+ AND status != 3
+ AND device_type = '3'
+ AND effective_range_km is not null
+ AND effective_range_km > 0
) AS temp
GROUP BY split_device_type
ORDER BY split_device_type
+ </select>
+
+ <!-- 获取设备类型统计数据 -->
+ <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
+ group by a.device_type,b.dict_value
+ </select>
+
+ <!-- 设备出库去向统计 -->
+ <select id="getDeviceOutStatistics" resultType="org.sxkj.fw.cockpit.vo.DeviceStatisticsVO">
+ SELECT
+ t.out_target AS type,
+ COUNT(*) AS count
+ FROM
+ ja_fw_device d
+ LEFT JOIN (
+ SELECT
+ device_id,
+ out_target,
+ ROW_NUMBER() OVER (
+ PARTITION BY
+ device_id
+ ORDER BY
+ create_time DESC
+ ) AS rn
+ FROM
+ ja_fw_device_track
+ WHERE
+ out_target IS NOT NULL
+ ) t ON d.id = t.device_id
+ AND t.rn = 1
+ WHERE
+ d.is_deleted = 0
+ AND t.out_target IS NOT NULL
+ GROUP BY
+ t.out_target;
+ </select>
+
+ <!-- 设备生产厂商统计 -->
+ <select id="getDeviceManufacturerStatistics" resultType="org.sxkj.fw.cockpit.vo.DeviceStatisticsVO">
+ SELECT
+ manufacturer AS type,
+ COUNT(*) AS count
+ FROM
+ ja_fw_device
+ WHERE
+ is_deleted = 0
+ GROUP BY
+ manufacturer
</select>
<!-- 查询设备总数 + 无线电/光电/雷达设备数量 -->
<select id="statisticalDeviceAtt" resultType="org.sxkj.fw.cockpit.vo.AlarmStatisticsVO">
SELECT
-- 设备统计总数
- (SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 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) AS deviceCount,
-- 无线电设备数量
- (SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 0 AND device_att = '1') 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) AS radioCount,
-- 光电设备数量
- (SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 0 AND device_att = '2') 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) AS opticalCount,
-- 雷达设备数量
- (SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 0 AND device_att = '3') 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) AS radarCount,
-- 设备告警
- (SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 0 AND status in ('1', '2', '3') ) 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) AS deviceAlarmCount;
</select>
<select id="selectCockpitDevicePage" resultType="org.sxkj.fw.device.vo.CockpitFwDeviceVO">
select
- d.*,
- fts.longitude,
- fts.latitude
+ d.*,
+ fts.longitude,
+ fts.latitude
from
- ja_fw_device d
- left join ja_fw_task_schedule fts on d.id = fts.device_id
+ ja_fw_device d
+ left join
+ (
+ SELECT
+ device_id,
+ longitude,
+ latitude,
+ MAX(create_time) AS create_time
+ FROM
+ ja_fw_task_schedule
+ WHERE
+ is_deleted = 0
+ GROUP BY
+ device_id
+ ) fts ON fts.device_id = d.id
<where>
d.is_deleted = 0
+ and d.effective_range_km is not null
+ and d.effective_range_km > 0
<if test="param2.id != null and param2.id != ''">
and d.id = #{param2.id}
</if>
--
Gitblit v1.9.3