From f8c9dba8366da27a2ed7c176533ac92261efe2b4 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 12 Feb 2026 09:14:17 +0800
Subject: [PATCH] 报废无人机显示绑定区域
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 902081b..a6a189c 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
@@ -40,6 +40,7 @@
import org.sxkj.fw.device.excel.FwDeviceExcel;
import org.sxkj.fw.device.param.FwDevicePageParam;
import org.sxkj.fw.device.service.IFwDeviceService;
+import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
import org.sxkj.fw.device.vo.DeviceTypeStatisticsVO;
import org.sxkj.fw.device.vo.FwDeviceVO;
import org.sxkj.fw.device.wrapper.FwDeviceWrapper;
@@ -86,12 +87,14 @@
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
- @ApiOperation(value = "列表", notes = "传入isAreaSelect、areaId、status")
+ @ApiOperation(value = "列表", notes = "传入isAreaSelect、areaId、areaIds、status")
public R<List<FwDeviceVO>> list(@RequestParam(value = "isAreaSelect", required = false) Integer isAreaSelect,
@RequestParam(value = "areaId", required = false) Long areaId,
+ @RequestParam(value = "areaIds", required = false) String areaIds,
@RequestParam(value = "status", required = false) Integer status,
@RequestParam(value = "isTrack", required = false) Integer isTrack) {
- List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId, status, isTrack);
+ List<Long> areaIdList = Func.toLongList(areaIds);
+ List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId, areaIdList, status, isTrack);
FwDeviceWrapper wrapper = FwDeviceWrapper.build();
return R.data(list.stream().map(wrapper::entityVO).collect(Collectors.toList()));
}
@@ -212,13 +215,13 @@
*/
@GetMapping("/checkAreaBind")
@ApiOperationSupport(order = 9)
- @ApiOperation(value = "设备区域绑定校验", notes = "传入deviceId")
- public R<Boolean> checkAreaBind(@ApiParam(value = "设备ID", required = true) @RequestParam Long deviceId) {
+ @ApiOperation(value = "设备区域绑定校验", notes = "传入deviceId，返回设备绑定区域名称")
+ public R<String> checkAreaBind(@ApiParam(value = "设备ID", required = true) @RequestParam Long deviceId) {
FwDeviceEntity device = fwDeviceService.getById(deviceId);
if (device == null || (device.getIsDeleted() != null && device.getIsDeleted() != 0)) {
return R.fail("该设备不存在");
}
- return R.data(fwDeviceService.existsAreaBindByDeviceId(deviceId));
+ return R.data(fwDeviceService.selectAreaBindNameByDeviceId(deviceId));
}
/**
@@ -237,5 +240,12 @@
List<FwDeviceExcel> list = fwDeviceService.exportFwDevice(queryWrapper);
ExcelUtil.export(response, "设备表数据" + DateUtil.time(), "设备表数据表", list, FwDeviceExcel.class);
}
-
+ // 任务调度使用
+ @GetMapping("/listByTask")
+ @ApiOperationSupport(order = 10)
+ @ApiOperation(value = "任务调度使用")
+ public R<IPage<CockpitFwDeviceVO>> listByTask(FwDeviceDTO fwDevice, Query query) {
+ IPage<CockpitFwDeviceVO> pages = fwDeviceService.selectCockpitDevicePage(Condition.getPage(query), fwDevice);
+ return R.data(pages);
+ }
}
--
Gitblit v1.9.3