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/device/camera/factory/CameraSDK.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java b/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java
index a978e5a..c1d51b5 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java
@@ -4,6 +4,8 @@
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.channel.domain.ArdChannel;
+
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
@@ -65,8 +67,8 @@
//鑾峰彇浜戝彴閿佸畾淇℃伅
AjaxResult getPTZLockInfo(CameraCmd cmd);
- //鎶撳浘-杩旂粰鍓嶇浜岃繘鍒舵祦
- AjaxResult captureJPEGPicture(CameraCmd cmd);
+ //鏈湴鎶撳浘
+ AjaxResult localCapture(CameraCmd cmd);
//鎶撳浘
String picCutCate(CameraCmd cmd);
@@ -108,4 +110,9 @@
//鑾峰彇GIS淇℃伅鏁版嵁
AjaxResult getGisInfo(CameraCmd cmd);
+
+ //鏈湴褰曞儚寮�濮�
+ AjaxResult localRecordStart(CameraCmd cmd);
+ //鏈湴褰曞儚鍋滄
+ AjaxResult localRecordStop(CameraCmd cmd);
}
--
Gitblit v1.9.3