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/FwPoliceStationController.java |   68 ++++++++++++++++++----------------
 1 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwPoliceStationController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwPoliceStationController.java
index 89924ee..2b45fc9 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwPoliceStationController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwPoliceStationController.java
@@ -64,21 +64,24 @@
 	 */
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入fwPoliceStation")
-	public R<FwPoliceStationVO> detail(FwPoliceStationEntity fwPoliceStation) {
-		FwPoliceStationEntity detail = fwPoliceStationService.getOne(Condition.getQueryWrapper(fwPoliceStation));
+	@ApiOperation(value = "详情", notes = "传入id")
+	public R<FwPoliceStationVO> detail(@ApiParam(value = "主键id", required = true) @RequestParam Long id) {
+		if (id == null) {
+			return R.fail("主键不能为空");
+		}
+		FwPoliceStationEntity detail = fwPoliceStationService.getById(id);
 		return R.data(FwPoliceStationWrapper.build().entityVO(detail));
 	}
-	/**
-	 * 派出所信息表 分页
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入fwPoliceStation")
-	public R<IPage<FwPoliceStationVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwPoliceStation, Query query) {
-		IPage<FwPoliceStationEntity> pages = fwPoliceStationService.page(Condition.getPage(query), Condition.getQueryWrapper(fwPoliceStation, FwPoliceStationEntity.class));
-		return R.data(FwPoliceStationWrapper.build().pageVO(pages));
-	}
+//	/**
+//	 * 派出所信息表 分页
+//	 */
+//	@GetMapping("/list")
+//	@ApiOperationSupport(order = 2)
+//	@ApiOperation(value = "分页", notes = "传入fwPoliceStation")
+//	public R<IPage<FwPoliceStationVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwPoliceStation, Query query) {
+//		IPage<FwPoliceStationEntity> pages = fwPoliceStationService.page(Condition.getPage(query), Condition.getQueryWrapper(fwPoliceStation, FwPoliceStationEntity.class));
+//		return R.data(FwPoliceStationWrapper.build().pageVO(pages));
+//	}
 
 	/**
 	 * 派出所信息表 自定义分页
@@ -91,25 +94,25 @@
 		return R.data(pages);
 	}
 
-	/**
-	 * 派出所信息表 新增
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入fwPoliceStation")
-	public R save(@Valid @RequestBody FwPoliceStationEntity fwPoliceStation) {
-		return R.status(fwPoliceStationService.save(fwPoliceStation));
-	}
-
-	/**
-	 * 派出所信息表 修改
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入fwPoliceStation")
-	public R update(@Valid @RequestBody FwPoliceStationEntity fwPoliceStation) {
-		return R.status(fwPoliceStationService.updateById(fwPoliceStation));
-	}
+//	/**
+//	 * 派出所信息表 新增
+//	 */
+//	@PostMapping("/save")
+//	@ApiOperationSupport(order = 4)
+//	@ApiOperation(value = "新增", notes = "传入fwPoliceStation")
+//	public R save(@Valid @RequestBody FwPoliceStationEntity fwPoliceStation) {
+//		return R.status(fwPoliceStationService.save(fwPoliceStation));
+//	}
+//
+//	/**
+//	 * 派出所信息表 修改
+//	 */
+//	@PostMapping("/update")
+//	@ApiOperationSupport(order = 5)
+//	@ApiOperation(value = "修改", notes = "传入fwPoliceStation")
+//	public R update(@Valid @RequestBody FwPoliceStationEntity fwPoliceStation) {
+//		return R.status(fwPoliceStationService.updateById(fwPoliceStation));
+//	}
 
 	/**
 	 * 派出所信息表 新增或修改
@@ -135,6 +138,7 @@
 	/**
 	 * 导出数据
 	 */
+	@ApiIgnore
 	@GetMapping("/export-fwPoliceStation")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入fwPoliceStation")

--
Gitblit v1.9.3