From 0362c0c8502a81fc974afb8d2aff85d9efd7bbb1 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 29 六月 2023 17:28:22 +0800
Subject: [PATCH] 修改报警逻辑 增加优先级队列
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java
index 11831aa..22e153f 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java
@@ -94,7 +94,7 @@
public @ResponseBody
AjaxResult PTZControlWithSpeed(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- return toAjax(sdk.PTZControlWithSpeed(cmd));
+ return toAjax(sdk.pTZControlWithSpeed(cmd));
}
@@ -170,7 +170,7 @@
@ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.targetPosition"})
public @ResponseBody
AjaxResult setTargetPosition(@RequestBody CameraCmd cmd) {
- return toAjax(sdk.setTargetPosition(cmd));
+ return toAjax(sdk.guideTargetPosition(cmd));
}
@@ -191,7 +191,6 @@
AjaxResult setPTZLock(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
return toAjax(sdk.controlLock(cmd));
-
}
@ApiOperation("鑾峰彇浜戝彴閿佸畾淇℃伅")
@@ -237,6 +236,14 @@
return toAjax(sdk.controlFocusMode(cmd));
}
+ @ApiOperation(value = "鑾峰彇鑱氱劍妯″紡", notes = "1鎵嬪姩2鑷姩")
+ @PostMapping("/getFocusMode")
+ public @ResponseBody
+ AjaxResult getFocusMode(@RequestBody CameraCmd cmd) {
+ String focusMode = sdk.getFocusMode(cmd);
+ return AjaxResult.success(focusMode);
+ }
+
@ApiOperation("浜戝彴鍔犵儹")
@PostMapping("/heateRpwron")
@Log(title = "浜戝彴鍔犵儹", businessType = BusinessType.CONTROL)
@@ -262,6 +269,7 @@
String base64Str = sdk.captureJPEGPicture(cmd);
return toAjaxString(base64Str, "鐩告満鎶撳浘");
}
+
@ApiOperation("鐩告満鎶撳浘")
@PostMapping("/picCutCate")
@Log(title = "鐩告満鎶撳浘", businessType = BusinessType.CONTROL)
--
Gitblit v1.9.3