修复web端管理节点负载不显示国标收流 #871

648540858
1 parent 50240b4e
Showing 5 changed files with 30 additions and 12 deletions
src/main/java/com/genersoft/iot/vmp/service/IInviteStreamService.java
src/main/java/com/genersoft/iot/vmp/service/impl/InviteStreamServiceImpl.java
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
@@ -65,4 +65,9 @@ public interface IInviteStreamService {
      * 清空一个设备的所有invite信息
      */
     void clearInviteInfo(String deviceId);
+
+    /**
+     * 统计同一个zlm下的国标收流个数
+     */
+    int getStreamInfoCount(String mediaServerId);
 }
@@ -179,4 +179,23 @@ public class InviteStreamServiceImpl implements IInviteStreamService {
     public void clearInviteInfo(String deviceId) {
         removeInviteInfo(null, deviceId, null, null);
     }
+
+    @Override
+    public int getStreamInfoCount(String mediaServerId) {
+        int count = 0;
+        String key = VideoManagerConstants.INVITE_PREFIX + "_*_*_*_*";
+        List<Object> scanResult = RedisUtil.scan(redisTemplate, key);
+        if (scanResult.size() == 0) {
+            return 0;
+        }else {
+            for (Object keyObj : scanResult) {
+                String keyStr = (String) keyObj;
+                InviteInfo inviteInfo = (InviteInfo) redisTemplate.opsForValue().get(keyStr);
+                if (inviteInfo != null && inviteInfo.getStreamInfo() != null && inviteInfo.getStreamInfo().getMediaServerId().equals(mediaServerId)) {
+                    count++;
+                }
+            }
+        }
+        return count;
+    }
 }
@@ -17,6 +17,7 @@ import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
 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.IInviteStreamService;
 import com.genersoft.iot.vmp.service.IMediaServerService;
 import com.genersoft.iot.vmp.service.bean.MediaServerLoad;
 import com.genersoft.iot.vmp.service.bean.SSRCInfo;
@@ -98,6 +99,9 @@ public class MediaServerServiceImpl implements IMediaServerService {
     private IRedisCatchStorage redisCatchStorage;
     @Autowired
+    private IInviteStreamService inviteStreamService;
+
+    @Autowired
     private RedisTemplate<Object, Object> redisTemplate;
@@ -735,7 +739,8 @@ public class MediaServerServiceImpl implements IMediaServerService {
         result.setId(mediaServerItem.getId());
         result.setPush(redisCatchStorage.getPushStreamCount(mediaServerItem.getId()));
         result.setProxy(redisCatchStorage.getProxyStreamCount(mediaServerItem.getId()));
-        result.setGbReceive(redisCatchStorage.getGbReceiveCount(mediaServerItem.getId()));
+
+        result.setGbReceive(inviteStreamService.getStreamInfoCount(mediaServerItem.getId()));
         result.setGbSend(redisCatchStorage.getGbSendCount(mediaServerItem.getId()));
         return result;
     }
@@ -191,8 +191,6 @@ public interface IRedisCatchStorage {
     int getProxyStreamCount(String id);
-    int getGbReceiveCount(String id);
-
     int getGbSendCount(String id);
     void addDiskInfo(List<Map<String, Object>> diskInfo);
@@ -587,15 +587,6 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
     }
     @Override
-    public int getGbReceiveCount(String id) {
-        String playKey = VideoManagerConstants.PLAYER_PREFIX + "_" + userSetting.getServerId() + "_" + id + "_*";
-        String playBackKey = VideoManagerConstants.PLAY_BLACK_PREFIX + "_" + userSetting.getServerId() + "_" + id + "_*";
-        String downloadKey = VideoManagerConstants.DOWNLOAD_PREFIX + "_" + userSetting.getServerId() + "_" + id + "_*";
-
-        return RedisUtil.scan(redisTemplate, playKey).size() + RedisUtil.scan(redisTemplate, playBackKey).size() + RedisUtil.scan(redisTemplate, downloadKey).size();
-    }
-
-    @Override
     public int getGbSendCount(String id) {
         String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX
                 + userSetting.getServerId() + "_*_" + id + "_*";