From 40ece192fe8b7c2df8599a71daeda422083c5a47 Mon Sep 17 00:00:00 2001
From: gaofw189 <gaofw189@chinatelecom.cn>
Date: 星期五, 03 二月 2023 14:35:44 +0800
Subject: [PATCH] 修复WVP作为下级平台接收设备告警消息后上报上级平台的问题
---
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
index dd08101..1233455 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -1,15 +1,12 @@
package com.genersoft.iot.vmp.service;
-import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.ServerKeepaliveData;
import com.genersoft.iot.vmp.service.bean.MediaServerLoad;
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
-import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import java.util.List;
-import java.util.Map;
/**
* 濯掍綋鏈嶅姟鑺傜偣
@@ -40,7 +37,7 @@
*/
void zlmServerOffline(String mediaServerId);
- MediaServerItem getMediaServerForMinimumLoad();
+ MediaServerItem getMediaServerForMinimumLoad(Boolean hasAssist);
void setZLMConfig(MediaServerItem mediaServerItem, boolean restart);
@@ -86,7 +83,7 @@
MediaServerItem getDefaultMediaServer();
- void updateMediaServerKeepalive(String mediaServerId, JSONObject data);
+ void updateMediaServerKeepalive(String mediaServerId, ServerKeepaliveData data);
boolean checkRtpServer(MediaServerItem mediaServerItem, String rtp, String stream);
--
Gitblit v1.8.0