From 8ccdc1da5a12248af84383b92c1bcd1ea921b71f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 06 Dec 2025 15:27:33 +0800
Subject: [PATCH] 2025-12-06 zwy 在机场设备详情页中,设置机场摄像头舱内、舱外,飞行器视频广角、变焦、红外时,将状态广播发送所有在线用户更改页面按钮选项;

---
 ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java b/ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java
index c3c7a30..f27c889 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java
@@ -97,7 +97,7 @@
     @ApiOperation("设备列表")
     @PreAuthorize("@ss.hasPermi('device:dock:list')")
     @GetMapping("/list")
-    public ResponseResult<List<DeviceDTO>> getDevices(String nickname) {
+    public ResponseResult<List<DeviceDTO>> getDevices(@RequestParam(required = false) String nickname) {
 //        List<DeviceDTO> devicesList = deviceService.getDevicesTopoForWeb();
         List<DeviceDTO> devicesList = deviceService.getDockList(nickname);
         return ResponseResult.success(devicesList);
@@ -265,6 +265,7 @@
                 .workType(dto.getWorkType())
                 .webrtcUrl(dto.getWebrtcUrl())
                 .cameraWebrtcUrl(dto.getCameraWebrtcUrl())
+                .cameraState(dto.getCameraState())
                 .compatibleStatus(dto.getFirmwareStatus() == null ? null :
                         DeviceFirmwareStatusEnum.CONSISTENT_UPGRADE != DeviceFirmwareStatusEnum.find(dto.getFirmwareStatus()))
                 .build();

--
Gitblit v1.9.3