From f8ef14bfea43abd8716aab15f5e302e7c1f23f79 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 11 六月 2024 10:08:13 +0800
Subject: [PATCH] 修复移动位置位置订阅上报间隔为0的bug
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java | 232 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 138 insertions(+), 94 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
index 853ec56..63d9f31 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
@@ -1,28 +1,35 @@
package com.genersoft.iot.vmp.web.gb28181;
-import com.alibaba.fastjson.JSONObject;
+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.UserSetup;
+import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
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.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.PlayResult;
+import com.genersoft.iot.vmp.service.bean.InviteErrorCode;
+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.*;
import org.springframework.web.context.request.async.DeferredResult;
+import javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+import java.text.ParseException;
+
/**
* API鍏煎锛氬疄鏃剁洿鎾�
*/
@SuppressWarnings(value = {"rawtypes", "unchecked"})
-@CrossOrigin
+
@RestController
@RequestMapping(value = "/api/v1/stream")
public class ApiStreamController {
@@ -33,31 +40,34 @@
private SIPCommander cmder;
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
@Autowired
- private UserSetup userSetup;
+ private UserSetting userSetting;
@Autowired
- private IRedisCatchStorage redisCatchStorage;
+ private IDeviceService deviceService;
@Autowired
private IPlayService playService;
+
+ @Autowired
+ private IInviteStreamService inviteStreamService;
/**
* 瀹炴椂鐩存挱 - 寮�濮嬬洿鎾�
* @param serial 璁惧缂栧彿
* @param channel 閫氶亾搴忓彿 榛樿鍊�: 1
* @param code 閫氶亾缂栧彿,閫氳繃 /api/v1/device/channellist 鑾峰彇鐨� ChannelList.ID, 璇ュ弬鏁板拰 channel 浜岄�変竴浼犻�掑嵆鍙�
- * @param cdn TODO 杞帹 CDN 鍦板潃, 褰㈠: [rtmp|rtsp]://xxx, encodeURIComponent
- * @param audio TODO 鏄惁寮�鍚煶棰�, 榛樿 寮�鍚�
+ * @param cdn 杞帹 CDN 鍦板潃, 褰㈠: [rtmp|rtsp]://xxx, encodeURIComponent
+ * @param audio 鏄惁寮�鍚煶棰�, 榛樿 寮�鍚�
* @param transport 娴佷紶杈撴ā寮忥紝 榛樿 UDP
- * @param checkchannelstatus TODO 鏄惁妫�鏌ラ�氶亾鐘舵��, 榛樿 false, 琛ㄧず 鎷夋祦鍓嶄笉妫�鏌ラ�氶亾鐘舵�佹槸鍚﹀湪绾�
- * @param transportmode TODO 褰� transport=TCP 鏃舵湁鏁�, 鎸囩ず娴佷紶杈撲富琚姩妯″紡, 榛樿琚姩
- * @param timeout TODO 鎷夋祦瓒呮椂(绉�),
+ * @param checkchannelstatus 鏄惁妫�鏌ラ�氶亾鐘舵��, 榛樿 false, 琛ㄧず 鎷夋祦鍓嶄笉妫�鏌ラ�氶亾鐘舵�佹槸鍚﹀湪绾�
+ * @param transportmode 褰� transport=TCP 鏃舵湁鏁�, 鎸囩ず娴佷紶杈撲富琚姩妯″紡, 榛樿琚姩
+ * @param timeout 鎷夋祦瓒呮椂(绉�),
* @return
*/
- @RequestMapping(value = "/start")
+ @GetMapping("/start")
private DeferredResult<JSONObject> start(String serial ,
@RequestParam(required = false)Integer channel ,
@RequestParam(required = false)String code,
@@ -69,89 +79,111 @@
@RequestParam(required = false)String timeout
){
- DeferredResult<JSONObject> resultDeferredResult = new DeferredResult<>(userSetup.getPlayTimeout() + 10);
+ DeferredResult<JSONObject> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue() + 10);
Device device = storager.queryVideoDevice(serial);
if (device == null ) {
- JSONObject result = new JSONObject();
- result.put("error","device[ " + serial + " ]鏈壘鍒�");
- resultDeferredResult.setResult(result);
- }else if (device.getOnline() == 0) {
- JSONObject result = new JSONObject();
- result.put("error","device[ " + code + " ]offline");
- resultDeferredResult.setResult(result);
+ JSONObject resultJSON = new JSONObject();
+ resultJSON.put("error","device[ " + serial + " ]鏈壘鍒�");
+ result.setResult(resultJSON);
+ return result;
+ }else if (!device.isOnLine()) {
+ JSONObject resultJSON = new JSONObject();
+ resultJSON.put("error","device[ " + code + " ]offline");
+ result.setResult(resultJSON);
+ return result;
}
- resultDeferredResult.onTimeout(()->{
+ result.onTimeout(()->{
logger.info("鎾斁绛夊緟瓒呮椂");
- JSONObject result = new JSONObject();
- result.put("error","timeout");
- resultDeferredResult.setResult(result);
-
+ JSONObject resultJSON = new JSONObject();
+ resultJSON.put("error","timeout");
+ result.setResult(resultJSON);
+ inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, serial, code);
+ storager.stopPlay(serial, code);
// 娓呯悊RTP server
});
DeviceChannel deviceChannel = storager.queryChannel(serial, code);
if (deviceChannel == null) {
- JSONObject result = new JSONObject();
- result.put("error","channel[ " + code + " ]鏈壘鍒�");
- resultDeferredResult.setResult(result);
- }else if (deviceChannel.getStatus() == 0) {
- JSONObject result = new JSONObject();
- result.put("error","channel[ " + code + " ]offline");
- resultDeferredResult.setResult(result);
+ JSONObject resultJSON = new JSONObject();
+ resultJSON.put("error","channel[ " + code + " ]鏈壘鍒�");
+ result.setResult(resultJSON);
+ return result;
+ }else if (!deviceChannel.isStatus()) {
+ JSONObject resultJSON = new JSONObject();
+ resultJSON.put("error","channel[ " + code + " ]offline");
+ result.setResult(resultJSON);
+ return result;
}
MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
- PlayResult play = 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());
- result.put("WS_FLV", streamInfo.getWs_flv());
- result.put("RTMP", streamInfo.getRtmp());
- result.put("HLS", streamInfo.getHls());
- result.put("RTSP", streamInfo.getRtsp());
- 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);
-// Class<?> aClass = responseEntity.getClass().getSuperclass();
-// Field body = null;
-// try {
-// // 浣跨敤鍙嶅皠鍔ㄦ�佷慨鏀硅繑鍥炵殑body
-// body = aClass.getDeclaredField("body");
-// body.setAccessible(true);
-// body.set(responseEntity, result);
-// } catch (NoSuchFieldException e) {
-// e.printStackTrace();
-// } catch (IllegalAccessException e) {
-// e.printStackTrace();
-// }
- }, (eventResult) -> {
- JSONObject result = new JSONObject();
- result.put("error", "channel[ " + code + " ] " + eventResult.msg);
- resultDeferredResult.setResult(result);
+
+ playService.play(newMediaServerItem, serial, code, null, (errorCode, msg, data) -> {
+ if (errorCode == InviteErrorCode.SUCCESS.getCode()) {
+ if (data != null) {
+ StreamInfo streamInfo = (StreamInfo)data;
+ JSONObject resultJjson = new JSONObject();
+ resultJjson.put("StreamID", streamInfo.getStream());
+ resultJjson.put("DeviceID", serial);
+ resultJjson.put("ChannelID", code);
+ resultJjson.put("ChannelName", deviceChannel.getName());
+ resultJjson.put("ChannelCustomName", "");
+ resultJjson.put("FLV", streamInfo.getFlv().getUrl());
+ if(streamInfo.getHttps_flv() != null) {
+ resultJjson.put("HTTPS_FLV", streamInfo.getHttps_flv().getUrl());
+ }
+ resultJjson.put("WS_FLV", streamInfo.getWs_flv().getUrl());
+ if(streamInfo.getWss_flv() != null) {
+ resultJjson.put("WSS_FLV", streamInfo.getWss_flv().getUrl());
+ }
+ resultJjson.put("RTMP", streamInfo.getRtmp().getUrl());
+ if (streamInfo.getRtmps() != null) {
+ resultJjson.put("RTMPS", streamInfo.getRtmps().getUrl());
+ }
+ resultJjson.put("HLS", streamInfo.getHls().getUrl());
+ if (streamInfo.getHttps_hls() != null) {
+ resultJjson.put("HTTPS_HLS", streamInfo.getHttps_hls().getUrl());
+ }
+ resultJjson.put("RTSP", streamInfo.getRtsp().getUrl());
+ if (streamInfo.getRtsps() != null) {
+ resultJjson.put("RTSPS", streamInfo.getRtsps().getUrl());
+ }
+ resultJjson.put("WEBRTC", streamInfo.getRtc().getUrl());
+ if (streamInfo.getRtcs() != null) {
+ resultJjson.put("HTTPS_WEBRTC", streamInfo.getRtcs().getUrl());
+ }
+ resultJjson.put("CDN", "");
+ resultJjson.put("SnapURL", "");
+ resultJjson.put("Transport", device.getTransport());
+ resultJjson.put("StartAt", "");
+ resultJjson.put("Duration", "");
+ resultJjson.put("SourceVideoCodecName", "");
+ resultJjson.put("SourceVideoWidth", "");
+ resultJjson.put("SourceVideoHeight", "");
+ resultJjson.put("SourceVideoFrameRate", "");
+ resultJjson.put("SourceAudioCodecName", "");
+ resultJjson.put("SourceAudioSampleRate", "");
+ resultJjson.put("AudioEnable", "");
+ resultJjson.put("Ondemand", "");
+ resultJjson.put("InBytes", "");
+ resultJjson.put("InBitRate", "");
+ resultJjson.put("OutBytes", "");
+ resultJjson.put("NumOutputs", "");
+ resultJjson.put("CascadeSize", "");
+ resultJjson.put("RelaySize", "");
+ resultJjson.put("ChannelPTZType", "0");
+ result.setResult(resultJjson);
+ }else {
+ JSONObject resultJjson = new JSONObject();
+ resultJjson.put("error", "channel[ " + code + " ] " + msg);
+ result.setResult(resultJjson);
+ }
+ }else {
+ JSONObject resultJjson = new JSONObject();
+ resultJjson.put("error", "channel[ " + code + " ] " + msg);
+ result.setResult(resultJjson);
+ }
});
- return resultDeferredResult;
+
+ return result;
}
/**
@@ -162,7 +194,7 @@
* @param check_outputs
* @return
*/
- @RequestMapping(value = "/stop")
+ @GetMapping("/stop")
@ResponseBody
private JSONObject stop(String serial ,
@RequestParam(required = false)Integer channel ,
@@ -171,15 +203,27 @@
){
- StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(serial, code);
- if (streamInfo == null) {
+ InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, serial, code);
+ if (inviteInfo == null) {
JSONObject result = new JSONObject();
result.put("error","鏈壘鍒版祦淇℃伅");
return result;
}
- cmder.streamByeCmd(serial, code, streamInfo.getStream());
- redisCatchStorage.stopPlay(streamInfo);
- storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
+ Device device = deviceService.getDevice(serial);
+ if (device == null) {
+ JSONObject result = new JSONObject();
+ result.put("error","鏈壘鍒拌澶�");
+ return result;
+ }
+ try {
+ cmder.streamByeCmd(device, code, inviteInfo.getStream(), null);
+ } catch (InvalidArgumentException | ParseException | SipException | SsrcTransactionNotFoundException e) {
+ JSONObject result = new JSONObject();
+ result.put("error","鍙戦�丅YE澶辫触锛�" + e.getMessage());
+ return result;
+ }
+ inviteStreamService.removeInviteInfo(inviteInfo);
+ storager.stopPlay(inviteInfo.getDeviceId(), inviteInfo.getChannelId());
return null;
}
@@ -190,7 +234,7 @@
* @param code 閫氶亾鍥芥爣缂栧彿
* @return
*/
- @RequestMapping(value = "/touch")
+ @GetMapping("/touch")
@ResponseBody
private JSONObject touch(String serial ,String t,
@RequestParam(required = false)Integer channel ,
--
Gitblit v1.8.0