From 69c47ed6f8270ad07969de261c07aa65cde1e1c5 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 07 五月 2024 13:50:58 +0800
Subject: [PATCH] 视频标签加入高程修改提交
---
ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 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 e92f0a2..e90b089 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;
@@ -17,6 +18,7 @@
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;
@@ -38,6 +40,8 @@
private HikvisionSDK sdk;
@Resource
private IArdCamerasService ardCamerasService;
+ @Resource
+ private IArdAlarmpointsWellService ardAlarmpointsWellService;
@RequestMapping("/preview")
@@ -259,11 +263,11 @@
return sdk.controlCameraDeicing(cmd);
}
- @PostMapping("/captureJPEGPicture")
+ @PostMapping("/localCapture")
public @ResponseBody
- AjaxResult captureJPEGPicture(@RequestBody CameraCmd cmd) {
+ void localCapture(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- return sdk.captureJPEGPicture(cmd);
+ sdk.localCapture(cmd);
}
@ApiOperation("鐩告満鎶撳浘")
@@ -297,4 +301,28 @@
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);
+ if(result == null){
+ return AjaxResult.error("璇ュ厜鐢垫病鏈夋寕鎺ュ");
+ }
+ return AjaxResult.success(result);
+ }
}
--
Gitblit v1.9.3