From 37bba38bc0f583ceed7b4d97a4197140fadd9083 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Wed, 15 Oct 2025 09:23:53 +0800
Subject: [PATCH] 优化包结构

---
 ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 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 82887b7..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,26 +31,25 @@
 @ApiSort(value = 2)
 @RequestMapping("/uav/base")
 @RestController
-public class UavBaseController {
+public class UavBaseController extends BaseController {
 
     @Resource
     private ITyService tyService;
 
-    @ApiOperation("获取天宇token信息")
+    @ApiOperation("获取六合token信息")
     @ApiOperationSupport(order = 1)
-    @GetMapping("/getToken")
-    public AjaxResult getToken() {
-        return AjaxResult.success(tyService.getAccessToken());
+    @GetMapping("/getToken/{serverId}")
+    public AjaxResult getToken(@PathVariable("serverId") String serverId) {
+        return AjaxResult.success(tyService.getAccessToken(serverId));
     }
 
-    @ApiOperation("获取天宇盒子列表")
+    @ApiOperation("获取六合盒子列表")
     @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 +76,20 @@
     }
 
     @ApiOperation("修改云盒设置")
+    @ApiOperationSupport(order = 6)
     @PostMapping("/updateBoxSettings")
     public AjaxResult updateBoxSettings(@RequestBody BoxSettingsDTO boxSettingsDTO) {
         Boolean state = tyService.updateBoxSettings(boxSettingsDTO);
         return AjaxResult.success(state);
     }
 
+    @ApiOperation("根据[服务器id]获取六合盒子列表")
+    @ApiOperationSupport(order = 7)
+    @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