From 74756c657109a4e48dd6c0b4d8959cdab89b33a9 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 28 Jan 2026 20:10:29 +0800
Subject: [PATCH] update-区域划分表结构调整
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 291 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 267 insertions(+), 24 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..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
@@ -23,8 +23,11 @@
<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="track_status" property="trackStatus"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
<result column="create_time" property="createTime"/>
@@ -36,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 != ''">
@@ -74,6 +80,21 @@
and status in
<foreach item="item" collection="param2.deviceStatusList" separator="," open="(" close=")" index="">
#{item}
+ </foreach>
+ </if>
+ <if test="param2.status != null">
+ 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
+ </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>
@@ -119,6 +140,15 @@
</choose>
)
</if>
+ <if test="status != null">
+ 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
+ </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
+ </if>
</where>
</select>
@@ -139,55 +169,255 @@
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
+ <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 -- 合并拆分的反制部分
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
+ <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
+ </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
+ <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>
+
+ <!-- 设备出库去向统计 -->
+ <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
+ <if test="effectiveRangeKmIsNotNull != null and effectiveRangeKmIsNotNull == 1">
+ and d.effective_range_km is not null
+ and d.effective_range_km > 0
+ </if>
+ <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
+ </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
+ <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>
<!-- 查询设备总数 + 无线电/光电/雷达设备数量 -->
<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
+ <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') 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') 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') 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') ) 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">
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>
@@ -212,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="">
@@ -221,4 +457,11 @@
</where>
</select>
+ <update id="updateTrackStatusByDeviceId">
+ update ja_fw_device
+ set track_status = #{trackStatus}
+ where id = #{deviceId}
+ and is_deleted = 0
+ </update>
+
</mapper>
--
Gitblit v1.9.3