From e8a4f9014fbea4159ea15642226c6793d57d13ee Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期二, 22 八月 2023 11:05:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 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 8bd7d2f..5ea793d 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
@@ -83,6 +83,7 @@
     @Log(title = "鍦ㄧ嚎鐘舵��", businessType = BusinessType.CONTROL)
     public @ResponseBody
     AjaxResult getOnlineState(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         return toAjax(sdk.isOnLine(cmd));
     }
 
@@ -104,6 +105,7 @@
     @Log(title = "璋冪敤棰勭疆鐐�", businessType = BusinessType.CONTROL)
     public @ResponseBody
     AjaxResult gotoPreset(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         return toAjax(sdk.gotoPreset(cmd));
     }
 
@@ -113,6 +115,7 @@
     @Log(title = "璁剧疆棰勭疆鐐�", businessType = BusinessType.CONTROL)
     public @ResponseBody
     AjaxResult setPreset(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         return toAjax(sdk.setPreset(cmd));
     }
 
@@ -122,6 +125,7 @@
     @Log(title = "鑾峰彇鑱氱劍鍊�", businessType = BusinessType.CONTROL)
     public @ResponseBody
     AjaxResult getFocusPos(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         Map<String, Object> Map = sdk.getFocusPos(cmd);
         return AjaxResult.success("鑾峰彇鑱氱劍鍊�", Map);
     }
@@ -132,6 +136,7 @@
     @Log(title = "璁剧疆鑱氱劍鍊�", businessType = BusinessType.CONTROL)
     public @ResponseBody
     AjaxResult setFocusPos(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         return toAjax(sdk.setFocusPos(cmd));
     }
 
@@ -141,6 +146,7 @@
     @Log(title = "鑾峰彇PTZ", businessType = BusinessType.CONTROL)
     public @ResponseBody
     AjaxResult GetPTZ(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         Map<String, Object> ptzMap = sdk.getPtz(cmd);
         return AjaxResult.success("鑾峰彇ptz", ptzMap);
     }
@@ -151,6 +157,7 @@
     @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum"})
     public @ResponseBody
     AjaxResult GetPTZScope(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         Map<String, Object> ptzMap = sdk.getPtzScope(cmd);
         return AjaxResult.success("鑾峰彇ptz鑼冨洿", ptzMap);
     }
@@ -171,6 +178,7 @@
     @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.targetPosition"})
     public @ResponseBody
     AjaxResult setTargetPosition(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         return toAjax(sdk.guideTargetPosition(cmd));
     }
 
@@ -181,6 +189,7 @@
     @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum"})
     public @ResponseBody
     AjaxResult SetZeroPTZ(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         return toAjax(sdk.setZeroPtz(cmd));
     }
 
@@ -210,6 +219,7 @@
     @Log(title = "鑾峰彇浜戝彴閿佸畾淇℃伅", businessType = BusinessType.CONTROL)
     public @ResponseBody
     AjaxResult getPTZLockInfo(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         int byWorkMode = sdk.getPTZLockInfo(cmd);
         if (byWorkMode == 0) {
             return AjaxResult.success("浜戝彴閿佸畾鐘舵�侊細瑙ｉ攣");
@@ -226,6 +236,7 @@
     @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
     public @ResponseBody
     AjaxResult defogcfg(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         return toAjax(sdk.controlDefogcfg(cmd));
     }
 
@@ -235,6 +246,7 @@
     @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
     public @ResponseBody
     AjaxResult infrarecfg(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         return toAjax(sdk.controlInfrarecfg(cmd));
     }
 
@@ -244,6 +256,7 @@
     @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
     public @ResponseBody
     AjaxResult enableFocusMode(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         return toAjax(sdk.controlFocusMode(cmd));
     }
 
@@ -251,6 +264,7 @@
     @PostMapping("/getFocusMode")
     public @ResponseBody
     AjaxResult getFocusMode(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         String focusMode = sdk.getFocusMode(cmd);
         return AjaxResult.success(focusMode);
     }
@@ -261,6 +275,7 @@
     @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
     public @ResponseBody
     AjaxResult HeateRpwron(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         return toAjax(sdk.controlPTHeateRpwron(cmd));
     }
 
@@ -271,12 +286,14 @@
     @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
     public @ResponseBody
     AjaxResult CameraDeicing(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         return toAjax(sdk.controlCameraDeicing(cmd));
     }
 
     @PostMapping("/captureJPEGPicture")
     public @ResponseBody
     AjaxResult captureJPEGPicture(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         String base64Str = sdk.captureJPEGPicture(cmd);
         return toAjaxString(base64Str, "鐩告満鎶撳浘");
     }
@@ -287,6 +304,7 @@
     @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum"})
     public @ResponseBody
     AjaxResult picCutCate(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         String path = sdk.picCutCate(cmd);
         return toAjaxString(path, "鐩告満鎶撳浘");
     }
@@ -297,6 +315,7 @@
     @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
     public @ResponseBody
     AjaxResult record(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         String path = sdk.record(cmd);
         return toAjaxString(path, "鎵嬪姩褰曞儚");
     }

--
Gitblit v1.9.3