From e932a9b824b93a4a0365e11f1e02775b10c0b045 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 01 三月 2024 10:55:49 +0800
Subject: [PATCH] Merge branch '2.6.9' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/IDeviceService.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IDeviceService.java b/src/main/java/com/genersoft/iot/vmp/service/IDeviceService.java
old mode 100644
new mode 100755
index 24051b9..afa0044
--- a/src/main/java/com/genersoft/iot/vmp/service/IDeviceService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IDeviceService.java
@@ -1,9 +1,12 @@
package com.genersoft.iot.vmp.service;
+import com.genersoft.iot.vmp.common.CommonCallback;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.gb28181.bean.SipTransactionInfo;
import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
import java.util.List;
@@ -17,13 +20,13 @@
* 璁惧涓婄嚎
* @param device 璁惧淇℃伅
*/
- void online(Device device);
+ void online(Device device, SipTransactionInfo sipTransactionInfo);
/**
* 璁惧涓嬬嚎
* @param deviceId 璁惧缂栧彿
*/
- void offline(String deviceId);
+ void offline(String deviceId, String reason);
/**
* 娣诲姞鐩綍璁㈤槄
@@ -37,7 +40,7 @@
* @param device 璁惧淇℃伅
* @return 甯冨皵
*/
- boolean removeCatalogSubscribe(Device device);
+ boolean removeCatalogSubscribe(Device device, CommonCallback<Boolean> callback);
/**
* 娣诲姞绉诲姩浣嶇疆璁㈤槄
@@ -51,7 +54,7 @@
* @param device 璁惧淇℃伅
* @return 甯冨皵
*/
- boolean removeMobilePositionSubscribe(Device device);
+ boolean removeMobilePositionSubscribe(Device device, CommonCallback<Boolean> callback);
/**
* 绉婚櫎绉诲姩浣嶇疆璁㈤槄
@@ -155,4 +158,15 @@
* @return
*/
boolean delete(String deviceId);
+
+ /**
+ * 鑾峰彇缁熻淇℃伅
+ * @return
+ */
+ ResourceBaseInfo getOverview();
+
+ /**
+ * 鑾峰彇鎵�鏈夎澶�
+ */
+ List<Device> getAll();
}
--
Gitblit v1.8.0