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/controller/FwDeviceController.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
index 9406ba9..5938bb0 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
@@ -185,13 +185,21 @@
 
 	/**
 	 * 查询非本部门区域的设备
+	 * @param regionCode 区域编码,用于查询不在该区域内的设备
+	 * @param deptId 机构ID,用于限定查询范围
 	 * @return 设备列表
 	 */
 	@GetMapping("/nonDeptAreaDevices")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "查询非本部门区域的设备", notes = "查询不在当前部门及其子部门区域内的设备")
-	public R<List<FwDeviceVO>> getNonDeptAreaDevices() {
-		return R.data(fwDeviceService.getNonDeptAreaDevices());
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "regionCode", value = "区域编码", paramType = "query", dataType = "string", required = true),
+		@ApiImplicitParam(name = "deptId", value = "机构ID", paramType = "query", dataType = "string", required = true)
+	})
+	public R<List<FwDeviceVO>> getNonDeptAreaDevices(
+			@ApiParam(value = "区域编码", required = true) @RequestParam String regionCode,
+			@ApiParam(value = "机构ID", required = true) @RequestParam String deptId) {
+		return R.data(fwDeviceService.getNonDeptAreaDevices(regionCode, deptId));
 	}
 
 	/**

--
Gitblit v1.9.3