From 1aa4efb5846386c9a9eeda5cdc0c52a802dd993d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 08 Apr 2026 19:29:55 +0800
Subject: [PATCH] opt: 删除数据优化

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneController.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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 6346d3a..0e7b65a 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
@@ -54,7 +54,7 @@
 @RestController
 @AllArgsConstructor
 @RequestMapping("area/fwDefenseScene")
-@Api(value = "防控场景表", tags = "防控场景表接口")
+@Api(value = "场景配置表", tags = "场景配置表接口")
 public class FwDefenseSceneController extends BladeController {
 
 	private final IFwDefenseSceneService fwDefenseSceneService;
@@ -77,11 +77,14 @@
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "列表", notes = "传入filterSelected或id")
+	@ApiOperation(value = "列表", notes = "传入filterSelected或zoneId或areaId或unbound或sceneManageId")
 	public R<List<FwDefenseSceneVO>> list(
 		@ApiParam(value = "是否过滤已被选择的数据(1过滤 0不过滤)") @RequestParam(required = false) Integer filterSelected,
-		@ApiParam(value = "区域id") @RequestParam(required = false) Long id) {
-		List<FwDefenseSceneVO> list = fwDefenseSceneService.selectFwDefenseSceneList(filterSelected, id);
+		@ApiParam(value = "防区id") @RequestParam(required = false) Long zoneId,
+		@ApiParam(value = "区域id") @RequestParam(required = false) Long areaId,
+		@ApiParam(value = "是否仅返回未被场景管理绑定的数据(1是 0或空否)") @RequestParam(required = false) Integer unbound,
+		@ApiParam(value = "场景管理id(编辑回显使用)") @RequestParam(required = false) Long sceneManageId) {
+		List<FwDefenseSceneVO> list = fwDefenseSceneService.selectFwDefenseSceneList(filterSelected, zoneId, areaId, unbound, sceneManageId);
 		return R.data(list);
 	}
 
@@ -133,7 +136,7 @@
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(fwDefenseSceneService.deleteLogic(Func.toLongList(ids)));
+		return R.status(fwDefenseSceneService.removeBatchByIds(Func.toLongList(ids)));
 	}
 
 

--
Gitblit v1.9.3