From 49207386ea4a3d663628347eef443af9c7cc7f39 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 17 十月 2023 17:20:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/dhsdk/controller/DhSdkController.java | 196 +++++++++++++++++++++++++++++-------------------
1 files changed, 119 insertions(+), 77 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/dhsdk/controller/DhSdkController.java b/ard-work/src/main/java/com/ruoyi/device/dhsdk/controller/DhSdkController.java
index 7b0ffdf..c0039e5 100644
--- a/ard-work/src/main/java/com/ruoyi/device/dhsdk/controller/DhSdkController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/dhsdk/controller/DhSdkController.java
@@ -1,78 +1,120 @@
-package com.ruoyi.device.dhsdk.controller;
-
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.ruoyi.common.annotation.Anonymous;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.device.camera.domain.CameraCmd;
-import com.ruoyi.device.dhsdk.service.IDhClientService;
-import com.ruoyi.device.hiksdk.service.IHikClientService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-import java.util.Map;
-
-/**
- * @Description: 澶у崕sdk鎺ュ彛
- * @ClassName: DhSdkController
- * @Author: 鍒樿嫃涔�
- * @Date: 2023骞�10鏈�14鏃�10:34:58
- **/
-@Api(tags = "澶у崕SDK鎺ュ彛")
-@Controller
-@RequestMapping("/dh")
-@Anonymous
-public class DhSdkController {
-
- @Resource
- private IDhClientService sdk;
-
- /**
- * @鎻忚堪 鍒濆鍔犺浇澶у崕搴撴枃浠�
- * @鍙傛暟 []
- * @杩斿洖鍊� void
- * @鍒涘缓浜� 鍒樿嫃涔�
- * @鍒涘缓鏃堕棿 2023/1/17 16:13
- * @淇敼浜哄拰鍏跺畠淇℃伅 if (Platform.isLinux())
- */
- @PostConstruct
- public void initDHSDK() {
- //鍒濆鍖栧姞杞絪dk搴撴枃浠�
- if (sdk.init())
- {
- //鐧诲綍鎵�鏈夌浉鏈�
- sdk.loginAll();
- }
- }
-
- @ApiOperation(value = "浜戝彴鎺у埗", notes = "Code:1-宸︿笂 2-涓� 3-鍙充笂 4-宸� 5-宸¤埅 6-鍙� 7-宸︿笅 8-涓� 9-鍙充笅 10-鐒﹁窛鍙樺ぇ 11-鐒﹁窛鍙樺皬\n" +
- "12-鐒︾偣鍓嶈皟 13-鐒︾偣鍚庤皟 14-鍏夊湀鎵╁ぇ 15-鍏夊湀缂╁皬 ")
- @PostMapping("/pTZControl")
- @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.speed", "cmd.enable", "cmd.code"})
- @Log(title = "浜戝彴鎺у埗", businessType = BusinessType.CONTROL)
- public @ResponseBody
- AjaxResult pTZControl(@RequestBody CameraCmd cmd) {
- cmd.setOperator(SecurityUtils.getUserId());
- return AjaxResult.success(sdk.pTZControl(cmd));
- }
-
- @ApiOperation("鑾峰彇PTZ")
- @PostMapping("/getPTZ")
- @ApiOperationSupport(includeParameters = {"cmd.cameraId"})
- @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);
- }
+package com.ruoyi.device.dhsdk.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.device.camera.domain.CameraCmd;
+import com.ruoyi.device.dhsdk.service.IDhClientService;
+import com.ruoyi.device.hiksdk.service.IHikClientService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * @Description: 澶у崕sdk鎺ュ彛
+ * @ClassName: DhSdkController
+ * @Author: 鍒樿嫃涔�
+ * @Date: 2023骞�10鏈�14鏃�10:34:58
+ **/
+@Api(tags = "澶у崕SDK鎺ュ彛")
+@Controller
+@RequestMapping("/dh")
+@Anonymous
+public class DhSdkController extends BaseController {
+
+ @Resource
+ private IDhClientService sdk;
+
+
+ @ApiOperation(value = "浜戝彴鎺у埗", notes = "Code:1-宸︿笂 2-涓� 3-鍙充笂 4-宸� 5-宸¤埅 6-鍙� 7-宸︿笅 8-涓� 9-鍙充笅 10-鐒﹁窛鍙樺ぇ 11-鐒﹁窛鍙樺皬\n" +
+ "12-鐒︾偣鍓嶈皟 13-鐒︾偣鍚庤皟 14-鍏夊湀鎵╁ぇ 15-鍏夊湀缂╁皬 ")
+ @PostMapping("/pTZControl")
+ @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.speed", "cmd.enable", "cmd.code"})
+ @Log(title = "浜戝彴鎺у埗", businessType = BusinessType.CONTROL)
+ public @ResponseBody
+ AjaxResult pTZControl(@RequestBody CameraCmd cmd) {
+ cmd.setOperator(SecurityUtils.getUserId());
+ return toAjax(sdk.pTZControl(cmd));
+ }
+
+ @ApiOperation("鑾峰彇PTZ")
+ @PostMapping("/getPTZ")
+ @ApiOperationSupport(includeParameters = {"cmd.cameraId"})
+ @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);
+ }
+ @ApiOperation("鍦ㄧ嚎鐘舵��")
+ @PostMapping("/state")
+ @ApiOperationSupport(includeParameters = {"cmd.cameraId"})
+ @Log(title = "鍦ㄧ嚎鐘舵��", businessType = BusinessType.CONTROL)
+ public @ResponseBody
+ AjaxResult getOnlineState(@RequestBody CameraCmd cmd) {
+ cmd.setOperator(SecurityUtils.getUserId());
+ boolean onLine = sdk.isOnLine(cmd);
+ return AjaxResult.success(onLine);
+ }
+ @ApiOperation("璁剧疆PTZ")
+ @PostMapping("/setPTZ")
+ @Log(title = "璁剧疆PTZ", businessType = BusinessType.CONTROL)
+ @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.ptzMap"})
+ public @ResponseBody
+ AjaxResult setPTZ(@RequestBody CameraCmd cmd) {
+ cmd.setOperator(SecurityUtils.getUserId());
+ return toAjax(sdk.setPtz(cmd));
+ }
+ @ApiOperation("璁剧疆闆舵柟浣嶈")
+ @PostMapping("/setZeroPTZ")
+ @Log(title = "璁剧疆闆舵柟浣嶈", businessType = BusinessType.CONTROL)
+ @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo"})
+ public @ResponseBody
+ AjaxResult setZeroPTZ(@RequestBody CameraCmd cmd) {
+ cmd.setOperator(SecurityUtils.getUserId());
+ return toAjax(sdk.setZeroPtz(cmd));
+ }
+ @ApiOperation("鐩告満鎶撳浘")
+ @PostMapping("/picCutCate")
+ @Log(title = "鐩告満鎶撳浘", businessType = BusinessType.CONTROL)
+ @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo"})
+ public @ResponseBody
+ AjaxResult picCutCate(@RequestBody CameraCmd cmd) {
+ cmd.setOperator(SecurityUtils.getUserId());
+ String url = sdk.picCutCate(cmd);
+ return toAjaxString(url, "鐩告満鎶撳浘");
+ }
+ @ApiOperation("鎵嬪姩褰曞儚寮�濮�")
+ @PostMapping("/recordStart")
+ @Log(title = "鎵嬪姩褰曞儚寮�濮�", businessType = BusinessType.CONTROL)
+ @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo"})
+ public @ResponseBody
+ AjaxResult recordStart(@RequestBody CameraCmd cmd) {
+ cmd.setOperator(SecurityUtils.getUserId());
+ boolean b = sdk.recordStart(cmd);
+ return toAjax(b);
+ }
+ @ApiOperation("鎵嬪姩褰曞儚鍋滄")
+ @PostMapping("/recordStop")
+ @Log(title = "鎵嬪姩褰曞儚鍋滄", businessType = BusinessType.CONTROL)
+ @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.recordBucketName", "cmd.recordObjectName"})
+ public @ResponseBody
+ AjaxResult recordStop(@RequestBody CameraCmd cmd) {
+ cmd.setOperator(SecurityUtils.getUserId());
+ String url = sdk.recordStopToMinio(cmd);
+ return AjaxResult.success(url);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3