From f7a2d2a92d7e25780c91dd74ecf52e094b62ef4c Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期一, 26 四月 2021 11:37:54 +0800
Subject: [PATCH] 去除所有的system.print, 优化日志显示

---
 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 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
index f9b6a35..874aa5a 100644
--- 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
@@ -99,9 +99,10 @@
 			StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
 			if (streamInfo == null) {
 				RequestMessage msg = new RequestMessage();
-				msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
-				msg.setData("streamId not found");
+				msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
+				msg.setData("鐐规挱鏈壘鍒�");
 				resultHolder.invokeResult(msg);
+				storager.stopPlay(deviceId, channelId);
 			}else {
 				redisCatchStorage.stopPlay(streamInfo);
 				storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
@@ -166,7 +167,7 @@
 					streamId );
 			String srcUrl = String.format("rtsp://%s:%s/rtp/%s", "127.0.0.1", mediaInfo.getRtspPort(), streamId);
 			JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(srcUrl, dstUrl, "1000000");
-			System.out.println(jsonObject);
+			logger.info(jsonObject.toJSONString());
 			JSONObject result = new JSONObject();
 			if (jsonObject != null && jsonObject.getInteger("code") == 0) {
 				   result.put("code", 0);
@@ -197,7 +198,7 @@
 	public ResponseEntity<String> playConvertStop(@PathVariable String key) {
 
 		JSONObject jsonObject = zlmresTfulUtils.delFFmpegSource(key);
-		System.out.println(jsonObject);
+		logger.info(jsonObject.toJSONString());
 		JSONObject result = new JSONObject();
 		if (jsonObject != null && jsonObject.getInteger("code") == 0) {
 			result.put("code", 0);

--
Gitblit v1.8.0