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/service/IHikClientService.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java
index 2d43e0e..95464a3 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java
@@ -2,6 +2,9 @@
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
+import com.ruoyi.device.channel.domain.ArdChannel;
+
+import java.util.List;
import java.util.Map;
/**
@@ -103,4 +106,9 @@
//鍋滄褰曞儚-涓嶄笂浼爉inio
void recordStopNotToMinio(CameraCmd cmd);
+
+ //鑾峰彇鐩告満閫氶亾淇℃伅
+ public List<ArdChannel> getCameraChannelList(ArdCameras camera);
+ //鑾峰彇GIS淇℃伅鏁版嵁
+ public Map<String,Object> getGisInfo(CameraCmd cmd);
}
--
Gitblit v1.9.3