From 845956ecf4749c2d6c278bdc9638efb934a63419 Mon Sep 17 00:00:00 2001
From: zhangjian <zhangjianrock@163.com>
Date: 星期六, 03 六月 2023 11:44:49 +0800
Subject: [PATCH] 视频巡检任务 单独更新
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java | 18 +++++++++++++++---
1 files changed, 15 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 f8682b1..11831aa 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
@@ -4,10 +4,11 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
-import com.ruoyi.device.hiksdk.service.hikClientService;
+import com.ruoyi.device.hiksdk.service.IHikClientService;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.AjaxResult;
import io.swagger.annotations.Api;
@@ -17,7 +18,6 @@
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
@@ -35,7 +35,7 @@
public class SdkController extends BaseController {
@Resource
- private hikClientService sdk;
+ private IHikClientService sdk;
@Resource
private IArdCamerasService ardCamerasService;
@@ -93,6 +93,7 @@
@Log(title = "浜戝彴鎺у埗", businessType = BusinessType.CONTROL)
public @ResponseBody
AjaxResult PTZControlWithSpeed(@RequestBody CameraCmd cmd) {
+ cmd.setOperator(SecurityUtils.getUserId());
return toAjax(sdk.PTZControlWithSpeed(cmd));
}
@@ -163,6 +164,16 @@
return toAjax(sdk.setPtz(cmd));
}
+ @ApiOperation("鎸囧悜鐩爣")
+ @PostMapping("/setTargetPosition")
+ @Log(title = "鎸囧悜鐩爣", businessType = BusinessType.CONTROL)
+ @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.targetPosition"})
+ public @ResponseBody
+ AjaxResult setTargetPosition(@RequestBody CameraCmd cmd) {
+ return toAjax(sdk.setTargetPosition(cmd));
+ }
+
+
@ApiOperation("璁剧疆闆舵柟浣嶈")
@PostMapping("/setZeroPTZ")
@Log(title = "璁剧疆闆舵柟浣嶈", businessType = BusinessType.CONTROL)
@@ -178,6 +189,7 @@
@Log(title = "璁剧疆閿佸畾", businessType = BusinessType.CONTROL)
public @ResponseBody
AjaxResult setPTZLock(@RequestBody CameraCmd cmd) {
+ cmd.setOperator(SecurityUtils.getUserId());
return toAjax(sdk.controlLock(cmd));
}
--
Gitblit v1.9.3