From 9589ee836c7921cbd85edd0dec994c77fa5ba7e4 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 30 Jan 2026 16:39:50 +0800
Subject: [PATCH] 设备共享接口
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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..860f2aa 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
@@ -204,16 +204,17 @@
/**
* 查询非本部门区域的设备
*
+ * @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