From 6a8762f95544819eeea4a4d5503232e1925ca04c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 03 Feb 2026 17:28:49 +0800
Subject: [PATCH] 反无驾驶舱优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 107 +++++++++++++++++++++++++++++++----------------------
1 files changed, 63 insertions(+), 44 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 69d48af..96e534b 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
@@ -156,6 +156,7 @@
select * from ja_fw_device
<where>
is_deleted = 0
+ and track_status = 1
<if test="query.isAreaSelect != null and query.isAreaSelect == 1">
and (
<choose>
@@ -249,9 +250,8 @@
d.is_deleted = 0
AND d.is_enabled = 1
AND status != 3
- AND track_status = 1
- <if test="regionName != null and regionName != ''">
- and (d.final_outbound_area = #{regionName}
+ <if test="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode}, '%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -281,9 +281,8 @@
AND is_enabled = 1
AND status != 3
AND device_type = '3'
- AND track_status = 1
- <if test="regionName != null and regionName != ''">
- and (d.final_outbound_area = #{regionName}
+ <if test="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode}, '%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -312,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>
@@ -331,18 +338,22 @@
d.is_deleted = 0
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
d.final_outbound_area
@@ -378,11 +389,8 @@
WHERE
d.is_deleted = 0
and d.is_enabled = 1
- and effective_range_km is not null
- and effective_range_km > 0
- AND track_status = 1
- <if test="regionName != null and regionName != ''">
- and (d.final_outbound_area = #{regionName}
+ <if test="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -403,11 +411,8 @@
d.is_deleted = 0
and d.is_enabled = 1
AND device_att = '1'
- and effective_range_km is not null
- and effective_range_km > 0
- AND track_status = 1
- <if test="regionName != null and regionName != ''">
- and (d.final_outbound_area = #{regionName}
+ <if test="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -427,11 +432,8 @@
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
- AND track_status = 1
- <if test="regionName != null and regionName != ''">
- and (d.final_outbound_area = #{regionName}
+ <if test="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -450,11 +452,8 @@
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
- AND track_status = 1
- <if test="regionName != null and regionName != ''">
- and (d.final_outbound_area = #{regionName}
+ <if test="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -473,11 +472,8 @@
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
- AND track_status = 1
- <if test="regionName != null and regionName != ''">
- and (d.final_outbound_area = #{regionName}
+ <if test="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -498,12 +494,9 @@
ja_fw_device d
<where>
d.is_deleted = 0
--- and d.effective_range_km is not null
--- and d.effective_range_km > 0
- and d.track_status = 1
and d.is_enabled = 1
- <if test="param2.regionName != null and param2.regionName != ''">
- and (d.final_outbound_area = #{param2.regionName}
+ <if test="param2.regionCode != null and param2.regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{param2.regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
<if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
or d.id in (
@@ -566,7 +559,8 @@
update
ja_fw_device
set track_status = #{trackStatus},
- final_outbound_area = #{outTarget}
+ final_outbound_area = #{outTarget},
+ final_outbound_area_code = #{outTargetCode}
where id = #{deviceId}
and is_deleted = 0
</update>
@@ -575,7 +569,7 @@
<select id="selectNonDeptAreaDevices" resultType="org.sxkj.fw.device.vo.FwDeviceVO">
SELECT
d.*,
- t.out_target,
+ d.final_outbound_area as outTarget,
ps.id AS shareId,
CASE
WHEN ps.id IS NOT NULL THEN TRUE
@@ -595,4 +589,29 @@
AND d.final_outbound_area != #{regionName}
</select>
+ <select id="getDeviceStatistics" resultType="org.sxkj.fw.cockpit.vo.DeviceStatisticsVO">
+ SELECT
+ d.final_outbound_area AS type,
+ COUNT(*) AS count
+ FROM
+ ja_fw_device d
+ WHERE
+ d.is_deleted = 0
+ AND d.is_enabled = 1
+ AND d.final_outbound_area IS NOT NULL
+ <if test="regionCode != null and regionCode != ''">
+ and ( d.final_outbound_area_code like concat(#{regionCode},'%')
+ <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
+ d.final_outbound_area
+ </select>
+
</mapper>
--
Gitblit v1.9.3