From 2587cb5656a988d580c1e3d45185ea3d1e7dd6d0 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Mon, 01 Dec 2025 17:12:26 +0800
Subject: [PATCH] 1. 优化没有无人机类型 。 2. 优化没有航线类型。 3. 优化readOnly错误。
---
ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 18420ce..c3c7a30 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,11 +97,23 @@
@ApiOperation("设备列表")
@PreAuthorize("@ss.hasPermi('device:dock:list')")
@GetMapping("/list")
- public ResponseResult<List<DeviceDTO>> getDevices() {
+ public ResponseResult<List<DeviceDTO>> getDevices(String nickname) {
// List<DeviceDTO> devicesList = deviceService.getDevicesTopoForWeb();
- List<DeviceDTO> devicesList = deviceService.getDockList();
+ List<DeviceDTO> devicesList = deviceService.getDockList(nickname);
return ResponseResult.success(devicesList);
}
+
+// /**
+// * 获取按nickname筛选在线设备列表
+// *
+// * @return
+// */
+// @ApiOperation("设备列表-按nickname筛选")
+// @GetMapping("/cameralist")
+// public ResponseResult<List<DeviceDTO>> getCameraDevices(@RequestParam(required = false) String nickname) {
+// List<DeviceDTO> devicesList = deviceService.getDockCameraList(nickname);
+// return ResponseResult.success(devicesList);
+// }
/**
* 绑定设备
@@ -251,6 +263,8 @@
.domain(dto.getDomain())
.firmwareVersion(dto.getFirmwareVersion())
.workType(dto.getWorkType())
+ .webrtcUrl(dto.getWebrtcUrl())
+ .cameraWebrtcUrl(dto.getCameraWebrtcUrl())
.compatibleStatus(dto.getFirmwareStatus() == null ? null :
DeviceFirmwareStatusEnum.CONSISTENT_UPGRADE != DeviceFirmwareStatusEnum.find(dto.getFirmwareStatus()))
.build();
--
Gitblit v1.9.3