From 4806b676dbbab4675e5ee43b4018f2cd9d43797f Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 23 十月 2023 17:15:09 +0800
Subject: [PATCH] 1. 将sdk动态链接库dll集成到项目内,提升部署便捷性； 2. 增加设备断线重连回调方法，打印相关日志； 3. 删除多余依赖，减小jar包体积； 4. 处理SDK日志打印；
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/HikSdkController.java | 25 +++----------------------
1 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/HikSdkController.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/HikSdkController.java
index 6f9fbcb..7ccc486 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/HikSdkController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/HikSdkController.java
@@ -29,7 +29,6 @@
* @Date: 2023骞�01鏈�17鏃� 12:04
* @Version: 1.0
**/
-@Api(tags = "娴峰悍SDK鎺ュ彛")
@Controller
@RequestMapping("/hik")
@Anonymous
@@ -45,6 +44,7 @@
private String preview() {
return "preview";
}
+
@RequestMapping("/index")
private String index() {
return "test";
@@ -115,8 +115,8 @@
public @ResponseBody
AjaxResult getFocusPos(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
- Map<String, Object> Map = sdk.getFocusPos(cmd);
- return AjaxResult.success("鑾峰彇鑱氱劍鍊�", Map);
+ int focus = sdk.getFocusPos(cmd);
+ return AjaxResult.success("鑾峰彇鑱氱劍鍊�", focus);
}
@ApiOperation("璁剧疆鑱氱劍鍊�")
@@ -182,25 +182,6 @@
return toAjax(sdk.setZeroPtz(cmd));
}
- @ApiOperation("璁剧疆閿佸畾")
- @PostMapping("/setPTZLock")
- @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.expired"})
- @Log(title = "璁剧疆閿佸畾", businessType = BusinessType.CONTROL)
- public @ResponseBody
- AjaxResult setPTZLock(@RequestBody CameraCmd cmd) {
- cmd.setOperator(SecurityUtils.getUserId());
- return AjaxResult.success(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")
--
Gitblit v1.9.3