From 8db82c8e69df11a6d52c998ea4228ecdc5fa224e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B3=BD=E5=AE=87?= <393911462@qq.com>
Date: Sat, 27 Nov 2021 20:25:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=B8=8D=E5=AD=98=E5=9C=A8=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E4=B8=8D=E5=9C=A8=E7=BA=BF=E7=9A=84=E6=97=B6=E5=80=99=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=20=E9=87=8A=E6=94=BE=E8=AF=B7=E6=B1=82=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vmanager/gb28181/playback/DownloadController.java  | 10 ++++++++++
 .../vmanager/gb28181/playback/PlaybackController.java  | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java
index 05afa710..4ca58dba 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java
@@ -95,12 +95,22 @@ public class DownloadController {
 		Device device = storager.queryVideoDevice(deviceId);
 		if (device == null) {
 			result.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
+			RequestMessage msg = new RequestMessage();
+			msg.setId(uuid);
+			msg.setKey(key);
+			msg.setData("设备不存在");
+			resultHolder.invokeAllResult(msg);
 			return result;
 		}
 		//判断设备是否在线，不在线直接返回
 		if(device.getOnline()==0)
 		{
 			result.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
+			RequestMessage msg = new RequestMessage();
+			msg.setId(uuid);
+			msg.setKey(key);
+			msg.setData("设备不在线");
+			resultHolder.invokeAllResult(msg);
 			return result;
 		}
 		StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, channelId);
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
index c5755be9..ffb3d25b 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
@@ -83,12 +83,22 @@ public class PlaybackController {
 		Device device = storager.queryVideoDevice(deviceId);
 		if (device == null) {
 			result.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
+			RequestMessage msg = new RequestMessage();
+			msg.setId(uuid);
+			msg.setKey(key);
+			msg.setData("设备不存在");
+			resultHolder.invokeAllResult(msg);
 			return result;
 		}
 		//判断设备是否在线，不在线直接返回
 		if(device.getOnline()==0)
 		{
 			result.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
+			RequestMessage msg = new RequestMessage();
+			msg.setId(uuid);
+			msg.setKey(key);
+			msg.setData("设备不在线");
+			resultHolder.invokeAllResult(msg);
 			return result;
 		}
 		MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);