From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 02 Feb 2026 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java | 14 +++++++++++---
1 files changed, 11 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 9406ba9..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
@@ -134,7 +134,7 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "修改设备出入库状态", notes = "传入fwDevice")
public R updateTrackStatus(@ApiParam(value = "", required = true) @RequestParam Long deviceId) {
- return R.status(fwDeviceService.updateTrackStatusByDeviceId(deviceId,0));
+ return R.status(fwDeviceService.updateTrackStatusByDeviceId(deviceId,0,""));
}
/**
@@ -185,13 +185,21 @@
/**
* 查询非本部门区域的设备
+ * @param regionCode 区域编码，用于查询不在该区域内的设备
+ * @param deptId 机构ID，用于限定查询范围
* @return 设备列表
*/
@GetMapping("/nonDeptAreaDevices")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "查询非本部门区域的设备", notes = "查询不在当前部门及其子部门区域内的设备")
- public R<List<FwDeviceVO>> getNonDeptAreaDevices() {
- return R.data(fwDeviceService.getNonDeptAreaDevices());
+ @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));
}
/**
--
Gitblit v1.9.3