From 957bccef00652f6f239a9e0dd6f58be4dc37fe09 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 30 四月 2024 08:35:58 +0800
Subject: [PATCH] 视频标签加入范围显示限制修改提交
---
ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 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 0c3a555..ce0558d 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
@@ -1,6 +1,7 @@
package com.ruoyi.utils.sdk.hiksdk.controller;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.ruoyi.alarmpoints.well.service.IArdAlarmpointsWellService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.enums.BusinessType;
@@ -39,6 +40,8 @@
private HikvisionSDK sdk;
@Resource
private IArdCamerasService ardCamerasService;
+ @Resource
+ private IArdAlarmpointsWellService ardAlarmpointsWellService;
@RequestMapping("/preview")
@@ -298,4 +301,25 @@
cmd.setOperator(SecurityUtils.getUserId());
return AjaxResult.success(sdk.getGisInfo(cmd));
}
+
+ @PostMapping("/getCameraVideoLable")
+ public @ResponseBody
+ AjaxResult getCameraVideoLable(@RequestBody CameraCmd cmd) {
+ cmd.setOperator(SecurityUtils.getUserId());
+ Map<String, Object> map = sdk.getGisInfo(cmd);
+ 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);
+ return AjaxResult.success(result);
+ }
}
--
Gitblit v1.9.3