From 990782ab2c75805ef0390e40255ca817a02aa0bd Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 16 十月 2023 10:35:49 +0800
Subject: [PATCH] 提交
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 fcc65a1..604ef13 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
@@ -8,6 +8,7 @@
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.dhsdk.service.IDhClientService;
import com.ruoyi.device.hiksdk.service.IHikClientService;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -37,6 +38,8 @@
@Resource
private IHikClientService sdk;
@Resource
+ private IDhClientService ClientService;
+ @Resource
private IArdCamerasService ardCamerasService;
/**
@@ -63,10 +66,7 @@
private String index() {
return "test";
}
- @RequestMapping("/media")
- private String media() {
- return "mediaMTX";
- }
+
@GetMapping("/list")
public @ResponseBody
AjaxResult list(ArdCameras ardCamera) {
@@ -104,7 +104,6 @@
cmd.setOperator(SecurityUtils.getUserId());
return toAjax(sdk.pTZControlWithSpeed(cmd));
}
-
@ApiOperation("璋冪敤棰勭疆鐐�")
@PostMapping("/gotoPreset")
@@ -152,7 +151,7 @@
@ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo"})
@Log(title = "鑾峰彇PTZ", businessType = BusinessType.CONTROL)
public @ResponseBody
- AjaxResult GetPTZ(@RequestBody CameraCmd cmd) {
+ AjaxResult getPTZ(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
Map<String, Object> ptzMap = sdk.getPtz(cmd);
return AjaxResult.success("鑾峰彇ptz", ptzMap);
@@ -163,7 +162,7 @@
@Log(title = "鑾峰彇PTZ鑼冨洿", businessType = BusinessType.CONTROL)
@ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo"})
public @ResponseBody
- AjaxResult GetPTZScope(@RequestBody CameraCmd cmd) {
+ AjaxResult getPTZScope(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
Map<String, Object> ptzMap = sdk.getPtzScope(cmd);
return AjaxResult.success("鑾峰彇ptz鑼冨洿", ptzMap);
@@ -174,7 +173,7 @@
@Log(title = "璁剧疆PTZ", businessType = BusinessType.CONTROL)
@ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.ptzMap"})
public @ResponseBody
- AjaxResult SetPTZ(@RequestBody CameraCmd cmd) {
+ AjaxResult setPTZ(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
return toAjax(sdk.setPtz(cmd));
}
@@ -195,7 +194,7 @@
@Log(title = "璁剧疆闆舵柟浣嶈", businessType = BusinessType.CONTROL)
@ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.cmd.chanNo"})
public @ResponseBody
- AjaxResult SetZeroPTZ(@RequestBody CameraCmd cmd) {
+ AjaxResult setZeroPTZ(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
return toAjax(sdk.setZeroPtz(cmd));
}
@@ -281,7 +280,7 @@
@Log(title = "浜戝彴鍔犵儹", businessType = BusinessType.CONTROL)
@ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.enable"})
public @ResponseBody
- AjaxResult HeateRpwron(@RequestBody CameraCmd cmd) {
+ AjaxResult heateRpwron(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
return toAjax(sdk.controlPTHeateRpwron(cmd));
}
@@ -292,7 +291,7 @@
@Log(title = "闀滃ご鍔犵儹", businessType = BusinessType.CONTROL)
@ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.enable"})
public @ResponseBody
- AjaxResult CameraDeicing(@RequestBody CameraCmd cmd) {
+ AjaxResult cameraDeicing(@RequestBody CameraCmd cmd) {
cmd.setOperator(SecurityUtils.getUserId());
return toAjax(sdk.controlCameraDeicing(cmd));
}
@@ -326,6 +325,7 @@
String path = sdk.record(cmd);
return toAjaxString(path, "鎵嬪姩褰曞儚");
}
+
@ApiOperation("鑾峰彇鐩告満鏋惰鍙傛暟")
@PostMapping("/getCameraSetupCFG")
@Log(title = "鑾峰彇鐩告満鏋惰鍙傛暟", businessType = BusinessType.CONTROL)
--
Gitblit v1.9.3