From 493caef7413992d0215b9c2e2bcedd30471d89e7 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 三月 2024 15:49:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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 81e6a6d..34d793f 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
@@ -1,14 +1,17 @@
package com.ruoyi.device.camera.mapper;
import java.util.List;
+import java.util.Map;
+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.device.camera.domain.ArdCameras;
import org.apache.ibatis.annotations.Param;
/**
* 鐩告満璁惧Mapper鎺ュ彛
- *
+ *
* @author 鍒樿嫃涔�
* @date 2023-02-11
*/
@@ -16,7 +19,7 @@
{
/**
* 鏌ヨ鐩告満璁惧
- *
+ *
* @param id 鐩告満璁惧涓婚敭
* @return 鐩告満璁惧
*/
@@ -24,10 +27,11 @@
/**
* 鏌ヨ鐩告満璁惧鍒楄〃
- *
+ *
* @param ardCameras 鐩告満璁惧
* @return 鐩告満璁惧闆嗗悎
*/
+ @DataScope(deptAlias = "d")
public List<ArdCameras> selectArdCamerasList(ArdCameras ardCameras);
/**
* 鏌ヨ鐩告満璁惧鍒楄〃(涓嶈繃婊�)
@@ -38,7 +42,7 @@
public List<ArdCameras>selectArdCamerasListNoDataScope(ArdCameras ardCameras);
/**
* 鏂板鐩告満璁惧
- *
+ *
* @param ardCameras 鐩告満璁惧
* @return 缁撴灉
*/
@@ -46,7 +50,7 @@
/**
* 淇敼鐩告満璁惧
- *
+ *
* @param ardCameras 鐩告満璁惧
* @return 缁撴灉
*/
@@ -54,7 +58,7 @@
/**
* 鍒犻櫎鐩告満璁惧
- *
+ *
* @param id 鐩告満璁惧涓婚敭
* @return 缁撴灉
*/
@@ -62,7 +66,7 @@
/**
* 鎵归噺鍒犻櫎鐩告満璁惧
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
@@ -85,4 +89,11 @@
* @return 鐩告満淇℃伅
*/
public ArdCameras checkCameraIpAndPortUnique(@Param("ip") String ip, @Param("port")Integer port);
+
+ //public List<Map<String, Object>> getCamerasByDeptId(@Param("deptId")Long deptId,@Param("userId")String userId);
+ public List<Map<String, Object>> getCamerasByDeptId(@Param("deptIdList")List<Long> deptIdList,@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