From 61f5950b4fbc0c9d59ac755314c0d1a9efb702bc Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期六, 07 八月 2021 14:05:42 +0800
Subject: [PATCH] 添加日志存储与查询功能 登录接口返回用户详细信息
---
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 119 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 87 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index 535c790..9310320 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -14,8 +14,12 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.service.IMediaServerService;
+import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.PlayResult;
import com.genersoft.iot.vmp.service.IMediaService;
@@ -30,7 +34,6 @@
import org.springframework.util.ResourceUtils;
import org.springframework.web.context.request.async.DeferredResult;
-import javax.sip.ClientTransaction;
import javax.sip.message.Response;
import java.io.FileNotFoundException;
import java.util.UUID;
@@ -51,6 +54,9 @@
private IRedisCatchStorage redisCatchStorage;
@Autowired
+ private RedisUtil redis;
+
+ @Autowired
private DeferredResultHolder resultHolder;
@Autowired
@@ -60,6 +66,9 @@
private IMediaService mediaService;
@Autowired
+ private IMediaServerService mediaServerService;
+
+ @Autowired
private VideoStreamSessionManager streamSession;
@Autowired
@@ -67,8 +76,18 @@
@Override
- public PlayResult play(String deviceId, String channelId, ZLMHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent) {
+ public PlayResult play(MediaServerItem mediaServerItem, String deviceId, String channelId, ZLMHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent) {
PlayResult playResult = new PlayResult();
+ if (mediaServerItem == null) {
+ RequestMessage msg = new RequestMessage();
+ msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + playResult.getUuid());
+ WVPResult wvpResult = new WVPResult();
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("鏈壘鍒板彲鐢ㄧ殑zlm");
+ msg.setData(wvpResult);
+ resultHolder.invokeResult(msg);
+ return playResult;
+ }
Device device = storager.queryVideoDevice(deviceId);
StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
playResult.setDevice(device);
@@ -81,14 +100,21 @@
// 瓒呮椂澶勭悊
result.onTimeout(()->{
logger.warn(String.format("璁惧鐐规挱瓒呮椂锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
- // 閲婃斁rtpserver
- cmder.closeRTPServer(playResult.getDevice(), channelId);
RequestMessage msg = new RequestMessage();
msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + playResult.getUuid());
WVPResult wvpResult = new WVPResult();
wvpResult.setCode(-1);
- wvpResult.setMsg("Timeout");
+ SIPDialog dialog = streamSession.getDialog(deviceId, channelId);
+ if (dialog != null) {
+ wvpResult.setMsg("鏀舵祦瓒呮椂锛岃绋嶅�欓噸璇�");
+ }else {
+ wvpResult.setMsg("鐐规挱瓒呮椂锛岃绋嶅�欓噸璇�");
+ }
msg.setData(wvpResult);
+ // 鐐规挱瓒呮椂鍥炲BYE
+ cmder.streamByeCmd(device.getDeviceId(), channelId);
+ // 閲婃斁rtpserver
+ mediaServerService.closeRTPServer(playResult.getDevice(), channelId);
resultHolder.invokeResult(msg);
});
result.onCompletion(()->{
@@ -115,29 +141,38 @@
WVPResult wvpResult = (WVPResult)responseEntity.getBody();
if (wvpResult.getCode() == 0) {
StreamInfo streamInfoForSuccess = (StreamInfo)wvpResult.getData();
+ MediaServerItem mediaInfo = mediaServerService.getOne(streamInfoForSuccess.getMediaServerId());
String streamUrl = streamInfoForSuccess.getFmp4();
// 璇锋眰鎴浘
- zlmresTfulUtils.getSnap(streamUrl, 15, 1, path, fileName);
+ zlmresTfulUtils.getSnap(mediaInfo, streamUrl, 15, 1, path, fileName);
}
}
- System.out.println(path);
} catch (FileNotFoundException e) {
e.printStackTrace();
}
});
if (streamInfo == null) {
+ SSRCInfo ssrcInfo;
+ String streamId = null;
+ if (mediaServerItem.isRtpEnable()) {
+ streamId = String.format("%s/%s", device.getDeviceId(), channelId);
+ }
+
+ ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId);
+
// 鍙戦�佺偣鎾秷鎭�
- cmder.playStreamCmd(device, channelId, (JSONObject response) -> {
+ cmder.playStreamCmd(mediaServerItem, ssrcInfo, device, channelId, (MediaServerItem mediaServerItemInUse, JSONObject response) -> {
logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + response.toJSONString());
- onPublishHandlerForPlay(response, deviceId, channelId, uuid.toString());
+ onPublishHandlerForPlay(mediaServerItemInUse, response, deviceId, channelId, uuid.toString());
if (hookEvent != null) {
- hookEvent.response(response);
+ hookEvent.response(mediaServerItem, response);
}
- }, event -> {
+ }, (event) -> {
+ // 鐐规挱杩斿洖sip閿欒
RequestMessage msg = new RequestMessage();
msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
Response response = event.getResponse();
- cmder.closeRTPServer(playResult.getDevice(), channelId);
+ mediaServerService.closeRTPServer(playResult.getDevice(), channelId);
WVPResult wvpResult = new WVPResult();
wvpResult.setCode(-1);
wvpResult.setMsg(String.format("鐐规挱澶辫触锛� 閿欒鐮侊細 %s, %s", response.getStatusCode(), response.getReasonPhrase()));
@@ -146,6 +181,7 @@
if (errorEvent != null) {
errorEvent.response(event);
}
+
});
} else {
String streamId = streamInfo.getStreamId();
@@ -159,7 +195,10 @@
resultHolder.invokeResult(msg);
return playResult;
}
- JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
+ String mediaServerId = streamInfo.getMediaServerId();
+ MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+
+ JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(mediaInfo, streamId);
if (rtpInfo != null && rtpInfo.getBoolean("exist")) {
RequestMessage msg = new RequestMessage();
msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
@@ -172,16 +211,24 @@
resultHolder.invokeResult(msg);
if (hookEvent != null) {
- hookEvent.response(JSONObject.parseObject(JSON.toJSONString(streamInfo)));
+ hookEvent.response(mediaServerItem, JSONObject.parseObject(JSON.toJSONString(streamInfo)));
}
} else {
+ // TODO 鐐规挱鍓嶆槸鍚﹂噸缃姸鎬�
redisCatchStorage.stopPlay(streamInfo);
storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
- cmder.playStreamCmd(device, channelId, (JSONObject response) -> {
+ SSRCInfo ssrcInfo;
+ String streamId2 = null;
+ if (mediaServerItem.isRtpEnable()) {
+ streamId2 = String.format("%s/%s", device.getDeviceId(), channelId);
+ }
+ ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId2);
+
+ cmder.playStreamCmd(mediaServerItem, ssrcInfo, device, channelId, (MediaServerItem mediaServerItemInuse, JSONObject response) -> {
logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + response.toJSONString());
- onPublishHandlerForPlay(response, deviceId, channelId, uuid.toString());
- }, event -> {
- cmder.closeRTPServer(playResult.getDevice(), channelId);
+ onPublishHandlerForPlay(mediaServerItemInuse, response, deviceId, channelId, uuid.toString());
+ }, (event) -> {
+ mediaServerService.closeRTPServer(playResult.getDevice(), channelId);
RequestMessage msg = new RequestMessage();
msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
Response response = event.getResponse();
@@ -199,24 +246,16 @@
}
@Override
- public void onPublishHandlerForPlay(JSONObject resonse, String deviceId, String channelId, String uuid) {
+ public void onPublishHandlerForPlay(MediaServerItem mediaServerItem, JSONObject resonse, String deviceId, String channelId, String uuid) {
RequestMessage msg = new RequestMessage();
msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
- StreamInfo streamInfo = onPublishHandler(resonse, deviceId, channelId, uuid);
+ StreamInfo streamInfo = onPublishHandler(mediaServerItem, resonse, deviceId, channelId, uuid);
if (streamInfo != null) {
DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);
if (deviceChannel != null) {
deviceChannel.setStreamId(streamInfo.getStreamId());
storager.startPlay(deviceId, channelId, streamInfo.getStreamId());
}
- ClientTransaction transaction = streamSession.getTransaction(deviceId, channelId);
- SIPDialog dialog = (SIPDialog)transaction.getDialog();
- StreamInfo.TransactionInfo transactionInfo = new StreamInfo.TransactionInfo();
- transactionInfo.callId = dialog.getCallId().getCallId();
- transactionInfo.localTag = dialog.getLocalTag();
- transactionInfo.remoteTag = dialog.getRemoteTag();
- transactionInfo.branch = dialog.getFirstTransactionInt().getBranchId();
- streamInfo.setTransactionInfo(transactionInfo);
redisCatchStorage.startPlay(streamInfo);
msg.setData(JSON.toJSONString(streamInfo));
@@ -235,10 +274,26 @@
}
@Override
- public void onPublishHandlerForPlayBack(JSONObject resonse, String deviceId, String channelId, String uuid) {
+ public MediaServerItem getNewMediaServerItem(Device device) {
+ if (device == null) return null;
+ String mediaServerId = device.getMediaServerId();
+ MediaServerItem mediaServerItem = null;
+ if (mediaServerId == null) {
+ mediaServerItem = mediaServerService.getMediaServerForMinimumLoad();
+ }else {
+ mediaServerItem = mediaServerService.getOne(mediaServerId);
+ }
+ if (mediaServerItem == null) {
+ logger.warn("鐐规挱鏃舵湭鎵惧埌鍙娇鐢ㄧ殑ZLM...");
+ }
+ return mediaServerItem;
+ }
+
+ @Override
+ public void onPublishHandlerForPlayBack(MediaServerItem mediaServerItem, JSONObject resonse, String deviceId, String channelId, String uuid) {
RequestMessage msg = new RequestMessage();
msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
- StreamInfo streamInfo = onPublishHandler(resonse, deviceId, channelId, uuid);
+ StreamInfo streamInfo = onPublishHandler(mediaServerItem, resonse, deviceId, channelId, uuid);
if (streamInfo != null) {
redisCatchStorage.startPlayback(streamInfo);
msg.setData(JSON.toJSONString(streamInfo));
@@ -250,10 +305,10 @@
}
}
- public StreamInfo onPublishHandler(JSONObject resonse, String deviceId, String channelId, String uuid) {
+ public StreamInfo onPublishHandler(MediaServerItem mediaServerItem, JSONObject resonse, String deviceId, String channelId, String uuid) {
String streamId = resonse.getString("stream");
JSONArray tracks = resonse.getJSONArray("tracks");
- StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream("rtp", streamId, tracks);
+ StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(mediaServerItem,"rtp", streamId, tracks);
streamInfo.setDeviceID(deviceId);
streamInfo.setChannelId(channelId);
return streamInfo;
--
Gitblit v1.8.0