From 255a6915a9898fe6c1a6649cae707649226ec177 Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期五, 08 九月 2023 16:30:34 +0800 Subject: [PATCH] 程序启动清空相机缓存列表重新加载 增加sdk获取相机聚焦值接口 修改相机登录时离线清空通道列表 增加获取码流压缩参数(分辨率/编码格式/码率/流类型) 优化相机在线离线业务方法,修改仅在线设备上传ptz --- ard-work/src/main/java/com/ruoyi/device/camera/service/IArdCamerasService.java | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 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..c51ff05 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 @@ -7,6 +7,7 @@ import com.ruoyi.device.camera.domain.ArdCameras; import com.ruoyi.device.camera.domain.CameraCmd; +import com.ruoyi.scheduling.domian.SchedulingParam; /** * 鐩告満璁惧Service鎺ュ彛 @@ -73,14 +74,27 @@ public List findOptions(ArdCameras ardCameras); /** * @鎻忚堪 鑾峰彇鏈儴闂ㄤ互涓嬬殑鎵�鏈夌浉鏈哄拰閮ㄩ棬 - * @鍙傛暟 [] + * @鍙傛暟 [disabled] 澶嶉�夋鐘舵�� * @杩斿洖鍊� java.util.Map * @鍒涘缓浜� 鍒樿嫃涔� * @鍒涘缓鏃堕棿 2023/6/2 10:58 * @淇敼浜哄拰鍏跺畠淇℃伅 */ - public Map getChildDeptAndCamera(); + public Map getChildDeptAndCamera(Boolean disabled); 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); } -- Gitblit v1.9.3