From 3ae46f2a59f9d4e751f78d8dc1a896ceba5ca495 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 09 Jan 2026 15:13:40 +0800
Subject: [PATCH] 区域管理模块

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneController.java |   56 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 30 insertions(+), 26 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 b9ea234..13808b1 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
@@ -64,21 +64,24 @@
 	 */
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入fwDefenseScene")
-	public R<FwDefenseSceneVO> detail(FwDefenseSceneEntity fwDefenseScene) {
-		FwDefenseSceneEntity detail = fwDefenseSceneService.getOne(Condition.getQueryWrapper(fwDefenseScene));
+	@ApiOperation(value = "详情", notes = "传入id")
+	public R<FwDefenseSceneVO> detail(@ApiParam(value = "主键id", required = true) @RequestParam Long id) {
+		if (id == null) {
+			return R.fail("主键不能为空");
+		}
+		FwDefenseSceneEntity detail = fwDefenseSceneService.getById(id);
 		return R.data(FwDefenseSceneWrapper.build().entityVO(detail));
 	}
 	/**
 	 * 防控场景表 分页
 	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入fwDefenseScene")
-	public R<IPage<FwDefenseSceneVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwDefenseScene, Query query) {
-		IPage<FwDefenseSceneEntity> pages = fwDefenseSceneService.page(Condition.getPage(query), Condition.getQueryWrapper(fwDefenseScene, FwDefenseSceneEntity.class));
-		return R.data(FwDefenseSceneWrapper.build().pageVO(pages));
-	}
+	// @GetMapping("/list")
+	// @ApiOperationSupport(order = 2)
+	// @ApiOperation(value = "分页", notes = "传入fwDefenseScene")
+	// public R<IPage<FwDefenseSceneVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwDefenseScene, Query query) {
+	// 	IPage<FwDefenseSceneEntity> pages = fwDefenseSceneService.page(Condition.getPage(query), Condition.getQueryWrapper(fwDefenseScene, FwDefenseSceneEntity.class));
+	// 	return R.data(FwDefenseSceneWrapper.build().pageVO(pages));
+	// }
 
 	/**
 	 * 防控场景表 自定义分页
@@ -94,22 +97,22 @@
 	/**
 	 * 防控场景表 新增
 	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入fwDefenseScene")
-	public R save(@Valid @RequestBody FwDefenseSceneEntity fwDefenseScene) {
-		return R.status(fwDefenseSceneService.save(fwDefenseScene));
-	}
-
-	/**
-	 * 防控场景表 修改
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入fwDefenseScene")
-	public R update(@Valid @RequestBody FwDefenseSceneEntity fwDefenseScene) {
-		return R.status(fwDefenseSceneService.updateById(fwDefenseScene));
-	}
+	// @PostMapping("/save")
+	// @ApiOperationSupport(order = 4)
+	// @ApiOperation(value = "新增", notes = "传入fwDefenseScene")
+	// public R save(@Valid @RequestBody FwDefenseSceneEntity fwDefenseScene) {
+	// 	return R.status(fwDefenseSceneService.save(fwDefenseScene));
+	// }
+//
+//	/**
+//	 * 防控场景表 修改
+//	 */
+//	@PostMapping("/update")
+//	@ApiOperationSupport(order = 5)
+//	@ApiOperation(value = "修改", notes = "传入fwDefenseScene")
+//	public R update(@Valid @RequestBody FwDefenseSceneEntity fwDefenseScene) {
+//		return R.status(fwDefenseSceneService.updateById(fwDefenseScene));
+//	}
 
 	/**
 	 * 防控场景表 新增或修改
@@ -135,6 +138,7 @@
 	/**
 	 * 导出数据
 	 */
+	@ApiIgnore
 	@GetMapping("/export-fwDefenseScene")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入fwDefenseScene")

--
Gitblit v1.9.3