From 2fa66c208202f420a5f001cf0d67e5aa1bf94578 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 07 九月 2023 16:53:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 5ea793d..6d48ea2 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) {
@@ -319,4 +326,13 @@
String path = sdk.record(cmd);
return toAjaxString(path, "鎵嬪姩褰曞儚");
}
+ @ApiOperation("鑾峰彇鐩告満鏋惰鍙傛暟")
+ @PostMapping("/getCameraSetupCFG")
+ @Log(title = "鑾峰彇鐩告満鏋惰鍙傛暟", businessType = BusinessType.CONTROL)
+ @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.enable"})
+ public @ResponseBody
+ AjaxResult getCameraSetupCFG(@RequestBody CameraCmd cmd) {
+ cmd.setOperator(SecurityUtils.getUserId());
+ return AjaxResult.success(sdk.getGisInfo(cmd));
+ }
}
--
Gitblit v1.9.3