From 28ab28fbca6a4253bfc1f0b213576bf43e42c407 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Mon, 09 Mar 2026 11:23:23 +0800
Subject: [PATCH] 1. 增加根据点云ID查询航线名称接口。 2. 优化查询精细化巡检分组细节，增加查询条件。
---
ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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..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,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);
@@ -218,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)
@@ -265,6 +267,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