From 59fcc48c8589b9df2af744fd6c77854061a52f54 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 16 十月 2023 10:07:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java |   76 +++++++++++++++++++-------------------
 1 files changed, 38 insertions(+), 38 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 6d48ea2..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) {
@@ -74,14 +74,13 @@
         return AjaxResult.success("鐩告満鍒楄〃锛�", list);
     }
 
-    @ApiOperation("瑙嗛鍒嗚鲸鐜�")
-    @PostMapping("/videoResolution")
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum"})
-    @Log(title = "瑙嗛鍒嗚鲸鐜�", businessType = BusinessType.CONTROL)
+    @ApiOperation("鑾峰彇鐮佹祦鍘嬬缉鍙傛暟")
+    @PostMapping("/getVideoCompressionCfg")
+    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo"})
+    @Log(title = "鑾峰彇鐮佹祦鍘嬬缉鍙傛暟", businessType = BusinessType.CONTROL)
     public @ResponseBody
-    AjaxResult getVideoResolution(@RequestBody CameraCmd cmd) {
-        String videoResolution = sdk.getVideoResolution(cmd);
-        return toAjaxString(videoResolution, "瑙嗛鍒嗚鲸鐜囷細");
+    AjaxResult getVideoCompressionCfg(@RequestBody CameraCmd cmd) {
+        return AjaxResult.success(sdk.getVideoCompressionCfg(cmd));
     }
 
     @ApiOperation("鍦ㄧ嚎鐘舵��")
@@ -91,13 +90,14 @@
     public @ResponseBody
     AjaxResult getOnlineState(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
-        return toAjax(sdk.isOnLine(cmd));
+        boolean onLine = sdk.isOnLine(cmd);
+        return AjaxResult.success(onLine);
     }
 
     @ApiOperation(value = "浜戝彴鎺у埗", notes = "Code:1-宸︿笂 2-涓� 3-鍙充笂 4-宸� 5-宸¤埅 6-鍙� 7-宸︿笅 8-涓� 9-鍙充笅 10-鐒﹁窛鍙樺ぇ 11-鐒﹁窛鍙樺皬\n" +
             "12-鐒︾偣鍓嶈皟 13-鐒︾偣鍚庤皟 14-鍏夊湀鎵╁ぇ 15-鍏夊湀缂╁皬 16-闆ㄥ埛寮�鍚�")
     @PostMapping("/PTZControlWithSpeed")
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.speed", "cmd.enable", "cmd.code"})
+    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.speed", "cmd.enable", "cmd.code"})
     @Log(title = "浜戝彴鎺у埗", businessType = BusinessType.CONTROL)
     public @ResponseBody
     AjaxResult PTZControlWithSpeed(@RequestBody CameraCmd cmd) {
@@ -105,10 +105,9 @@
         return toAjax(sdk.pTZControlWithSpeed(cmd));
     }
 
-
     @ApiOperation("璋冪敤棰勭疆鐐�")
     @PostMapping("/gotoPreset")
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.presetIndex"})
+    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.presetIndex"})
     @Log(title = "璋冪敤棰勭疆鐐�", businessType = BusinessType.CONTROL)
     public @ResponseBody
     AjaxResult gotoPreset(@RequestBody CameraCmd cmd) {
@@ -118,7 +117,7 @@
 
     @ApiOperation("璁剧疆棰勭疆鐐�")
     @PostMapping("/setPreset")
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.presetIndex"})
+    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.presetIndex"})
     @Log(title = "璁剧疆棰勭疆鐐�", businessType = BusinessType.CONTROL)
     public @ResponseBody
     AjaxResult setPreset(@RequestBody CameraCmd cmd) {
@@ -128,7 +127,7 @@
 
     @ApiOperation("鑾峰彇鑱氱劍鍊�")
     @PostMapping("/getFocusPos")
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum"})
+    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo"})
     @Log(title = "鑾峰彇鑱氱劍鍊�", businessType = BusinessType.CONTROL)
     public @ResponseBody
     AjaxResult getFocusPos(@RequestBody CameraCmd cmd) {
@@ -139,7 +138,7 @@
 
     @ApiOperation("璁剧疆鑱氱劍鍊�")
     @PostMapping("/setFocusPos")
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.dwFocusPos"})
+    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.dwFocusPos"})
     @Log(title = "璁剧疆鑱氱劍鍊�", businessType = BusinessType.CONTROL)
     public @ResponseBody
     AjaxResult setFocusPos(@RequestBody CameraCmd cmd) {
@@ -149,10 +148,10 @@
 
     @ApiOperation("鑾峰彇PTZ")
     @PostMapping("/getPTZ")
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum"})
+    @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);
@@ -161,9 +160,9 @@
     @ApiOperation("鑾峰彇PTZ鑼冨洿")
     @PostMapping("/getPTZScope")
     @Log(title = "鑾峰彇PTZ鑼冨洿", businessType = BusinessType.CONTROL)
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum"})
+    @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);
@@ -172,9 +171,9 @@
     @ApiOperation("璁剧疆PTZ")
     @PostMapping("/setPTZ")
     @Log(title = "璁剧疆PTZ", businessType = BusinessType.CONTROL)
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.ptzMap"})
+    @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));
     }
@@ -182,7 +181,7 @@
     @ApiOperation("鎸囧悜鐩爣")
     @PostMapping("/setTargetPosition")
     @Log(title = "鎸囧悜鐩爣", businessType = BusinessType.CONTROL)
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.targetPosition"})
+    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.targetPosition"})
     public @ResponseBody
     AjaxResult setTargetPosition(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
@@ -193,9 +192,9 @@
     @ApiOperation("璁剧疆闆舵柟浣嶈")
     @PostMapping("/setZeroPTZ")
     @Log(title = "璁剧疆闆舵柟浣嶈", businessType = BusinessType.CONTROL)
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum"})
+    @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));
     }
@@ -222,7 +221,7 @@
 
     @ApiOperation("鑾峰彇浜戝彴閿佸畾淇℃伅")
     @PostMapping("/getPTZLockInfo")
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum"})
+    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo"})
     @Log(title = "鑾峰彇浜戝彴閿佸畾淇℃伅", businessType = BusinessType.CONTROL)
     public @ResponseBody
     AjaxResult getPTZLockInfo(@RequestBody CameraCmd cmd) {
@@ -240,7 +239,7 @@
     @ApiOperation("閫忛浘寮�鍏�")
     @PostMapping("/defogcfg")
     @Log(title = "閫忛浘寮�鍏�", businessType = BusinessType.CONTROL)
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
+    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.enable"})
     public @ResponseBody
     AjaxResult defogcfg(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
@@ -250,7 +249,7 @@
     @ApiOperation("绾㈠寮�鍏�")
     @PostMapping("/infrarecfg")
     @Log(title = "绾㈠寮�鍏�", businessType = BusinessType.CONTROL)
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
+    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.enable"})
     public @ResponseBody
     AjaxResult infrarecfg(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
@@ -260,7 +259,7 @@
     @ApiOperation(value = "鎵嬪姩/鑷姩鑱氱劍", notes = "true鎵嬪姩flase鑷姩")
     @PostMapping("/focusMode")
     @Log(title = "鎵嬪姩/鑷姩鑱氱劍", businessType = BusinessType.CONTROL)
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
+    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.enable"})
     public @ResponseBody
     AjaxResult enableFocusMode(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
@@ -279,9 +278,9 @@
     @ApiOperation("浜戝彴鍔犵儹")
     @PostMapping("/heateRpwron")
     @Log(title = "浜戝彴鍔犵儹", businessType = BusinessType.CONTROL)
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
+    @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));
     }
@@ -290,9 +289,9 @@
     @ApiOperation("闀滃ご鍔犵儹")
     @PostMapping("/cameraDeicing")
     @Log(title = "闀滃ご鍔犵儹", businessType = BusinessType.CONTROL)
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
+    @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));
     }
@@ -308,7 +307,7 @@
     @ApiOperation("鐩告満鎶撳浘")
     @PostMapping("/picCutCate")
     @Log(title = "鐩告満鎶撳浘", businessType = BusinessType.CONTROL)
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum"})
+    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo"})
     public @ResponseBody
     AjaxResult picCutCate(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
@@ -319,17 +318,18 @@
     @ApiOperation("鎵嬪姩褰曞儚")
     @PostMapping("/record")
     @Log(title = "鎵嬪姩褰曞儚", businessType = BusinessType.CONTROL)
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
+    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.enable"})
     public @ResponseBody
     AjaxResult record(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
         String path = sdk.record(cmd);
         return toAjaxString(path, "鎵嬪姩褰曞儚");
     }
+
     @ApiOperation("鑾峰彇鐩告満鏋惰鍙傛暟")
     @PostMapping("/getCameraSetupCFG")
     @Log(title = "鑾峰彇鐩告満鏋惰鍙傛暟", businessType = BusinessType.CONTROL)
-    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
+    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.enable"})
     public @ResponseBody
     AjaxResult getCameraSetupCFG(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());

--
Gitblit v1.9.3