feat(log): 语音广播日志优化

fix: 语音广播invite超时时间优化

src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java

@@ -197,16 +197,21 @@ public class MediaServerServiceImpl implements IMediaServerService {
 //            }
             int rtpServerPort;
             // 创建
-            Map<String, Object> rtpParam = zlmrtpServerFactory.createStartSendRtpStreamAudioData(mediaServerItem,app, recv_stream_id,audioStreamId,_ssrc,addr, Integer.parseInt(port),waitTime);
-            logger.info("[wvp ==> zlm:{}] {}",mediaServerItem.getId(),rtpParam.toString());
+            Map<String, Object> rtpParam = zlmrtpServerFactory.createStartSendRtpStreamAudioData(mediaServerItem,
+                    app,
+                    recv_stream_id,
+                    audioStreamId,
+                    _ssrc,
+                    addr, Integer.parseInt(port), waitTime);
+            logger.info("[wvp ==> zlm:{}] {}", mediaServerItem.getId(), rtpParam.toString());
             if (mediaServerItem == null || mediaServerItem.getId() == null) {
                 logger.warn("无法连接至zlm!!!!!!!");
                 return null;
             }
             // 等待zlm回复时间为 waitTime+5 秒 毫秒转换为秒
-            JSONObject result = zlmrtpServerFactory.startSendRtpPassive(mediaServerItem,rtpParam,(waitTime / 1000) + 5);
+            JSONObject result = zlmrtpServerFactory.startSendRtpPassive(mediaServerItem, rtpParam, (waitTime / 1000) + 5);
 //            JSONObject result = zlmrtpServerFactory.startSendRtpStream(mediaServerItem,rtpParam);
-            logger.info("zlm start send {}",result.toJSONString());
+            logger.info("zlm start send {}", result.toJSONString());
             Integer code = (Integer) result.get("code");
             if(code != null && code.intValue() != 0){ logger.error("[语音广播 流媒体异常] {}", result.get("msg")); return null; }
             RedisUtil.set(key, mediaServerItem);

src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java

@@ -1017,10 +1017,11 @@ public class PlayServiceImpl implements IPlayService {
         if (waitTime == 0) {
             waitTime = 15 * 1000;
         }
-        logger.info("[语言广播] 开始返回invite200,并创建zlm服务");
+        logger.info("[语言广播] 开始返回invite200,并创建zlm服务 app:{} stream:{} ",
+                broadcastItem.getApp(), broadcastItem.getStream());
         JSONObject errJson = new JSONObject();
         try {
-            String steamId = "relay_"+broadcastItem.getStream();
+            String steamId = "relay_" + broadcastItem.getStream();
             String ssrcStr = broadcastItem.getSsrc();
             // 更新
 

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java

@@ -405,7 +405,7 @@ public class PlayController {
             @RequestParam(value = "stream") String stream,
             @RequestParam(required = false) String shareCode
     ) {
-        logger.info("[语音对讲] web端已经开启推流");
+        logger.info("[语音对讲] web端已经开启推流 {} - {}", app, stream);
 
         // 检查设备是否存在
         Device device = storager.queryVideoDevice(deviceId);
@@ -445,7 +445,7 @@ public class PlayController {
             playService.openBroadcast(
                     mediaServerItem,
                     device,
-                    waitTime,
+                    waitTime * 2,
                     (int code, JSONObject json, SIPRequest request) -> {
                         // 0 ok,1 超时,2 异常
                         // invite sdp , message data