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 | 366 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 247 insertions(+), 119 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 73d37ea..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
@@ -152,6 +152,73 @@
</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>
+
<select id="exportFwDevice" resultType="org.sxkj.fw.device.excel.FwDeviceExcel">
SELECT * FROM ja_fw_device ${ew.customSqlSegment}
@@ -178,17 +245,22 @@
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
- <if test="deptList != null and deptList.size > 0">
- and create_dept in
- <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
- #{deptId}
- </foreach>
+ 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 -- 合并拆分的反制部分
@@ -203,18 +275,23 @@
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
- <if test="deptList != null and deptList.size > 0">
- and create_dept in
- <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
- #{deptId}
- </foreach>
+ 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
@@ -234,10 +311,18 @@
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
+ 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>
@@ -245,44 +330,37 @@
<!-- 设备出库去向统计 -->
<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
- <if test="effectiveRangeKmIsNotNull != null and effectiveRangeKmIsNotNull == 1">
- and d.effective_range_km is not null
- and d.effective_range_km > 0
- </if>
+ 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
+ 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>
<!-- 设备生产厂商统计 -->
@@ -311,113 +389,128 @@
(SELECT
COUNT(*)
FROM
- ja_fw_device
+ ja_fw_device d
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>
+ 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
+ ja_fw_device d
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>
+ 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
+ ja_fw_device d
+ WHERE d.is_deleted = 0
+ and d.is_enabled = 1
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 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
+ FROM ja_fw_device d
+ WHERE d.is_deleted = 0
+ and d.is_enabled = 1
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 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
+ FROM ja_fw_device d
+ WHERE d.is_deleted = 0
+ and d.is_enabled = 1
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 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>
@@ -443,10 +536,19 @@
and d.belong_dept = #{param2.belongDept}
</if>
<if test="param2.deptList != null and param2.deptList.size > 0">
- and d.create_dept in
+ 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
@@ -458,10 +560,36 @@
</select>
<update id="updateTrackStatusByDeviceId">
- update ja_fw_device
- set track_status = #{trackStatus}
+ 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