From dae6e068207ad1bff32dafd8c71f12d8a2a59aa2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 15 四月 2024 16:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java |   41 ++++++++++++++++++++---------------------
 1 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java
index b0a3fd4..0c3a555 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java
@@ -17,6 +17,7 @@
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -85,7 +86,7 @@
     public @ResponseBody
     AjaxResult PTZControlWithSpeed(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
-        return toAjax(sdk.pTZControl(cmd));
+        return sdk.pTZControl(cmd);
     }
 
     @ApiOperation("璋冪敤棰勭疆鐐�")
@@ -95,7 +96,7 @@
     public @ResponseBody
     AjaxResult gotoPreset(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
-        return toAjax(sdk.gotoPreset(cmd));
+        return sdk.gotoPreset(cmd);
     }
 
     @ApiOperation("璁剧疆棰勭疆鐐�")
@@ -105,7 +106,7 @@
     public @ResponseBody
     AjaxResult setPreset(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
-        return toAjax(sdk.setPreset(cmd));
+        return sdk.setPreset(cmd);
     }
 
     @ApiOperation("鑾峰彇鑱氱劍鍊�")
@@ -115,8 +116,7 @@
     public @ResponseBody
     AjaxResult getFocusPos(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
-        int focus = sdk.getFocusPos(cmd);
-        return AjaxResult.success("鑾峰彇鑱氱劍鍊�", focus);
+        return sdk.getFocusPos(cmd);
     }
 
     @ApiOperation("璁剧疆鑱氱劍鍊�")
@@ -126,7 +126,7 @@
     public @ResponseBody
     AjaxResult setFocusPos(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
-        return toAjax(sdk.setFocusPos(cmd));
+        return sdk.setFocusPos(cmd);
     }
 
     @ApiOperation("鑾峰彇PTZ")
@@ -158,7 +158,7 @@
     public @ResponseBody
     AjaxResult setPTZ(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
-        return toAjax(sdk.setPtz(cmd));
+        return sdk.setPtz(cmd);
     }
 
     @ApiOperation("鎸囧悜鐩爣")
@@ -168,7 +168,7 @@
     public @ResponseBody
     AjaxResult setTargetPosition(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
-        return toAjax(sdk.guideTargetPosition(cmd));
+        return sdk.guideTargetPosition(cmd);
     }
 
 
@@ -179,7 +179,7 @@
     public @ResponseBody
     AjaxResult setZeroPTZ(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
-        return toAjax(sdk.setZeroPtz(cmd));
+        return sdk.setZeroPtz(cmd);
     }
 
 
@@ -190,7 +190,8 @@
     public @ResponseBody
     AjaxResult getPTZLockInfo(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
-        int byWorkMode = sdk.getPTZLockInfo(cmd);
+        AjaxResult ajaxResult = sdk.getPTZLockInfo(cmd);
+        int byWorkMode = (int)ajaxResult.get("msg");
         if (byWorkMode == 0) {
             return AjaxResult.success("浜戝彴閿佸畾鐘舵�侊細瑙ｉ攣");
         } else if (byWorkMode == 1) {
@@ -207,7 +208,7 @@
     public @ResponseBody
     AjaxResult defogcfg(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
-        return toAjax(sdk.controlDefogcfg(cmd));
+        return sdk.controlDefogcfg(cmd);
     }
 
     @ApiOperation("绾㈠寮�鍏�")
@@ -217,7 +218,7 @@
     public @ResponseBody
     AjaxResult infrarecfg(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
-        return toAjax(sdk.controlInfrarecfg(cmd));
+        return sdk.controlInfrarecfg(cmd);
     }
 
     @ApiOperation(value = "鎵嬪姩/鑷姩鑱氱劍", notes = "true鎵嬪姩flase鑷姩")
@@ -227,7 +228,7 @@
     public @ResponseBody
     AjaxResult enableFocusMode(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
-        return toAjax(sdk.controlFocusMode(cmd));
+        return sdk.controlFocusMode(cmd);
     }
 
     @ApiOperation(value = "鑾峰彇鑱氱劍妯″紡", notes = "1鎵嬪姩2鑷姩")
@@ -235,8 +236,7 @@
     public @ResponseBody
     AjaxResult getFocusMode(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
-        String focusMode = sdk.getFocusMode(cmd);
-        return AjaxResult.success(focusMode);
+        return sdk.getFocusMode(cmd);
     }
 
     @ApiOperation("浜戝彴鍔犵儹")
@@ -246,7 +246,7 @@
     public @ResponseBody
     AjaxResult heateRpwron(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
-        return toAjax(sdk.controlPTHeateRpwron(cmd));
+        return sdk.controlPTHeateRpwron(cmd);
     }
 
 
@@ -257,15 +257,14 @@
     public @ResponseBody
     AjaxResult cameraDeicing(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
-        return toAjax(sdk.controlCameraDeicing(cmd));
+        return sdk.controlCameraDeicing(cmd);
     }
 
-    @PostMapping("/captureJPEGPicture")
+    @PostMapping("/localCapture")
     public @ResponseBody
-    AjaxResult captureJPEGPicture(@RequestBody CameraCmd cmd) {
+    void localCapture(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
-        String base64Str = sdk.captureJPEGPicture(cmd);
-        return toAjaxString(base64Str, "鐩告満鎶撳浘");
+        sdk.localCapture(cmd);
     }
 
     @ApiOperation("鐩告満鎶撳浘")

--
Gitblit v1.9.3