From 20439bc0fa1ff714ed5f61e711272deebb76e2c9 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 17 八月 2023 16:40:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/camera/service/IArdCamerasService.java | 17 +++++++++++++++--
1 files changed, 15 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 0d2dcb5..4236c78 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
@@ -3,8 +3,11 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.TreeMap;
import com.ruoyi.device.camera.domain.ArdCameras;
+import com.ruoyi.device.camera.domain.CameraCmd;
+import com.ruoyi.scheduling.domian.SchedulingParam;
/**
* 鐩告満璁惧Service鎺ュ彛
@@ -71,11 +74,21 @@
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);
}
--
Gitblit v1.9.3