From a70d0dfe221e06381b6e290d1dab85c9ab4fdc31 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 23 三月 2024 08:36:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/java/com/ruoyi/device/camera/service/IArdCamerasService.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/service/IArdCamerasService.java b/ard-work/src/main/java/com/ruoyi/device/camera/service/IArdCamerasService.java
index 5901692..860d96d 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/service/IArdCamerasService.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/service/IArdCamerasService.java
@@ -132,5 +132,9 @@
      */
     public String checkCameraIpAndPortUnique(ArdCameras camera);
 
-    public List<Map<String,Object>> getCamerasByDeptId(Long deptId);
+    public List<Map<String,Object>> getCamerasByDeptId(Long deptId,String userId);
+
+    public Boolean getCameraOperationByCameraId(String id,String userId);
+
+    public Map<String,Object> getChannelByCameraId(String id);
 }

--
Gitblit v1.9.3