From 0bfcf7c70e19bd0f1215368ef6bdc47603db9a81 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 14 Jan 2026 10:54:09 +0800
Subject: [PATCH] 场景和区域增加列表增加查询条件

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneController.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneController.java
index 4608004..bdd1607 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneController.java
@@ -77,11 +77,12 @@
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "列表", notes = "传入filterSelected或zoneId")
+	@ApiOperation(value = "列表", notes = "传入filterSelected或zoneId或areaId")
 	public R<List<FwDefenseSceneVO>> list(
 		@ApiParam(value = "是否过滤已被选择的数据(1过滤 0不过滤)") @RequestParam(required = false) Integer filterSelected,
-		@ApiParam(value = "防区id") @RequestParam(required = false) Long zoneId) {
-		List<FwDefenseSceneVO> list = fwDefenseSceneService.selectFwDefenseSceneList(filterSelected, zoneId);
+		@ApiParam(value = "防区id") @RequestParam(required = false) Long zoneId,
+		@ApiParam(value = "区域id") @RequestParam(required = false) Long areaId) {
+		List<FwDefenseSceneVO> list = fwDefenseSceneService.selectFwDefenseSceneList(filterSelected, zoneId, areaId);
 		return R.data(list);
 	}
 

--
Gitblit v1.9.3