From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 401 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 339 insertions(+), 62 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 4c6b154..d44b2e0 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
@@ -27,6 +27,7 @@
<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"/>
@@ -38,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 != ''">
@@ -80,6 +84,18 @@
</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>
</select>
@@ -127,6 +143,79 @@
<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>
+
+ <select id="selectFwDeviceListByPolygons" resultMap="fwDeviceResultMap">
+ select * from ja_fw_device
+ <where>
+ is_deleted = 0
+ 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>
+ )
+ </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
+ </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
+ </if>
+ and longitude is not null
+ and longitude != ''
+ and latitude is not null
+ 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>
+ )
+ </if>
</where>
</select>
@@ -156,12 +245,23 @@
END AS
split_device_type
FROM
- ja_fw_device
+ ja_fw_device d
WHERE
- is_deleted = 0
- AND status != 3
- AND effective_range_km is not null
- AND effective_range_km > 0
+ d.is_deleted = 0
+ AND d.is_enabled = 1
+ AND status != 3
+ <if test="regionName != null and regionName != ''">
+ and (d.final_outbound_area = #{regionName}
+ <!-- 或者设备是共享给当前部门的 -->
+ <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>
UNION ALL -- 合并拆分的反制部分
@@ -175,13 +275,24 @@
END AS
split_device_type
FROM
- ja_fw_device
+ ja_fw_device d
WHERE
- is_deleted = 0
- AND status != 3
- AND device_type = '3'
- AND effective_range_km is not null
- AND effective_range_km > 0
+ d.is_deleted = 0
+ AND is_enabled = 1
+ AND status != 3
+ AND device_type = '3'
+ <if test="regionName != null and regionName != ''">
+ and (d.final_outbound_area = #{regionName}
+ <!-- 或者设备是共享给当前部门的 -->
+ <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 temp
GROUP BY split_device_type
ORDER BY split_device_type
@@ -189,44 +300,67 @@
<!-- 获取设备类型统计数据 -->
<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 test="currentDeptId != null and currentDeptId != '' "> -->
+ <!-- or a.id in ( -->
+ <!-- SELECT device_id FROM ja_fw_device_per_share -->
+ <!-- WHERE loan_to_dept_id = #{currentDeptId} -->
+ <!-- AND is_deleted = 0 -->
+ <!-- ) -->
+ <!-- </if> -->
+ )
+ </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,
+ d.final_outbound_area 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
+ AND d.is_enabled = 1
+ AND d.final_outbound_area 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 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>
GROUP BY
- t.out_target;
+ d.final_outbound_area
</select>
<!-- 设备生产厂商统计 -->
@@ -238,6 +372,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>
@@ -246,42 +386,131 @@
<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 d
+ WHERE
+ d.is_deleted = 0
+ and d.is_enabled = 1
+ <if test="regionName != null and regionName != ''">
+ and (d.final_outbound_area = #{regionName}
+ <!-- 或者设备是共享给当前部门的 -->
+ <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 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 d
+ WHERE
+ d.is_deleted = 0
+ and d.is_enabled = 1
+ AND device_att = '1'
+ <if test="regionName != null and regionName != ''">
+ and (d.final_outbound_area = #{regionName}
+ <!-- 或者设备是共享给当前部门的 -->
+ <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 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 d
+ WHERE d.is_deleted = 0
+ and d.is_enabled = 1
+ AND device_att = '2'
+ <if test="regionName != null and regionName != ''">
+ and (d.final_outbound_area = #{regionName}
+ <!-- 或者设备是共享给当前部门的 -->
+ <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 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 d
+ WHERE d.is_deleted = 0
+ and d.is_enabled = 1
+ AND device_att = '3'
+ <if test="regionName != null and regionName != ''">
+ and (d.final_outbound_area = #{regionName}
+ <!-- 或者设备是共享给当前部门的 -->
+ <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 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 d
+ WHERE d.is_deleted = 0
+ and d.is_enabled = 1
+ AND status in ('1', '2', '3' )
+ <if test="regionName != null and regionName != ''">
+ and (d.final_outbound_area = #{regionName}
+ <!-- 或者设备是共享给当前部门的 -->
+ <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
</select>
<select id="selectCockpitDevicePage" resultType="org.sxkj.fw.device.vo.CockpitFwDeviceVO">
select
- d.*,
- fts.longitude,
- fts.latitude
+ d.*
from
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
+ and d.is_enabled = 1
+ <if test="param2.regionName != null and param2.regionName != ''">
+ and (d.final_outbound_area = #{param2.regionName}
+ <!-- 或者设备是共享给当前部门的 -->
+ <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}
+ AND is_deleted = 0
+ )
+ </if>
+ )
+ </if>
<if test="param2.id != null and param2.id != ''">
and d.id = #{param2.id}
</if>
@@ -306,6 +535,21 @@
<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 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}
+ AND is_deleted = 0
+ )
+ </if>
+ )
+ </if>
<if test="param2.deviceStatusList != null and param2.deviceStatusList != ''">
and d.status in
<foreach item="item" collection="param2.deviceStatusList" separator="," open="(" close=")" index="">
@@ -315,4 +559,37 @@
</where>
</select>
+ <update id="updateTrackStatusByDeviceId">
+ update
+ ja_fw_device
+ set track_status = #{trackStatus},
+ final_outbound_area = #{outTarget}
+ where id = #{deviceId}
+ and is_deleted = 0
+ </update>
+
+ <!-- 查询非本部门区域的设备 -->
+ <select id="selectNonDeptAreaDevices" resultType="org.sxkj.fw.device.vo.FwDeviceVO">
+ SELECT
+ d.*,
+ d.final_outbound_area as outTarget,
+ ps.id AS shareId,
+ CASE
+ WHEN ps.id IS NOT NULL THEN TRUE
+ ELSE FALSE
+ 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}
+ AND ps.is_deleted = 0
+ WHERE
+ d.is_deleted = 0
+ and d.is_enabled = 1
+ and d.effective_range_km is not null
+ and d.effective_range_km > 0
+ and d.track_status = 1
+ AND d.final_outbound_area != #{regionName}
+ </select>
+
</mapper>
--
Gitblit v1.9.3