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/device/controller/FwDeviceController.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 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 085d7cb..afe32d6 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
@@ -35,6 +35,7 @@
import org.sxkj.fw.common.GenericConverter;
import org.sxkj.fw.common.IdParam;
import org.sxkj.fw.device.dto.FwDeviceDTO;
+import org.sxkj.fw.device.dto.FwDevicePolygonQueryDTO;
import org.sxkj.fw.device.entity.FwDeviceEntity;
import org.sxkj.fw.device.excel.FwDeviceExcel;
import org.sxkj.fw.device.param.FwDevicePageParam;
@@ -96,6 +97,18 @@
}
/**
+ * 设备表 列表（多边形过滤）
+ */
+ @PostMapping("/listByPolygons")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "列表-多边形过滤", notes = "传入isAreaSelect、areaId、status、isTrack、polygons")
+ public R<List<FwDeviceVO>> listByPolygons(@Valid @RequestBody FwDevicePolygonQueryDTO query) {
+ List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceListByPolygons(query);
+ FwDeviceWrapper wrapper = FwDeviceWrapper.build();
+ return R.data(list.stream().map(wrapper::entityVO).collect(Collectors.toList()));
+ }
+
+ /**
* 设备表 自定义分页
*/
@GetMapping("/page")
@@ -113,6 +126,15 @@
@ApiOperation(value = "新增或修改", notes = "传入fwDevice")
public R submit(@Valid @RequestBody FwDeviceDTO fwDevice) {
return R.status(fwDeviceService.saveOrUpdateDevice(FwDeviceWrapper.build().entityDTO(fwDevice)));
+ }
+ /**
+ * 设备表 新增或修改
+ */
+ @PostMapping("/updateTrackStatus")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "修改设备出入库状态", notes = "传入fwDevice")
+ public R updateTrackStatus(@ApiParam(value = "", required = true) @RequestParam Long deviceId) {
+ return R.status(fwDeviceService.updateTrackStatusByDeviceId(deviceId,0,""));
}
/**
@@ -162,6 +184,25 @@
}
/**
+ * 查询非本部门区域的设备
+ * @param regionCode 区域编码，用于查询不在该区域内的设备
+ * @param deptId 机构ID，用于限定查询范围
+ * @return 设备列表
+ */
+ @GetMapping("/nonDeptAreaDevices")
+ @ApiOperationSupport(order = 9)
+ @ApiOperation(value = "查询非本部门区域的设备", notes = "查询不在当前部门及其子部门区域内的设备")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "regionCode", value = "区域编码", paramType = "query", dataType = "string", required = true),
+ @ApiImplicitParam(name = "deptId", value = "机构ID", paramType = "query", dataType = "string", required = true)
+ })
+ public R<List<FwDeviceVO>> getNonDeptAreaDevices(
+ @ApiParam(value = "区域编码", required = true) @RequestParam String regionCode,
+ @ApiParam(value = "机构ID", required = true) @RequestParam String deptId) {
+ return R.data(fwDeviceService.getNonDeptAreaDevices(regionCode, deptId));
+ }
+
+ /**
* 设备区域绑定校验
*/
@GetMapping("/checkAreaBind")
--
Gitblit v1.9.3