From f3de8ac216bfc05348222e2b963ef3629358ae62 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 06 Dec 2025 15:49:20 +0800
Subject: [PATCH] 2025-12-06 zwy 修改设备属性设置方法，不抛异常，返回错误号与错误提示。
---
ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 f27c889..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
@@ -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)
--
Gitblit v1.9.3