From 38f29e38fcc668171dc05c53d40a36b895c86102 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期四, 10 十月 2024 13:34:28 +0800
Subject: [PATCH] init
---
ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java
index 9bd35be..e70ba37 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java
@@ -18,7 +18,6 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
@@ -307,18 +306,22 @@
AjaxResult getCameraVideoLable(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
Map<String, Object> map = sdk.getGisInfo(cmd);
- Double p = (Double) map.get("p");
- Double t = (Double) map.get("t");
- Double z = (Double) map.get("z");
- Double fHorFieldAngle = (Double) map.get("fHorFieldAngle");// 姘村钩瑙嗗満瑙�
- Double fVerFieldAngle = (Double) map.get("fVerFieldAngle");// 鍨傜洿瑙嗗満瑙�
- if(z <= 5.0){
- return AjaxResult.error("鍙樼劍灏忎簬5");
- }
+ Map<String, Object> data = (Map<String, Object>) map.get("data");
+ Float p = (Float) data.get("p");
+ Float t = (Float) data.get("t");
+ Float z = (Float) data.get("z");
+ Float fHorFieldAngle = (Float) data.get("fHorFieldAngle");// 姘村钩瑙嗗満瑙�
+ Float fVerFieldAngle = (Float) data.get("fVerFieldAngle");// 鍨傜洿瑙嗗満瑙�
+ /*if(z <= 1.0){
+ return AjaxResult.error("鍙樼劍灏忎簬1");
+ }*/
if(t > 359.0){
return AjaxResult.error("淇话瑙掕繃灏�");
}
List<Map<String,Object>> result = ardAlarmpointsWellService.getCameraVideoLable(SecurityUtils.getDeptId(),cmd.getCameraId(),p,t,fHorFieldAngle,fVerFieldAngle);
+ if(result == null){
+ return AjaxResult.error("璇ュ厜鐢垫病鏈夋寕鎺ュ");
+ }
return AjaxResult.success(result);
}
}
--
Gitblit v1.9.3