From a9780c49f8cf587af26cc83d439320ad02b8668f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 15 Oct 2025 09:17:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 06cc14a..4373dd7 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
@@ -1,6 +1,8 @@
package com.ard.web.controller.work;
+import com.ard.common.core.controller.BaseController;
import com.ard.common.core.domain.AjaxResult;
+import com.ard.common.core.page.TableDataInfo;
import com.ard.work.domain.dto.BoxHistoryDTO;
import com.ard.work.domain.dto.BoxPhotosDTO;
import com.ard.work.domain.dto.BoxSettingsDTO;
@@ -17,6 +19,8 @@
import javax.annotation.Resource;
import java.util.List;
+import static com.ard.common.utils.PageUtils.startPage;
+
/**
* UavBaseController
*
@@ -27,7 +31,7 @@
@ApiSort(value = 2)
@RequestMapping("/uav/base")
@RestController
-public class UavBaseController {
+public class UavBaseController extends BaseController {
@Resource
private ITyService tyService;
@@ -79,12 +83,13 @@
return AjaxResult.success(state);
}
- @ApiOperation("根据boxSn获取六合盒子列表")
+ @ApiOperation("根据[服务器id]获取六合盒子列表")
@ApiOperationSupport(order = 7)
- @GetMapping("/getBoxSnToList")
- public AjaxResult getBoxSnToList(String boxSn) {
- List<BoxInfoReceiver> boxList = tyService.getBoxSnToList(boxSn);
- return AjaxResult.success(boxList);
+ @GetMapping("/getBoxSnToList/{id}")
+ public TableDataInfo getBoxSnToList(@PathVariable("id") String id) {
+ startPage();
+ List<BoxInfoReceiver> boxList = tyService.getBoxSnToList(id);
+ return getDataTable(boxList);
}
}
\ No newline at end of file
--
Gitblit v1.9.3