From 1c3d9f4f6d0dc330a80b199cfb824f41a048fe6c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 31 Jan 2026 16:39:33 +0800
Subject: [PATCH] 设备权限优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml | 42 +++++-------------------------------------
1 files changed, 5 insertions(+), 37 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
index ebf9d42..c710fc0 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
@@ -38,7 +38,7 @@
dar.*,
d.device_name,
d.status deviceStatus,
- t.out_target,
+ d.final_outbound_area,
/* 1=已关注，0=未关注 */
EXISTS (
SELECT
@@ -54,28 +54,12 @@
ja_fw_drone_alarm_record dar
left join
ja_fw_device d on dar.device_id = d.id
- /* 关联出库去向表，看设备去了哪里 */
- 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>
dar.is_deleted = 0
and d.track_status = 1
+ and d.is_enabled = 1
<if test="param2.regionName != null and param2.regionName != ''">
- and (t.out_target = #{param2.regionName}
+ and (d.final_outbound_area = #{param2.regionName}
<!-- 或者设备是共享给当前部门的 -->
<if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
or dar.device_id in (
@@ -187,28 +171,12 @@
ja_fw_drone_alarm_record dar
left join
ja_fw_device d on dar.device_id = d.id
- /* 关联出库去向表，看设备去了哪里 */
- 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 dar.is_deleted = 0
AND d.track_status = 1
AND d.is_deleted = 0
+ and d.is_enabled = 1
<if test="regionName != null and regionName != ''">
- and (t.out_target = #{regionName}
+ and (d.final_outbound_area = #{regionName}
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or dar.device_id in (
--
Gitblit v1.9.3