From 77ae6ed9a1a800bab0d048a6453d383ec35a54b9 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Mon, 13 Oct 2025 15:13:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java b/ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java
index 6a97548..06cc14a 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java
@@ -43,10 +43,9 @@
@ApiOperationSupport(order = 2)
@GetMapping("/getBoxList")
public AjaxResult getBoxList() {
- List<BoxInfoReceiver> BoxList = tyService.getBoxList();
- return AjaxResult.success(BoxList);
+ List<BoxInfoReceiver> boxList = tyService.getBoxList();
+ return AjaxResult.success(boxList);
}
-
@ApiOperation("获取飞行历史")
@ApiOperationSupport(order = 3)
@@ -73,10 +72,19 @@
}
@ApiOperation("修改云盒设置")
+ @ApiOperationSupport(order = 6)
@PostMapping("/updateBoxSettings")
public AjaxResult updateBoxSettings(@RequestBody BoxSettingsDTO boxSettingsDTO) {
Boolean state = tyService.updateBoxSettings(boxSettingsDTO);
return AjaxResult.success(state);
}
+ @ApiOperation("根据boxSn获取六合盒子列表")
+ @ApiOperationSupport(order = 7)
+ @GetMapping("/getBoxSnToList")
+ public AjaxResult getBoxSnToList(String boxSn) {
+ List<BoxInfoReceiver> boxList = tyService.getBoxSnToList(boxSn);
+ return AjaxResult.success(boxList);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3