From 74b5d54c1cf5dc585a2fe135f4ce4dd2b374b4dd Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 03 Feb 2026 15:55:35 +0800
Subject: [PATCH] 设备列表查询新增多个区域信息
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 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..e2052af 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;
@@ -85,12 +86,26 @@
*/
@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()));
+ }
+
+ /**
+ * 设备表 列表（多边形过滤）
+ */
+ @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()));
}
@@ -116,6 +131,16 @@
}
/**
+ * 设备表 新增或修改
+ */
+ @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, "", ""));
+ }
+
+ /**
* 设备表 删除
*/
@PostMapping("/remove")
@@ -127,6 +152,7 @@
/**
* 设备类型统计
+ *
* @return 统计数据
*/
@GetMapping("/statisticalDeviceType")
@@ -138,6 +164,7 @@
/**
* 设备出库去向统计
+ *
* @return 统计数据
*/
@GetMapping("/statisticalDeviceOut")
@@ -152,6 +179,7 @@
/**
* 设备生产厂商统计
+ *
* @return 统计数据
*/
@GetMapping("/statisticalDeviceManufacturer")
@@ -159,6 +187,26 @@
@ApiOperation(value = "设备生产厂商统计", notes = "设备生产厂商统计")
public R<List<DeviceStatisticsVO>> statisticalDeviceManufacturer() {
return R.data(fwDeviceService.getDeviceManufacturerStatistics());
+ }
+
+ /**
+ * 查询非本部门区域的设备
+ *
+ * @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));
}
/**
@@ -184,7 +232,7 @@
@ApiIgnore
public void exportFwDevice(@ApiIgnore @RequestParam Map<String, Object> fwDevice, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<FwDeviceEntity> queryWrapper = Condition.getQueryWrapper(fwDevice, FwDeviceEntity.class);
- //if (!AuthUtil.isAdministrator()) {
+ // if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(FwDevice::getTenantId, bladeUser.getTenantId());
//}
queryWrapper.lambda().eq(FwDeviceEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
--
Gitblit v1.9.3