From 9e5edc26d37d8fbe81125d644125bb0e80311c8f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 24 Jan 2026 16:33:46 +0800
Subject: [PATCH] 2026-01-24 zwy 增加打印日志
---
ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 2f45d7a..6874387 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);
+// }
/**
* 绑定设备
@@ -206,15 +218,17 @@
public ResponseResult devicePropertySet(@PathVariable("device_sn") String dockSn,
@RequestBody JsonNode param) {
if (param.size() != 1) {
- return ResponseResult.error(CommonErrorEnum.ILLEGAL_ARGUMENT);
+ //return ResponseResult.error(CommonErrorEnum.ILLEGAL_ARGUMENT);
+ return ResponseResult.error(999,"参数不合法");
}
String property = param.fieldNames().next();
Optional<DeviceSetPropertyEnum> propertyEnumOpt = DeviceSetPropertyEnum.find(property);
if (propertyEnumOpt.isEmpty()) {
- return ResponseResult.error(CommonErrorEnum.ILLEGAL_ARGUMENT);
+ //return ResponseResult.error(CommonErrorEnum.ILLEGAL_ARGUMENT);
+ return ResponseResult.error(999,"参数无效");
}
- deviceService.devicePropertySet(dockSn, propertyEnumOpt.get(), param);
- return ResponseResult.success();
+ return deviceService.devicePropertySet(dockSn, propertyEnumOpt.get(), param);
+// return ResponseResult.success();
}
//.get(property)
@@ -252,6 +266,8 @@
.firmwareVersion(dto.getFirmwareVersion())
.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