From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneController.java | 59 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 25 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..32d60a2 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;
@@ -64,20 +64,28 @@
*/
@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));
+ @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 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);
}
/**
@@ -94,22 +102,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 +143,7 @@
/**
* 导出数据
*/
+ @ApiIgnore
@GetMapping("/export-fwDefenseScene")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入fwDefenseScene")
--
Gitblit v1.9.3