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/mapper/ArdCamerasMapper.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java b/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java
index b480c6c..df9334a 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java
@@ -90,5 +90,9 @@
      */
     public ArdCameras checkCameraIpAndPortUnique(@Param("ip") String ip, @Param("port")Integer port);
 
-    public List<Map<String, Object>> getCamerasByDeptId(Long deptId);
+    public List<Map<String, Object>> getCamerasByDeptId(@Param("deptId")Long deptId,@Param("userId")String userId);
+
+    public Boolean getCameraOperationByCameraId(@Param("id") String id, @Param("userId") String userId);
+
+    public List<Map<String, Object>> getChannelByCameraId(String id);
 }

--
Gitblit v1.9.3