From 985082d33930868c3cc1723f28fd9aaae9013a8f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 16 八月 2023 09:11:22 +0800
Subject: [PATCH] 添加缺少的内容
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
old mode 100644
new mode 100755
index eb828a8..3d233dc
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -1,6 +1,5 @@
package com.genersoft.iot.vmp.vmanager.gb28181.play;
-import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.common.InviteInfo;
@@ -25,6 +24,7 @@
import com.genersoft.iot.vmp.service.bean.InviteErrorCode;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.StreamContent;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
@@ -92,6 +92,7 @@
public DeferredResult<WVPResult<StreamContent>> play(HttpServletRequest request, @PathVariable String deviceId,
@PathVariable String channelId) {
+ logger.info("[寮�濮嬬偣鎾璢 deviceId锛歿}, channelId锛歿}, ", deviceId, channelId);
// 鑾峰彇鍙敤鐨剒lm
Device device = storager.queryVideoDevice(deviceId);
MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
@@ -104,21 +105,21 @@
DeferredResult<WVPResult<StreamContent>> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue());
result.onTimeout(()->{
- logger.info("鐐规挱鎺ュ彛绛夊緟瓒呮椂");
+ logger.info("[鐐规挱绛夊緟瓒呮椂] deviceId锛歿}, channelId锛歿}, ", deviceId, channelId);
// 閲婃斁rtpserver
WVPResult<StreamInfo> wvpResult = new WVPResult<>();
wvpResult.setCode(ErrorCode.ERROR100.getCode());
wvpResult.setMsg("鐐规挱瓒呮椂");
requestMessage.setData(wvpResult);
- resultHolder.invokeResult(requestMessage);
+ resultHolder.invokeAllResult(requestMessage);
+ inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);
+ storager.stopPlay(deviceId, channelId);
});
// 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
resultHolder.put(key, uuid, result);
- playService.play(newMediaServerItem, deviceId, channelId, ((code, msg, data) -> {
- System.out.println("controller鏀跺埌鍥炶皟");
- System.out.println(JSON.toJSONString(data));
+ playService.play(newMediaServerItem, deviceId, channelId, null, (code, msg, data) -> {
WVPResult<StreamContent> wvpResult = new WVPResult<>();
if (code == InviteErrorCode.SUCCESS.getCode()) {
wvpResult.setCode(ErrorCode.SUCCESS.getCode());
@@ -127,7 +128,7 @@
if (data != null) {
StreamInfo streamInfo = (StreamInfo)data;
if (userSetting.getUseSourceIpAsStreamIp()) {
- streamInfo.channgeStreamIp(request.getLocalName());
+ streamInfo.channgeStreamIp(request.getLocalAddr());
}
wvpResult.setData(new StreamContent(streamInfo));
}
@@ -135,18 +136,18 @@
wvpResult.setCode(code);
wvpResult.setMsg(msg);
}
- System.out.println(JSON.toJSONString(wvpResult));
requestMessage.setData(wvpResult);
resultHolder.invokeResult(requestMessage);
- }));
+ });
return result;
}
@Operation(summary = "鍋滄鐐规挱")
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "isSubStream", description = "鏄惁瀛愮爜娴侊紙true-瀛愮爜娴侊紝false-涓荤爜娴侊級锛岄粯璁や负false", required = true)
@GetMapping("/stop/{deviceId}/{channelId}")
- public JSONObject playStop(@PathVariable String deviceId, @PathVariable String channelId) {
+ public JSONObject playStop(@PathVariable String deviceId, @PathVariable String channelId,boolean isSubStream) {
logger.debug(String.format("璁惧棰勮/鍥炴斁鍋滄API璋冪敤锛宻treamId锛�%s_%s", deviceId, channelId ));
@@ -165,7 +166,7 @@
}
if (InviteSessionStatus.ok == inviteInfo.getStatus()) {
try {
- logger.warn("[鍋滄鐐规挱] {}/{}", device.getDeviceId(), channelId);
+ logger.info("[鍋滄鐐规挱] {}/{}", device.getDeviceId(), channelId);
cmder.streamByeCmd(device, channelId, inviteInfo.getStream(), null, null);
} catch (InvalidArgumentException | SipException | ParseException | SsrcTransactionNotFoundException e) {
logger.error("[鍛戒护鍙戦�佸け璐 鍋滄鐐规挱锛� 鍙戦�丅YE: {}", e.getMessage());
@@ -173,11 +174,12 @@
}
}
inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);
-
storager.stopPlay(deviceId, channelId);
+
JSONObject json = new JSONObject();
json.put("deviceId", deviceId);
json.put("channelId", channelId);
+ json.put("isSubStream", isSubStream);
return json;
}
@@ -341,5 +343,36 @@
return jsonObject;
}
+ @Operation(summary = "鑾峰彇鎴浘")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "isSubStream", description = "鏄惁瀛愮爜娴侊紙true-瀛愮爜娴侊紝false-涓荤爜娴侊級锛岄粯璁や负false", required = true)
+ @GetMapping("/snap")
+ public DeferredResult<String> getSnap(String deviceId, String channelId,boolean isSubStream) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("鑾峰彇鎴浘: {}/{}", deviceId, channelId);
+ }
+
+ DeferredResult<String> result = new DeferredResult<>(3 * 1000L);
+ String key = DeferredResultHolder.CALLBACK_CMD_SNAP + deviceId;
+ String uuid = UUID.randomUUID().toString();
+ resultHolder.put(key, uuid, result);
+
+ RequestMessage message = new RequestMessage();
+ message.setKey(key);
+ message.setId(uuid);
+
+ String fileName = deviceId + "_" + channelId + "_" + DateUtil.getNowForUrl() + ".jpg";
+ playService.getSnap(deviceId, channelId, fileName, (code, msg, data) -> {
+ if (code == InviteErrorCode.SUCCESS.getCode()) {
+ message.setData(data);
+ }else {
+ message.setData(WVPResult.fail(code, msg));
+ }
+ resultHolder.invokeResult(message);
+ });
+ return result;
+ }
+
}
--
Gitblit v1.8.0