From 208731a6c41b644186bb68c93c19ef7026284e3b Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 12 Mar 2026 16:04:43 +0800
Subject: [PATCH] 2026-03-09 优化标注功能 增加GeoCalculator计算工具类，算出面、圆的水平面积和水平周长，线的水平距离和直线距离。在调取按标注id获取标注详细信息接口给出，不入库。
---
ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java | 11 +++++++----
1 files changed, 7 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 291caac..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)
@@ -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