From 636054d8d283b06802c05e0c15724c22637d8b30 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 02 九月 2023 13:27:35 +0800
Subject: [PATCH] 将雷达报警分成3个表存储

---
 ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java |   49 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 47 insertions(+), 2 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 7727ce8..a0f602b 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
@@ -55,11 +55,18 @@
         sdk.loginAll();
     }
 
+    @RequestMapping("/preview")
+    private String preview() {
+        return "preview";
+    }
     @RequestMapping("/index")
     private String index() {
         return "test";
     }
-
+    @RequestMapping("/media")
+    private String media() {
+        return "mediaMTX";
+    }
     @GetMapping("/list")
     public @ResponseBody
     AjaxResult list(ArdCameras ardCamera) {
@@ -83,6 +90,7 @@
     @Log(title = "鍦ㄧ嚎鐘舵��", businessType = BusinessType.CONTROL)
     public @ResponseBody
     AjaxResult getOnlineState(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         return toAjax(sdk.isOnLine(cmd));
     }
 
@@ -104,6 +112,7 @@
     @Log(title = "璋冪敤棰勭疆鐐�", businessType = BusinessType.CONTROL)
     public @ResponseBody
     AjaxResult gotoPreset(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         return toAjax(sdk.gotoPreset(cmd));
     }
 
@@ -113,6 +122,7 @@
     @Log(title = "璁剧疆棰勭疆鐐�", businessType = BusinessType.CONTROL)
     public @ResponseBody
     AjaxResult setPreset(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         return toAjax(sdk.setPreset(cmd));
     }
 
@@ -122,6 +132,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 +143,7 @@
     @Log(title = "璁剧疆鑱氱劍鍊�", businessType = BusinessType.CONTROL)
     public @ResponseBody
     AjaxResult setFocusPos(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         return toAjax(sdk.setFocusPos(cmd));
     }
 
@@ -141,6 +153,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 +164,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);
     }
@@ -161,6 +175,7 @@
     @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.ptzMap"})
     public @ResponseBody
     AjaxResult SetPTZ(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         return toAjax(sdk.setPtz(cmd));
     }
 
@@ -170,6 +185,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));
     }
 
@@ -180,6 +196,7 @@
     @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum"})
     public @ResponseBody
     AjaxResult SetZeroPTZ(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         return toAjax(sdk.setZeroPtz(cmd));
     }
 
@@ -190,8 +207,17 @@
     public @ResponseBody
     AjaxResult setPTZLock(@RequestBody CameraCmd cmd) {
         cmd.setOperator(SecurityUtils.getUserId());
-        return toAjax(sdk.controlLock(cmd));
+        return AjaxResult.success(sdk.controlLock(cmd));
+    }
 
+    @ApiOperation("璁剧疆瑙i攣")
+    @PostMapping("/setPTZUnLock")
+    @ApiOperationSupport(includeParameters = {"cmd.cameraId"})
+    @Log(title = "璁剧疆瑙i攣", businessType = BusinessType.CONTROL)
+    public @ResponseBody
+    AjaxResult setPTZUnLock(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
+        return AjaxResult.success(sdk.controlUnLock(cmd));
     }
 
     @ApiOperation("鑾峰彇浜戝彴閿佸畾淇℃伅")
@@ -200,6 +226,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("浜戝彴閿佸畾鐘舵�侊細瑙i攣");
@@ -216,6 +243,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));
     }
 
@@ -225,6 +253,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));
     }
 
@@ -234,7 +263,17 @@
     @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
     public @ResponseBody
     AjaxResult enableFocusMode(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
         return toAjax(sdk.controlFocusMode(cmd));
+    }
+
+    @ApiOperation(value = "鑾峰彇鑱氱劍妯″紡", notes = "1鎵嬪姩2鑷姩")
+    @PostMapping("/getFocusMode")
+    public @ResponseBody
+    AjaxResult getFocusMode(@RequestBody CameraCmd cmd) {
+        cmd.setOperator(SecurityUtils.getUserId());
+        String focusMode = sdk.getFocusMode(cmd);
+        return AjaxResult.success(focusMode);
     }
 
     @ApiOperation("浜戝彴鍔犵儹")
@@ -243,6 +282,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));
     }
 
@@ -253,21 +293,25 @@
     @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, "鐩告満鎶撳浘");
     }
+
     @ApiOperation("鐩告満鎶撳浘")
     @PostMapping("/picCutCate")
     @Log(title = "鐩告満鎶撳浘", businessType = BusinessType.CONTROL)
     @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, "鐩告満鎶撳浘");
     }
@@ -278,6 +322,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