From d18ef72c533fe6b18d487bcd9fd333c63ca50f04 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 03 Feb 2026 15:20:27 +0800
Subject: [PATCH] 反无驾驶舱优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 64 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 21 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 d44b2e0..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
@@ -250,8 +250,8 @@
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="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode}, '%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -281,8 +281,8 @@
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="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode}, '%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -338,10 +338,6 @@
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>
@@ -393,8 +389,8 @@
WHERE
d.is_deleted = 0
and d.is_enabled = 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 (
@@ -415,8 +411,8 @@
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="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -436,8 +432,8 @@
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="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -456,8 +452,8 @@
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="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -476,8 +472,8 @@
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="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -499,8 +495,8 @@
<where>
d.is_deleted = 0
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 (
@@ -563,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>
@@ -592,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