From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 02 Feb 2026 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
index fbca111..b01203c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
@@ -197,23 +197,24 @@
}
@Override
- public boolean updateTrackStatusByDeviceId(Long deviceId, Integer trackStatus) {
- return baseMapper.updateTrackStatusByDeviceId(deviceId, trackStatus) > 0;
+ public boolean updateTrackStatusByDeviceId(Long deviceId, Integer trackStatus, String outTarget) {
+ return baseMapper.updateTrackStatusByDeviceId(deviceId, trackStatus, outTarget) > 0;
}
/**
* 查询非本部门区域的设备
*
+ * @param regionCode 区域编码，用于查询不在该区域内的设备
+ * @param deptId 机构ID，用于限定查询范围
* @return 设备列表
*/
@Override
- public List<FwDeviceVO> getNonDeptAreaDevices() {
- // 1. 获取当前用户的部门ID
- String currentDeptId = AuthUtil.getDeptId();
- Dept dept = SysCache.getDept(Long.valueOf(currentDeptId));
- // 3. 查询不在这些部门区域内的设备
- Region byCode = RegionCache.getByCode(dept.getAreaCode());
- List<FwDeviceVO> deviceList = baseMapper.selectNonDeptAreaDevices(byCode.getName(), currentDeptId);
+ public List<FwDeviceVO> getNonDeptAreaDevices(String regionCode, String deptId) {
+ // 1. 根据区域编码获取区域名称
+ Region region = RegionCache.getByCode(regionCode);
+ String regionName = region != null ? region.getName() : null;
+ // 2. 查询不在这些部门区域内的设备
+ List<FwDeviceVO> deviceList = baseMapper.selectNonDeptAreaDevices(regionName, deptId);
return deviceList;
}
}
--
Gitblit v1.9.3