From 38eaaa87743252da53851047bd15b089ccf9697b Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 07 三月 2024 11:00:40 +0800
Subject: [PATCH] SDK云台控制和setptz增加错误码返回 增加部门和相机按角色数据权限查询

---
 ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 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 1eea46a..84407f2 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
@@ -1,5 +1,6 @@
 package com.ruoyi.device.camera.factory;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.device.camera.domain.ArdCameras;
 import com.ruoyi.device.camera.domain.CameraCmd;
 import com.ruoyi.device.channel.domain.ArdChannel;
@@ -26,7 +27,7 @@
     boolean isOnLine(CameraCmd cmd);
 
     //浜戝彴鎺у埗
-    boolean pTZControl(CameraCmd cmd);
+    AjaxResult pTZControl(CameraCmd cmd);
 
     //璁剧疆鑱氱劍鍊�
     boolean setFocusPos(CameraCmd cmd);
@@ -69,15 +70,19 @@
 
     //鎶撳浘
     String picCutCate(CameraCmd cmd);
-
     //ptz 涓夊潗鏍�
+    Map<String, Object> getPtz1(CameraCmd cmd);
+    //ptz 涓夊潗鏍� 楂樼簿搴TZ
     Map<String, Object> getPtz(CameraCmd cmd);
 
     //鑾峰彇ptz鑼冨洿
     Map<String, Object> getPtzScope(CameraCmd cmd);
 
-    //璁剧疆ptz
-    boolean setPtz(CameraCmd cmd);
+    //璁剧疆ptz1(涓嶆敮鎸�2閫氶亾鐨刏鍊艰缃拰鑾峰彇)
+    AjaxResult setPtz1(CameraCmd cmd);
+
+    //璁剧疆ptz(楂樼簿搴tz璁剧疆)
+    AjaxResult setPtz(CameraCmd cmd);
 
     //璁剧疆闆舵柟浣嶈
     boolean setZeroPtz(CameraCmd cmd);
@@ -98,7 +103,7 @@
     boolean recordStopNotToMinio(CameraCmd cmd);
 
     //鑾峰彇鐩告満閫氶亾淇℃伅
-    List<ArdChannel> getCameraChannelList(ArdCameras camera);
+    List<ArdChannel> getIPChannelInfo(ArdCameras camera);
 
     //鑾峰彇GIS淇℃伅鏁版嵁
     Map<String, Object> getGisInfo(CameraCmd cmd);

--
Gitblit v1.9.3