From 97aed6e19bac0fefaaf0270ba94492228ebf0bb1 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 03 Dec 2025 18:43:59 +0800
Subject: [PATCH] 2025-12-03 zwy 删除任务失败时返回错误码，不返回异常。
---
ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 16b7c1f..291caac 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(@RequestParam(required = false) 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);
+// }
/**
* 绑定设备
@@ -213,9 +225,11 @@
if (propertyEnumOpt.isEmpty()) {
return ResponseResult.error(CommonErrorEnum.ILLEGAL_ARGUMENT);
}
- deviceService.devicePropertySet(dockSn, propertyEnumOpt.get(), param.get(property));
+ deviceService.devicePropertySet(dockSn, propertyEnumOpt.get(), param);
return ResponseResult.success();
}
+
+ //.get(property)
// /**
// * 查询机场设备列表
@@ -249,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