From fc7ee73b5f804116ada59048fdf6fb9265856a3f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 04 Feb 2026 09:45:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/java/com/ard/web/controller/work/UavControlController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/work/UavControlController.java b/ard-admin/src/main/java/com/ard/web/controller/work/UavControlController.java
index 12cd1de..92ba714 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/work/UavControlController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/work/UavControlController.java
@@ -35,8 +35,10 @@
public AjaxResult handleControlRequest(
@RequestParam String boxSn,
@RequestParam String type,
- @RequestParam boolean approve) {
- return AjaxResult.success(uavControlService.handleControlResponse(boxSn, approve, type));
+ @RequestParam boolean approve,
+ @RequestParam Long requesterId
+ ) {
+ return AjaxResult.success(uavControlService.handleControlResponse(boxSn, approve, type, requesterId));
}
/**
@@ -56,6 +58,7 @@
public AjaxResult getCurrentController(@RequestParam String boxSn, @RequestParam String type) {
return AjaxResult.success(uavControlService.getCurrentController(boxSn, type));
}
+
/**
* 获取全部类型当前控制者
*/
--
Gitblit v1.9.3