Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-10-17 1ab85e9fd1b392d36c6f2b08754249e4574ea4e8

 ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java

@@ -43,16 +43,19 @@
        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);
    public AjaxResult getBoxList(@RequestParam(required = false) String serverId) {
        if (serverId == null) {
            return AjaxResult.success(tyService.getBoxList());
        } else {
            return AjaxResult.success(tyService.getBoxList(serverId));
        }
    }

    @ApiOperation("获取飞行历史")
    @ApiOperationSupport(order = 3)
    @ApiOperationSupport(order = 4)
    @PostMapping("/getBoxHistory")
    public AjaxResult getBoxHistory(@RequestBody BoxHistoryDTO boxHistoryDTO) {
        List<BoxHistoryReceiver> boxHistory = tyService.getBoxHistory(boxHistoryDTO);
@@ -60,7 +63,7 @@
    }

    @ApiOperation("获取任务照片")
    @ApiOperationSupport(order = 4)
    @ApiOperationSupport(order = 5)
    @PostMapping("/getBoxPhotos")
    public AjaxResult getBoxPhotos(@RequestBody BoxPhotosDTO boxPhotosDTO) {
        List<BoxPhotosReceiver> boxPhotos = tyService.getBoxPhotos(boxPhotosDTO);
@@ -68,7 +71,7 @@
    }

    @ApiOperation("获取直播地址")
    @ApiOperationSupport(order = 5)
    @ApiOperationSupport(order = 6)
    @GetMapping("/getBoxList/{boxSn}")
    public AjaxResult getBoxLiveUrl(@PathVariable("boxSn") String boxSn) {
        BoxStreamUrlReceiver boxLiveUrl = tyService.getBoxLiveUrl(boxSn);
@@ -76,7 +79,7 @@
    }

    @ApiOperation("修改云盒设置")
    @ApiOperationSupport(order = 6)
    @ApiOperationSupport(order = 7)
    @PostMapping("/updateBoxSettings")
    public AjaxResult updateBoxSettings(@RequestBody BoxSettingsDTO boxSettingsDTO) {
        Boolean state = tyService.updateBoxSettings(boxSettingsDTO);
@@ -84,7 +87,7 @@
    }

    @ApiOperation("根据[服务器id]获取六合盒子列表")
    @ApiOperationSupport(order = 7)
    @ApiOperationSupport(order = 8)
    @GetMapping("/getBoxSnToList/{id}")
    public TableDataInfo getBoxSnToList(@PathVariable("id") String id) {
        startPage();