From 42d8fff57403500b880886e13093e1841bf47e54 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 03 十二月 2021 10:18:50 +0800
Subject: [PATCH] 兼容流注销时流产生类型错误的问题

---
 src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java |  194 +++++++++++++++++++++++++++++++-----------------
 1 files changed, 126 insertions(+), 68 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
index 1e5b079..3e7d5c4 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -27,7 +27,9 @@
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -47,7 +49,7 @@
     private boolean sslEnabled;
 
     @Value("${server.port}")
-    private String serverPort;
+    private Integer serverPort;
 
     @Autowired
     private MediaConfig mediaConfig;
@@ -80,6 +82,9 @@
         logger.info("Media Server 缂撳瓨鍒濆鍖�");
         List<MediaServerItem> mediaServerItemList = mediaServerMapper.queryAll();
         for (MediaServerItem mediaServerItem : mediaServerItemList) {
+            if (StringUtils.isEmpty(mediaServerItem.getId())) {
+                continue;
+            }
             // 鏇存柊
             if (mediaServerItem.getSsrcConfig() == null) {
                 SsrcConfig ssrcConfig = new SsrcConfig(mediaServerItem.getId(), null, sipConfig.getDomain());
@@ -96,6 +101,11 @@
 
     @Override
     public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId) {
+        return openRTPServer(mediaServerItem, streamId, false);
+    }
+
+    @Override
+    public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean isPlayback) {
         if (mediaServerItem == null || mediaServerItem.getId() == null) {
             return null;
         }
@@ -107,7 +117,13 @@
             logger.info("media server [ {} ] ssrcConfig is null", mediaServerItem.getId());
             return null;
         }else {
-            String ssrc = ssrcConfig.getPlaySsrc();
+            String ssrc = null;
+            if (isPlayback) {
+                ssrc = ssrcConfig.getPlayBackSsrc();
+            }else {
+                ssrc = ssrcConfig.getPlaySsrc();
+            }
+
             if (streamId == null) {
                 streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
             }
@@ -188,6 +204,15 @@
             }
             result.add(mediaServerItem);
         }
+        result.sort((serverItem1, serverItem2)->{
+            int sortResult = 0;
+            try {
+                sortResult = format.parse(serverItem1.getCreateTime()).compareTo(format.parse(serverItem2.getCreateTime()));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            return  sortResult;
+        });
         return result;
     }
 
@@ -231,6 +256,11 @@
     }
 
     @Override
+    public MediaServerItem getDefaultMediaServer() {
+        return mediaServerMapper.queryDefault();
+    }
+
+    @Override
     public void clearMediaServerForOnline() {
         String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
         redisUtil.del(key);
@@ -251,7 +281,9 @@
                     result.setMsg("淇濆瓨澶辫触锛屽獟浣撴湇鍔D [ " + zlmServerConfig.getGeneralMediaServerId() + " ] 宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆");
                     return result;
                 }
+                mediaServerItem.setId(zlmServerConfig.getGeneralMediaServerId());
                 zlmServerConfig.setIp(mediaServerItem.getIp());
+                mediaServerMapper.add(mediaServerItem);
                 handLeZLMServerConfig(zlmServerConfig);
                 result.setCode(0);
                 result.setMsg("success");
@@ -267,82 +299,107 @@
        return result;
     }
 
+    @Override
+    public int addToDatabase(MediaServerItem mediaSerItem) {
+        return mediaServerMapper.add(mediaSerItem);
+    }
+
     /**
      * 澶勭悊zlm涓婄嚎
      * @param zlmServerConfig zlm涓婄嚎鎼哄甫鐨勫弬鏁�
      */
     @Override
     public void handLeZLMServerConfig(ZLMServerConfig zlmServerConfig) {
-        logger.info("[ {} ]-[ {}:{} ]宸茶繛鎺�",
+        logger.info("[ ZLM锛歿} ]-[ {}:{} ]宸茶繛鎺�",
                 zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
 
         MediaServerItem serverItem = mediaServerMapper.queryOne(zlmServerConfig.getGeneralMediaServerId());
         if (serverItem == null) {
             serverItem = mediaServerMapper.queryOneByHostAndPort(zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
         }
-        if (zlmServerConfig.getGeneralMediaServerId().equals(mediaConfig.getId())
-                || (zlmServerConfig.getIp().equals(mediaConfig.getIp()) && zlmServerConfig.getHttpPort() == mediaConfig.getHttpPort())) {
-            // 閰嶇疆鏂囦欢鐨剒lm
-            // 濡傛灉鏄厤缃枃浠朵腑鐨剒lm銆� 涔熷氨鏄粯璁lm銆� 涓�鍒囦互閰嶇疆鏂囦欢鍐呭涓哄噯
-            // docker閮ㄧ讲涓嶄細浣跨敤zlm閰嶇疆鐨勭鍙e彿涓嶆槸榛樿鐨勫垯涓嶅仛鏇存柊锛� 閰嶇疆淇敼闇�瑕佽嚜琛屼慨鏀箂erver閰嶇疆;
-            MediaServerItem serverItemFromConfig = mediaConfig.getMediaSerItem();
-            serverItemFromConfig.setId(zlmServerConfig.getGeneralMediaServerId());
-            if (mediaConfig.getHttpPort() == 0) {
-                serverItemFromConfig.setHttpPort(zlmServerConfig.getHttpPort());
-            }
-            if (mediaConfig.getHttpSSlPort() == 0) {
-                serverItemFromConfig.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
-            }
-            if (mediaConfig.getRtmpPort() == 0) {
-                serverItemFromConfig.setRtmpPort(zlmServerConfig.getRtmpPort());
-            }
-            if (mediaConfig.getRtmpSSlPort() == 0) {
-                serverItemFromConfig.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
-            }
-            if (mediaConfig.getRtspPort() == 0) {
-                serverItemFromConfig.setRtspPort(zlmServerConfig.getRtspPort());
-            }
-            if (mediaConfig.getRtspSSLPort() == 0) {
-                serverItemFromConfig.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
-            }
-            if (mediaConfig.getRtpProxyPort() == 0) {
-                serverItemFromConfig.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
-            }
-            if (serverItem != null){
-                mediaServerMapper.delDefault();
-                mediaServerMapper.add(serverItemFromConfig);
-                String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
-                MediaServerItem serverItemInRedis =  (MediaServerItem)redisUtil.get(key);
-                if (serverItemInRedis != null) {
-                    serverItemFromConfig.setSsrcConfig(serverItemInRedis.getSsrcConfig());
-                }else {
-                    serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getDomain()));
-                }
-                redisUtil.set(key, serverItemFromConfig);
-            }else {
-                String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
-                serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getDomain()));
-                redisUtil.set(key, serverItemFromConfig);
-                mediaServerMapper.add(serverItemFromConfig);
-            }
-            resetOnlineServerItem(serverItemFromConfig);
-            setZLMConfig(serverItemFromConfig);
-        }else {
-            String now = this.format.format(System.currentTimeMillis());
-            if (serverItem == null){
-                    // 涓�涓柊鐨剒lm鎺ュ叆wvp
-                    serverItem = new MediaServerItem(zlmServerConfig, sipConfig.getIp());
-                    serverItem.setCreateTime(now);
-                    serverItem.setUpdateTime(now);
-                String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId();
-                serverItem.setSsrcConfig(new SsrcConfig(serverItem.getId(), null, sipConfig.getDomain()));
-                redisUtil.set(key, serverItem);
-                // 瀛樺叆鏁版嵁搴�
-                mediaServerMapper.add(serverItem);
-                setZLMConfig(serverItem);
-            }
-            resetOnlineServerItem(serverItem);
+        if (serverItem == null) {
+            logger.warn("[鏈敞鍐岀殑zlm] 鎷掓帴鎺ュ叆锛氭潵鑷獅}锛歿}", zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() );
+            return;
         }
+        if (StringUtils.isEmpty(serverItem.getId())) {
+            serverItem.setId(zlmServerConfig.getGeneralMediaServerId());
+        }
+        if (redisUtil.get(VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId()) == null) {
+            SsrcConfig ssrcConfig = new SsrcConfig(serverItem.getId(), null, sipConfig.getDomain());
+            serverItem.setSsrcConfig(ssrcConfig);
+            redisUtil.set(VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId(), serverItem);
+        }
+
+        serverItem.setStatus(true);
+        mediaServerMapper.update(serverItem);
+        resetOnlineServerItem(serverItem);
+        setZLMConfig(serverItem);
+
+//        if (zlmServerConfig.getGeneralMediaServerId().equals(mediaConfig.getId())
+//                || (zlmServerConfig.getIp().equals(mediaConfig.getIp()) && zlmServerConfig.getHttpPort() == mediaConfig.getHttpPort())) {
+//            // 閰嶇疆鏂囦欢鐨剒lm
+//            // 濡傛灉鏄厤缃枃浠朵腑鐨剒lm銆� 涔熷氨鏄粯璁lm銆� 涓�鍒囦互閰嶇疆鏂囦欢鍐呭涓哄噯
+//            // wvp浜掓儬淇敼zlm鐨勭鍙o紝闇�瑕佽嚜琛岄厤缃��
+//            MediaServerItem serverItemFromConfig = mediaConfig.getMediaSerItem();
+//            serverItemFromConfig.setId(zlmServerConfig.getGeneralMediaServerId());
+//            if (mediaConfig.getHttpPort() == 0) {
+//                serverItemFromConfig.setHttpPort(zlmServerConfig.getHttpPort());
+//            }
+//            if (mediaConfig.getHttpSSlPort() == 0) {
+//                serverItemFromConfig.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
+//            }
+//            if (mediaConfig.getRtmpPort() == 0) {
+//                serverItemFromConfig.setRtmpPort(zlmServerConfig.getRtmpPort());
+//            }
+//            if (mediaConfig.getRtmpSSlPort() == 0) {
+//                serverItemFromConfig.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
+//            }
+//            if (mediaConfig.getRtspPort() == 0) {
+//                serverItemFromConfig.setRtspPort(zlmServerConfig.getRtspPort());
+//            }
+//            if (mediaConfig.getRtspSSLPort() == 0) {
+//                serverItemFromConfig.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
+//            }
+//            if (mediaConfig.getRtpProxyPort() == 0) {
+//                serverItemFromConfig.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
+//            }
+//            if (serverItem != null){
+//                mediaServerMapper.delDefault();
+//                mediaServerMapper.add(serverItemFromConfig);
+//                String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
+//                MediaServerItem serverItemInRedis =  (MediaServerItem)redisUtil.get(key);
+//                if (serverItemInRedis != null) {
+//                    serverItemFromConfig.setSsrcConfig(serverItemInRedis.getSsrcConfig());
+//                }else {
+//                    serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getDomain()));
+//                }
+//                redisUtil.set(key, serverItemFromConfig);
+//            }else {
+//                String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
+//                serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getDomain()));
+//                redisUtil.set(key, serverItemFromConfig);
+//                mediaServerMapper.add(serverItemFromConfig);
+//            }
+//            resetOnlineServerItem(serverItemFromConfig);
+//            setZLMConfig(serverItemFromConfig);
+//        }
+        // 绉婚櫎鏈坊鍔犵殑zlm鐨勬帴鍏ワ紝鎵�鏈夌殑zlm蹇呴』鍏堟坊鍔犲悗鎵嶅彲浠ュ姞鍏ヤ娇鐢�
+//        else {
+//            String now = this.format.format(System.currentTimeMillis());
+//            if (serverItem == null){
+//                    // 涓�涓柊鐨剒lm鎺ュ叆wvp
+//                    serverItem = new MediaServerItem(zlmServerConfig, sipConfig.getIp());
+//                    serverItem.setCreateTime(now);
+//                    serverItem.setUpdateTime(now);
+//                String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId();
+//                serverItem.setSsrcConfig(new SsrcConfig(serverItem.getId(), null, sipConfig.getDomain()));
+//                redisUtil.set(key, serverItem);
+//                // 瀛樺叆鏁版嵁搴�
+//                mediaServerMapper.add(serverItem);
+//                setZLMConfig(serverItem);
+//            }
+//            resetOnlineServerItem(serverItem);
+//        }
     }
 
     @Override
@@ -412,7 +469,7 @@
      */
     @Override
     public void setZLMConfig(MediaServerItem mediaServerItem) {
-        logger.info("[ {} ]-[ {}:{} ]璁剧疆zlm",
+        logger.info("[ ZLM锛歿} ]-[ {}:{} ]璁剧疆zlm",
                 mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
         String protocol = sslEnabled ? "https" : "http";
         String hookPrex = String.format("%s://%s:%s/index/hook", protocol, mediaServerItem.getHookIp(), serverPort);
@@ -437,16 +494,17 @@
         param.put("hook.on_stream_changed",String.format("%s/on_stream_changed", hookPrex));
         param.put("hook.on_stream_none_reader",String.format("%s/on_stream_none_reader", hookPrex));
         param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrex));
+        param.put("hook.on_server_keepalive",String.format("%s/on_server_keepalive", hookPrex));
         param.put("hook.timeoutSec","20");
         param.put("general.streamNoneReaderDelayMS","-1".equals(mediaServerItem.getStreamNoneReaderDelayMS())?"3600000":mediaServerItem.getStreamNoneReaderDelayMS() );
 
         JSONObject responseJSON = zlmresTfulUtils.setServerConfig(mediaServerItem, param);
 
         if (responseJSON != null && responseJSON.getInteger("code") == 0) {
-            logger.info("[ {} ]-[ {}:{} ]璁剧疆zlm鎴愬姛",
+            logger.info("[ ZLM锛歿} ]-[ {}:{} ]璁剧疆zlm鎴愬姛",
                     mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
         }else {
-            logger.info("[ {} ]-[ {}:{} ]璁剧疆zlm澶辫触",
+            logger.info("[ ZLM锛歿} ]-[ {}:{} ]璁剧疆zlm澶辫触",
                     mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
         }
     }

--
Gitblit v1.8.0