From 61d0cb34e8d5feba1961fef81f62eab37a256152 Mon Sep 17 00:00:00 2001
From: liusuyi <13324259@qq.com>
Date: 星期六, 01 七月 2023 21:37:19 +0800
Subject: [PATCH] 增加视频加水印方法
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 7727ce8..aedce0f 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
@@ -191,9 +191,16 @@
AjaxResult setPTZLock(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
return toAjax(sdk.controlLock(cmd));
-
}
-
+ @ApiOperation("璁剧疆瑙ｉ攣")
+ @PostMapping("/setPTZUnLock")
+ @ApiOperationSupport(includeParameters = {"cmd.cameraId"})
+ @Log(title = "璁剧疆瑙ｉ攣", businessType = BusinessType.CONTROL)
+ public @ResponseBody
+ AjaxResult setPTZUnLock(@RequestBody CameraCmd cmd) {
+ cmd.setOperator(SecurityUtils.getUserId());
+ return AjaxResult.success(sdk.controlUnLock(cmd));
+ }
@ApiOperation("鑾峰彇浜戝彴閿佸畾淇℃伅")
@PostMapping("/getPTZLockInfo")
@ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum"})
@@ -237,6 +244,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 +277,7 @@
String base64Str = sdk.captureJPEGPicture(cmd);
return toAjaxString(base64Str, "鐩告満鎶撳浘");
}
+
@ApiOperation("鐩告満鎶撳浘")
@PostMapping("/picCutCate")
@Log(title = "鐩告満鎶撳浘", businessType = BusinessType.CONTROL)
--
Gitblit v1.9.3