From 74b5d54c1cf5dc585a2fe135f4ce4dd2b374b4dd Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 03 Feb 2026 15:55:35 +0800
Subject: [PATCH] 设备列表查询新增多个区域信息

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java |    6 ++++--
 1 files changed, 4 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 902081b..e2052af 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
@@ -86,12 +86,14 @@
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "列表", notes = "传入isAreaSelect、areaId、status")
+	@ApiOperation(value = "列表", notes = "传入isAreaSelect、areaId、areaIds、status")
 	public R<List<FwDeviceVO>> list(@RequestParam(value = "isAreaSelect", required = false) Integer isAreaSelect,
 									@RequestParam(value = "areaId", required = false) Long areaId,
+									@RequestParam(value = "areaIds", required = false) String areaIds,
 									@RequestParam(value = "status", required = false) Integer status,
 									@RequestParam(value = "isTrack", required = false) Integer isTrack) {
-		List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId, status, isTrack);
+		List<Long> areaIdList = Func.toLongList(areaIds);
+		List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId, areaIdList, status, isTrack);
 		FwDeviceWrapper wrapper = FwDeviceWrapper.build();
 		return R.data(list.stream().map(wrapper::entityVO).collect(Collectors.toList()));
 	}

--
Gitblit v1.9.3