From 95345122239a82f6d10c2e5558cd5cc1644f474b Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期日, 28 四月 2024 19:00:26 +0800
Subject: [PATCH] 视频标签数据类型修改提交
---
ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java | 10 +++++-----
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java | 2 +-
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java
index 87cf414..dc09728 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java
@@ -142,5 +142,5 @@
ArdAlarmpointsWell getWellById(String id);
- List<Map<String,Object>> getCameraVideoLable(Long deptId,String cameraId,Double p,Double t,Double fHorFieldAngle,Double fVerFieldAngle);
+ List<Map<String,Object>> getCameraVideoLable(Long deptId,String cameraId,Float p,Float t,Float fHorFieldAngle,Float fVerFieldAngle);
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
index 0a60235..e191920 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
@@ -844,7 +844,7 @@
}
@Override
- public List<Map<String, Object>> getCameraVideoLable(Long deptId, String cameraId, Double p, Double t, Double fHorFieldAngle, Double fVerFieldAngle) {
+ public List<Map<String, Object>> getCameraVideoLable(Long deptId, String cameraId, Float p, Float t, Float fHorFieldAngle, Float fVerFieldAngle) {
ArdCameras ardCameras = ardCamerasMapper.selectArdCamerasById(cameraId);
//灏忎笁瑙掑舰鑵�
Double xy = Math.tan(Math.PI/2 - (Math.PI * 2 - Math.PI * t/180) - Math.PI * fVerFieldAngle/180/2)*ardCameras.getAltitude()/Math.cos(Math.PI * fHorFieldAngle/180/2);
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 47c6047..3b924ce 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
@@ -308,11 +308,11 @@
cmd.setOperator(SecurityUtils.getUserId());
Map<String, Object> map = sdk.getGisInfo(cmd);
Map<String, Object> data = (Map<String, Object>) map.get("data");
- Double p = (Double) data.get("p");
- Double t = (Double) data.get("t");
- Double z = (Double) data.get("z");
- Double fHorFieldAngle = (Double) data.get("fHorFieldAngle");// 姘村钩瑙嗗満瑙�
- Double fVerFieldAngle = (Double) data.get("fVerFieldAngle");// 鍨傜洿瑙嗗満瑙�
+ 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 <= 5.0){
return AjaxResult.error("鍙樼劍灏忎簬5");
}
--
Gitblit v1.9.3