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 | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 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 b36ac59..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
@@ -5,21 +5,23 @@
import java.util.Map;
import java.util.TreeMap;
+import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
+import com.ruoyi.device.camera.domain.DeptAndCamerasDto;
import com.ruoyi.scheduling.domian.SchedulingParam;
/**
* 鐩告満璁惧Service鎺ュ彛
- *
+ *
* @author 鍒樿嫃涔�
* @date 2023-02-11
*/
-public interface IArdCamerasService
+public interface IArdCamerasService
{
/**
* 鏌ヨ鐩告満璁惧
- *
+ *
* @param id 鐩告満璁惧涓婚敭
* @return 鐩告満璁惧
*/
@@ -27,7 +29,7 @@
/**
* 鏌ヨ鐩告満璁惧鍒楄〃
- *
+ *
* @param ardCameras 鐩告満璁惧
* @return 鐩告満璁惧闆嗗悎
*/
@@ -41,7 +43,7 @@
public List<ArdCameras> selectArdCamerasListNoDataScope(ArdCameras ardCameras);
/**
* 鏂板鐩告満璁惧
- *
+ *
* @param ardCameras 鐩告満璁惧
* @return 缁撴灉
*/
@@ -49,7 +51,7 @@
/**
* 淇敼鐩告満璁惧
- *
+ *
* @param ardCameras 鐩告満璁惧
* @return 缁撴灉
*/
@@ -57,7 +59,7 @@
/**
* 鎵归噺鍒犻櫎鐩告満璁惧
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鐩告満璁惧涓婚敭闆嗗悎
* @return 缁撴灉
*/
@@ -65,11 +67,35 @@
/**
* 鍒犻櫎鐩告満璁惧淇℃伅
- *
+ *
* @param id 鐩告満璁惧涓婚敭
* @return 缁撴灉
*/
public int deleteArdCamerasById(String id);
+
+
+ /**
+ * 瀵煎叆鐩告満璁惧淇℃伅
+ *
+ * @param ardCamerasList 鐩告満璁惧鏁版嵁鍒楄〃
+ * @param isUpdateSupport 鏄惁鏇存柊鏀寔锛屽鏋滃凡瀛樺湪锛屽垯杩涜鏇存柊鏁版嵁
+ * @param operName 鎿嶄綔鐢ㄦ埛
+ * @return 缁撴灉
+ */
+ public String importCameras(List<ArdCameras> ardCamerasList, Boolean isUpdateSupport, String operName);
+ /**
+ * 鏍￠獙鐩告満鏄惁鍏佽鎿嶄綔
+ *
+ * @param ardCameras 鐩告満淇℃伅
+ */
+ public void checkCameraAllowed(ArdCameras ardCameras);
+ /**
+ * 鏍￠獙鐢ㄦ埛鏄惁鏈夋暟鎹潈闄�
+ *
+ * @param userId 鐢ㄦ埛id
+ */
+ public void checkCameraDataScope(String userId);
+
public List findOptions(ArdCameras ardCameras);
/**
@@ -81,7 +107,7 @@
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
public Map getChildDeptAndCamera(Boolean disabled);
-
+ public List<DeptAndCamerasDto> getChildDeptAndCamera();
public TreeMap getNearCamerasBycoordinate(CameraCmd cmd);
@@ -105,4 +131,10 @@
* @return 缁撴灉
*/
public String checkCameraIpAndPortUnique(ArdCameras camera);
+
+ 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