From 6b3eead4b660064f58412c80d36b35cc659fc077 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 13 Jan 2026 10:55:26 +0800
Subject: [PATCH] 设备，场景，区域，派出所新增list
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
index f1a61bb..90e7354 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
@@ -48,6 +48,7 @@
import javax.validation.Valid;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 设备表 控制器
@@ -80,10 +81,22 @@
}
/**
+ * 设备表 列表
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "列表", notes = "仅传入isAreaSelect")
+ public R<List<FwDeviceVO>> list(@RequestParam(value = "isAreaSelect", required = false) Integer isAreaSelect) {
+ List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect);
+ FwDeviceWrapper wrapper = FwDeviceWrapper.build();
+ return R.data(list.stream().map(wrapper::entityVO).collect(Collectors.toList()));
+ }
+
+ /**
* 设备表 自定义分页
*/
@GetMapping("/page")
- @ApiOperationSupport(order = 2)
+ @ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入fwDevice")
public R<IPage<FwDeviceVO>> page(FwDevicePageParam fwDevice, Query query) {
IPage<FwDeviceEntity> pages = fwDeviceService.selectFwDevicePage(Condition.getPage(query), GenericConverter.convert(fwDevice, FwDeviceDTO.class));
@@ -94,7 +107,7 @@
* 设备表 新增或修改
*/
@PostMapping("/submit")
- @ApiOperationSupport(order = 3)
+ @ApiOperationSupport(order = 4)
@ApiOperation(value = "新增或修改", notes = "传入fwDevice")
public R submit(@Valid @RequestBody FwDeviceDTO fwDevice) {
return R.status(fwDeviceService.saveOrUpdate(FwDeviceWrapper.build().entityDTO(fwDevice)));
@@ -104,7 +117,7 @@
* 设备表 删除
*/
@PostMapping("/remove")
- @ApiOperationSupport(order = 4)
+ @ApiOperationSupport(order = 5)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(fwDeviceService.deleteLogic(Func.toLongList(ids)));
@@ -115,7 +128,7 @@
* 导出数据
*/
@GetMapping("/export-fwDevice")
- @ApiOperationSupport(order = 5)
+ @ApiOperationSupport(order = 6)
@ApiOperation(value = "导出数据", notes = "传入fwDevice")
@ApiIgnore
public void exportFwDevice(@ApiIgnore @RequestParam Map<String, Object> fwDevice, BladeUser bladeUser, HttpServletResponse response) {
--
Gitblit v1.9.3