From 3e71e0bdf1e4b2e527d491d426f67e34b7d3c148 Mon Sep 17 00:00:00 2001
From: xiaoQQya <xiaoQQya@126.com>
Date: 星期六, 05 十一月 2022 11:35:01 +0800
Subject: [PATCH] perf(rtcPlayer): 修改控制台 log 级别
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 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 9b72200..fefcbd6 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
@@ -3,10 +3,12 @@
import com.alibaba.fastjson.JSONObject;
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;
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.IPlayService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
@@ -16,6 +18,10 @@
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鍏煎锛氬疄鏃剁洿鎾�
@@ -41,6 +47,9 @@
private IRedisCatchStorage redisCatchStorage;
@Autowired
+ private IDeviceService deviceService;
+
+ @Autowired
private IPlayService playService;
/**
@@ -48,12 +57,12 @@
* @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")
@@ -74,10 +83,12 @@
JSONObject result = new JSONObject();
result.put("error","device[ " + serial + " ]鏈壘鍒�");
resultDeferredResult.setResult(result);
+ return resultDeferredResult;
}else if (device.getOnline() == 0) {
JSONObject result = new JSONObject();
result.put("error","device[ " + code + " ]offline");
resultDeferredResult.setResult(result);
+ return resultDeferredResult;
}
resultDeferredResult.onTimeout(()->{
logger.info("鎾斁绛夊緟瓒呮椂");
@@ -93,10 +104,12 @@
JSONObject result = new JSONObject();
result.put("error","channel[ " + code + " ]鏈壘鍒�");
resultDeferredResult.setResult(result);
+ return resultDeferredResult;
}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);
PlayResult play = playService.play(newMediaServerItem, serial, code, (mediaServerItem, response)->{
@@ -134,18 +147,6 @@
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);
@@ -177,7 +178,19 @@
result.put("error","鏈壘鍒版祦淇℃伅");
return result;
}
- cmder.streamByeCmd(serial, code, streamInfo.getStream(), null);
+ Device device = deviceService.getDevice(serial);
+ if (device == null) {
+ JSONObject result = new JSONObject();
+ result.put("error","鏈壘鍒拌澶�");
+ return result;
+ }
+ try {
+ cmder.streamByeCmd(device, code, streamInfo.getStream(), null);
+ } catch (InvalidArgumentException | ParseException | SipException | SsrcTransactionNotFoundException e) {
+ JSONObject result = new JSONObject();
+ result.put("error","鍙戦�丅YE澶辫触锛�" + e.getMessage());
+ return result;
+ }
redisCatchStorage.stopPlay(streamInfo);
storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
return null;
--
Gitblit v1.8.0