Merge branch '2.6.8' into wvp-28181-2.0

# Conflicts:
#	sql/初始化.sql
#	src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
#	src/main/resources/all-application.yml

src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java

@@ -1,8 +1,7 @@
 package com.genersoft.iot.vmp.web.gb28181;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.genersoft.iot.vmp.common.InviteInfo;
-import com.genersoft.iot.vmp.common.InviteSessionType;
+import com.genersoft.iot.vmp.common.StreamInfo;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
 import com.genersoft.iot.vmp.gb28181.bean.Device;
@@ -10,18 +9,13 @@ import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
 import com.genersoft.iot.vmp.service.IDeviceService;
-import com.genersoft.iot.vmp.service.IInviteStreamService;
 import com.genersoft.iot.vmp.service.IPlayService;
-import com.genersoft.iot.vmp.service.bean.InviteErrorCode;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
 import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.DeferredResult;
 
 import javax.sip.InvalidArgumentException;
@@ -51,9 +45,6 @@ public class ApiStreamController {
     @Autowired
     private IRedisCatchStorage redisCatchStorage;
 
-    @Autowired
-    private IInviteStreamService inviteStreamService;
-
     @Autowired
     private IDeviceService deviceService;
 
@@ -92,7 +83,7 @@ public class ApiStreamController {
             result.put("error","device[ " + serial + " ]未找到");
             resultDeferredResult.setResult(result);
             return resultDeferredResult;
-        }else if (!device.isOnLine()) {
+        }else if (device.getOnline() == 0) {
             JSONObject result = new JSONObject();
             result.put("error","device[ " + code + " ]offline");
             resultDeferredResult.setResult(result);
@@ -113,60 +104,59 @@ public class ApiStreamController {
             result.put("error","channel[ " + code + " ]未找到");
             resultDeferredResult.setResult(result);
             return resultDeferredResult;
-        }else if (!deviceChannel.isStatus()) {
+        }else if (deviceChannel.getStatus() == 0) {
             JSONObject result = new JSONObject();
             result.put("error","channel[ " + code + " ]offline");
             resultDeferredResult.setResult(result);
             return resultDeferredResult;
         }
         MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
-
-
-        playService.play(newMediaServerItem, serial, code, null, (errorCode, msg, data) -> {
-            if (errorCode == InviteErrorCode.SUCCESS.getCode()) {
-                InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, serial, code);
-                if (inviteInfo != null && inviteInfo.getStreamInfo() != null) {
-                    JSONObject result = new JSONObject();
-                    result.put("StreamID", inviteInfo.getStreamInfo().getStream());
-                    result.put("DeviceID", device.getDeviceId());
-                    result.put("ChannelID", code);
-                    result.put("ChannelName", deviceChannel.getName());
-                    result.put("ChannelCustomName", "");
-                    result.put("FLV", inviteInfo.getStreamInfo().getFlv().getUrl());
-                    result.put("WS_FLV", inviteInfo.getStreamInfo().getWs_flv().getUrl());
-                    result.put("RTMP", inviteInfo.getStreamInfo().getRtmp().getUrl());
-                    result.put("HLS", inviteInfo.getStreamInfo().getHls().getUrl());
-                    result.put("RTSP", inviteInfo.getStreamInfo().getRtsp().getUrl());
-                    result.put("WEBRTC", inviteInfo.getStreamInfo().getRtc().getUrl());
-                    result.put("CDN", "");
-                    result.put("SnapURL", "");
-                    result.put("Transport", device.getTransport());
-                    result.put("StartAt", "");
-                    result.put("Duration", "");
-                    result.put("SourceVideoCodecName", "");
-                    result.put("SourceVideoWidth", "");
-                    result.put("SourceVideoHeight", "");
-                    result.put("SourceVideoFrameRate", "");
-                    result.put("SourceAudioCodecName", "");
-                    result.put("SourceAudioSampleRate", "");
-                    result.put("AudioEnable", "");
-                    result.put("Ondemand", "");
-                    result.put("InBytes", "");
-                    result.put("InBitRate", "");
-                    result.put("OutBytes", "");
-                    result.put("NumOutputs", "");
-                    result.put("CascadeSize", "");
-                    result.put("RelaySize", "");
-                    result.put("ChannelPTZType", "0");
-                    resultDeferredResult.setResult(result);
-                }
-            }else {
-                JSONObject result = new JSONObject();
-                result.put("error", "channel[ " + code + " ] " + msg);
-                resultDeferredResult.setResult(result);
-            }
-        });
-
+        playService.play(newMediaServerItem, serial, code, (mediaServerItem, response)->{
+            StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(serial, code);
+            JSONObject result = new JSONObject();
+            result.put("StreamID", streamInfo.getStream());
+            result.put("DeviceID", device.getDeviceId());
+            result.put("ChannelID", code);
+            result.put("ChannelName", deviceChannel.getName());
+            result.put("ChannelCustomName", "");
+            result.put("FLV", streamInfo.getFlv().getUrl());
+            result.put("HTTPS_FLV", streamInfo.getHttps_flv().getUrl());
+            result.put("WS_FLV", streamInfo.getWs_flv().getUrl());
+            result.put("WSS_FLV", streamInfo.getWss_flv().getUrl());
+            result.put("RTMP", streamInfo.getRtmp().getUrl());
+            result.put("RTMPS", streamInfo.getRtmps().getUrl());
+            result.put("HLS", streamInfo.getHls().getUrl());
+            result.put("HTTPS_HLS", streamInfo.getHttps_hls().getUrl());
+            result.put("RTSP", streamInfo.getRtsp().getUrl());
+            result.put("RTSPS", streamInfo.getRtsps().getUrl());
+            result.put("WEBRTC", streamInfo.getRtc().getUrl());
+            result.put("HTTPS_WEBRTC", streamInfo.getRtcs().getUrl());
+            result.put("CDN", "");
+            result.put("SnapURL", "");
+            result.put("Transport", device.getTransport());
+            result.put("StartAt", "");
+            result.put("Duration", "");
+            result.put("SourceVideoCodecName", "");
+            result.put("SourceVideoWidth", "");
+            result.put("SourceVideoHeight", "");
+            result.put("SourceVideoFrameRate", "");
+            result.put("SourceAudioCodecName", "");
+            result.put("SourceAudioSampleRate", "");
+            result.put("AudioEnable", "");
+            result.put("Ondemand", "");
+            result.put("InBytes", "");
+            result.put("InBitRate", "");
+            result.put("OutBytes", "");
+            result.put("NumOutputs", "");
+            result.put("CascadeSize", "");
+            result.put("RelaySize", "");
+            result.put("ChannelPTZType", "0");
+            resultDeferredResult.setResult(result);
+        }, (eventResult) -> {
+            JSONObject result = new JSONObject();
+            result.put("error", "channel[ " + code + " ] " + eventResult.msg);
+            resultDeferredResult.setResult(result);
+        }, null);
         return resultDeferredResult;
     }
 
@@ -187,8 +177,8 @@ public class ApiStreamController {
 
     ){
 
-        InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, serial, code);
-        if (inviteInfo == null) {
+        StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(serial, code);
+        if (streamInfo == null) {
             JSONObject result = new JSONObject();
             result.put("error","未找到流信息");
             return result;
@@ -200,14 +190,14 @@ public class ApiStreamController {
             return result;
         }
         try {
-            cmder.streamByeCmd(device, code, inviteInfo.getStream(), null);
+            cmder.streamByeCmd(device, code, streamInfo.getStream(), null);
         } catch (InvalidArgumentException | ParseException | SipException | SsrcTransactionNotFoundException e) {
             JSONObject result = new JSONObject();
             result.put("error","发送BYE失败：" + e.getMessage());
             return result;
         }
-        inviteStreamService.removeInviteInfo(inviteInfo);
-        storager.stopPlay(inviteInfo.getDeviceId(), inviteInfo.getChannelId());
+        redisCatchStorage.stopPlay(streamInfo);
+        storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
         return null;
     }
 

src/main/resources/all-application.yml

@@ -145,8 +145,8 @@ media:
         enable: true
         # [可选] 在此范围内选择端口用于媒体流传输, 必须提前在zlm上配置该属性，不然自动配置此属性可能不成功
         port-range: 30000,30500 # 端口范围
-        # [可选] 国标级联在此范围内选择端口发送媒体流
-        send-port-range: 30000,30500 # 端口范围
+        # [可选] 国标级联在此范围内选择端口发送媒体流，请不要与收流端口范围重合
+        send-port-range: 50502,50506 # 端口范围
     # 录像辅助服务， 部署此服务可以实现zlm录像的管理与下载， 0 表示不使用
     record-assist-port: 0