From 407ead296aaff1e1388b37baf4a8de181b4e316b Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期日, 28 四月 2024 17:24:50 +0800
Subject: [PATCH] 视频标签bug修改提交
---
ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java | 69 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 23 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 5b635c6..47c6047 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;
@@ -8,15 +9,16 @@
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
-import com.ruoyi.utils.sdk.hiksdk.service.IHikClientService;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.utils.sdk.hiksdk.service.impl.HikvisionSDK;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.stereotype.Controller;
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;
@@ -35,9 +37,11 @@
public class HikSdkController extends BaseController {
@Resource
- private IHikClientService sdk;
+ private HikvisionSDK sdk;
@Resource
private IArdCamerasService ardCamerasService;
+ @Resource
+ private IArdAlarmpointsWellService ardAlarmpointsWellService;
@RequestMapping("/preview")
@@ -85,7 +89,7 @@
public @ResponseBody
AjaxResult PTZControlWithSpeed(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- return toAjax(sdk.pTZControlWithSpeed(cmd));
+ return sdk.pTZControl(cmd);
}
@ApiOperation("璋冪敤棰勭疆鐐�")
@@ -95,7 +99,7 @@
public @ResponseBody
AjaxResult gotoPreset(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- return toAjax(sdk.gotoPreset(cmd));
+ return sdk.gotoPreset(cmd);
}
@ApiOperation("璁剧疆棰勭疆鐐�")
@@ -105,7 +109,7 @@
public @ResponseBody
AjaxResult setPreset(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- return toAjax(sdk.setPreset(cmd));
+ return sdk.setPreset(cmd);
}
@ApiOperation("鑾峰彇鑱氱劍鍊�")
@@ -115,8 +119,7 @@
public @ResponseBody
AjaxResult getFocusPos(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- int focus = sdk.getFocusPos(cmd);
- return AjaxResult.success("鑾峰彇鑱氱劍鍊�", focus);
+ return sdk.getFocusPos(cmd);
}
@ApiOperation("璁剧疆鑱氱劍鍊�")
@@ -126,7 +129,7 @@
public @ResponseBody
AjaxResult setFocusPos(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- return toAjax(sdk.setFocusPos(cmd));
+ return sdk.setFocusPos(cmd);
}
@ApiOperation("鑾峰彇PTZ")
@@ -158,7 +161,7 @@
public @ResponseBody
AjaxResult setPTZ(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- return toAjax(sdk.setPtz(cmd));
+ return sdk.setPtz(cmd);
}
@ApiOperation("鎸囧悜鐩爣")
@@ -168,7 +171,7 @@
public @ResponseBody
AjaxResult setTargetPosition(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- return toAjax(sdk.guideTargetPosition(cmd));
+ return sdk.guideTargetPosition(cmd);
}
@@ -179,7 +182,7 @@
public @ResponseBody
AjaxResult setZeroPTZ(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- return toAjax(sdk.setZeroPtz(cmd));
+ return sdk.setZeroPtz(cmd);
}
@@ -190,7 +193,8 @@
public @ResponseBody
AjaxResult getPTZLockInfo(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- int byWorkMode = sdk.getPTZLockInfo(cmd);
+ AjaxResult ajaxResult = sdk.getPTZLockInfo(cmd);
+ int byWorkMode = (int)ajaxResult.get("msg");
if (byWorkMode == 0) {
return AjaxResult.success("浜戝彴閿佸畾鐘舵�侊細瑙ｉ攣");
} else if (byWorkMode == 1) {
@@ -207,7 +211,7 @@
public @ResponseBody
AjaxResult defogcfg(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- return toAjax(sdk.controlDefogcfg(cmd));
+ return sdk.controlDefogcfg(cmd);
}
@ApiOperation("绾㈠寮�鍏�")
@@ -217,7 +221,7 @@
public @ResponseBody
AjaxResult infrarecfg(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- return toAjax(sdk.controlInfrarecfg(cmd));
+ return sdk.controlInfrarecfg(cmd);
}
@ApiOperation(value = "鎵嬪姩/鑷姩鑱氱劍", notes = "true鎵嬪姩flase鑷姩")
@@ -227,7 +231,7 @@
public @ResponseBody
AjaxResult enableFocusMode(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- return toAjax(sdk.controlFocusMode(cmd));
+ return sdk.controlFocusMode(cmd);
}
@ApiOperation(value = "鑾峰彇鑱氱劍妯″紡", notes = "1鎵嬪姩2鑷姩")
@@ -235,8 +239,7 @@
public @ResponseBody
AjaxResult getFocusMode(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- String focusMode = sdk.getFocusMode(cmd);
- return AjaxResult.success(focusMode);
+ return sdk.getFocusMode(cmd);
}
@ApiOperation("浜戝彴鍔犵儹")
@@ -246,7 +249,7 @@
public @ResponseBody
AjaxResult heateRpwron(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- return toAjax(sdk.controlPTHeateRpwron(cmd));
+ return sdk.controlPTHeateRpwron(cmd);
}
@@ -257,15 +260,14 @@
public @ResponseBody
AjaxResult cameraDeicing(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- return toAjax(sdk.controlCameraDeicing(cmd));
+ return sdk.controlCameraDeicing(cmd);
}
- @PostMapping("/captureJPEGPicture")
+ @PostMapping("/localCapture")
public @ResponseBody
- AjaxResult captureJPEGPicture(@RequestBody CameraCmd cmd) {
+ void localCapture(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- String base64Str = sdk.captureJPEGPicture(cmd);
- return toAjaxString(base64Str, "鐩告満鎶撳浘");
+ sdk.localCapture(cmd);
}
@ApiOperation("鐩告満鎶撳浘")
@@ -299,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");
+ 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");// 鍨傜洿瑙嗗満瑙�
+ if(z <= 5.0){
+ return AjaxResult.error("鍙樼劍灏忎簬5");
+ }
+ 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