From 72359f3c9e9fe855ecafafb769ed52fc2a7f7e61 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期六, 10 八月 2024 09:46:02 +0800
Subject: [PATCH] 优化：视频通话会话列表和详情获取最后一条消息中增加用户名称和头像
---
ard-work/src/main/java/com/ruoyi/device/camera/service/IArdCamerasService.java | 82 +++++++++++++++++++++++++++++++++++------
1 files changed, 70 insertions(+), 12 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 56b6c6a..78d4811 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
@@ -1,24 +1,27 @@
package com.ruoyi.device.camera.service;
-import java.util.HashMap;
+
import java.util.List;
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 鐩告満璁惧
*/
@@ -26,7 +29,7 @@
/**
* 鏌ヨ鐩告満璁惧鍒楄〃
- *
+ *
* @param ardCameras 鐩告満璁惧
* @return 鐩告満璁惧闆嗗悎
*/
@@ -40,7 +43,7 @@
public List<ArdCameras> selectArdCamerasListNoDataScope(ArdCameras ardCameras);
/**
* 鏂板鐩告満璁惧
- *
+ *
* @param ardCameras 鐩告満璁惧
* @return 缁撴灉
*/
@@ -48,7 +51,7 @@
/**
* 淇敼鐩告満璁惧
- *
+ *
* @param ardCameras 鐩告満璁惧
* @return 缁撴灉
*/
@@ -56,7 +59,7 @@
/**
* 鎵归噺鍒犻櫎鐩告満璁惧
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鐩告満璁惧涓婚敭闆嗗悎
* @return 缁撴灉
*/
@@ -64,23 +67,78 @@
/**
* 鍒犻櫎鐩告満璁惧淇℃伅
- *
+ *
* @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);
/**
* @鎻忚堪 鑾峰彇鏈儴闂ㄤ互涓嬬殑鎵�鏈夌浉鏈哄拰閮ㄩ棬
- * @鍙傛暟 []
+ * @鍙傛暟 [disabled] 澶嶉�夋鐘舵��
* @杩斿洖鍊� java.util.Map
* @鍒涘缓浜� 鍒樿嫃涔�
* @鍒涘缓鏃堕棿 2023/6/2 10:58
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
- public Map getChildDeptAndCamera();
-
+ public Map getChildDeptAndCamera(Boolean disabled);
+ public List<Map<String, Object>> getChildDeptAndCameraOwn(Boolean disabled);
+ public List<DeptAndCamerasDto> getChildDeptAndCamera();
public TreeMap getNearCamerasBycoordinate(CameraCmd cmd);
+
+ /**
+ * 鑾峰彇鐩戞帶鍦堝唴鎵�鏈夊湪绾垮厜鐢�(鍗婂緞)
+ * 鍒樿嫃涔�
+ * 2023/8/17 13:56:36
+ */
+ List<ArdCameras> getNearCameras(SchedulingParam param);
+ /**
+ * 鑾峰彇鐩戞帶鍦堝唴鎵�鏈夊湪绾垮厜鐢�(澶氳竟褰�)
+ * 鍒樿嫃涔�
+ * 2023/8/17 13:56:36
+ */
+ public List<ArdCameras> getNearCamerasWithPolygon(SchedulingParam param);
+
+ /**
+ * 鏍￠獙鐩告満鏄惁鍞竴
+ *
+ * @param camera 鐩告満
+ * @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);
+
+ //灏嗘墍鏈夌浉鏈虹櫥褰昳d缃负-1
+ public int resetCameraLoginId();
}
--
Gitblit v1.9.3