From 61a8113c39007105fb20e5c997d69f1586c86149 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 18 十月 2021 17:31:28 +0800
Subject: [PATCH] 修改错别字

---
 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java   |    8 ++++----
 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java   |    8 ++++----
 src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java                   |   18 +++++++++---------
 src/main/java/com/genersoft/iot/vmp/web/ApiDeviceController.java                        |    2 --
 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java           |    4 ++--
 web_src/src/components/dialog/jessibuca.vue                                             |    1 +
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java |    3 ++-
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
index f21895c..e6a7e41 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
@@ -31,7 +31,7 @@
 	
 	public static final String CALLBACK_CMD_RECORDINFO = "CALLBACK_RECORDINFO";
 
-	public static final String CALLBACK_CMD_PlAY = "CALLBACK_PLAY";
+	public static final String CALLBACK_CMD_PLAY = "CALLBACK_PLAY";
 
 	public static final String CALLBACK_CMD_STOP = "CALLBACK_STOP";
 
@@ -47,6 +47,7 @@
 
 	private Map<String, DeferredResult> map = new ConcurrentHashMap<String, DeferredResult>();
 
+
 	public void put(String key, DeferredResult result) {
 		map.put(key, result);
 	}
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 fea3123..057025b 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
@@ -80,7 +80,7 @@
         PlayResult playResult = new PlayResult();
         if (mediaServerItem == null) {
             RequestMessage msg = new RequestMessage();
-            msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + playResult.getUuid());
+            msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + playResult.getUuid());
             WVPResult wvpResult = new WVPResult();
             wvpResult.setCode(-1);
             wvpResult.setMsg("鏈壘鍒板彲鐢ㄧ殑zlm");
@@ -96,12 +96,12 @@
         DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(userSetup.getPlayTimeout());
         playResult.setResult(result);
         // 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
-        resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid, result);
+        resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid, result);
         // 瓒呮椂澶勭悊
         result.onTimeout(()->{
             logger.warn(String.format("璁惧鐐规挱瓒呮椂锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
             RequestMessage msg = new RequestMessage();
-            msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + playResult.getUuid());
+            msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + playResult.getUuid());
             WVPResult wvpResult = new WVPResult();
             wvpResult.setCode(-1);
             SIPDialog dialog = streamSession.getDialog(deviceId, channelId);
@@ -170,7 +170,7 @@
             }, (event) -> {
                 // 鐐规挱杩斿洖sip閿欒
                 RequestMessage msg = new RequestMessage();
-                msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+                msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
                 Response response = event.getResponse();
                 mediaServerService.closeRTPServer(playResult.getDevice(), channelId);
                 WVPResult wvpResult = new WVPResult();
@@ -187,7 +187,7 @@
             String streamId = streamInfo.getStreamId();
             if (streamId == null) {
                 RequestMessage msg = new RequestMessage();
-                msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+                msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
                 WVPResult wvpResult = new WVPResult();
                 wvpResult.setCode(-1);
                 wvpResult.setMsg(String.format("鐐规挱澶辫触锛� redis缂撳瓨streamId绛変簬null"));
@@ -201,7 +201,7 @@
             JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(mediaInfo, streamId);
             if (rtpInfo != null && rtpInfo.getBoolean("exist")) {
                 RequestMessage msg = new RequestMessage();
-                msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+                msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
 
                 WVPResult wvpResult = new WVPResult();
                 wvpResult.setCode(0);
@@ -230,7 +230,7 @@
                 }, (event) -> {
                     mediaServerService.closeRTPServer(playResult.getDevice(), channelId);
                     RequestMessage msg = new RequestMessage();
-                    msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+                    msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
                     Response response = event.getResponse();
 
                     WVPResult wvpResult = new WVPResult();
@@ -248,7 +248,7 @@
     @Override
     public void onPublishHandlerForPlay(MediaServerItem mediaServerItem, JSONObject resonse, String deviceId, String channelId, String uuid) {
         RequestMessage msg = new RequestMessage();
-        msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+        msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
         StreamInfo streamInfo = onPublishHandler(mediaServerItem, resonse, deviceId, channelId, uuid);
         if (streamInfo != null) {
             DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);
@@ -292,7 +292,7 @@
     @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);
+        msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
         StreamInfo streamInfo = onPublishHandler(mediaServerItem, resonse, deviceId, channelId, uuid);
         if (streamInfo != null) {
             redisCatchStorage.startPlayback(streamInfo);
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 911f213..fb31fa0 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
@@ -134,13 +134,13 @@
 			json.put("deviceId", deviceId);
 			json.put("channelId", channelId);
 			RequestMessage msg = new RequestMessage();
-			msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+			msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
 			msg.setData(json.toString());
 			resultHolder.invokeResult(msg);
 		} else {
 			logger.warn("璁惧棰勮/鍥炴斁鍋滄API璋冪敤澶辫触锛�");
 			RequestMessage msg = new RequestMessage();
-			msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+			msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
 			msg.setData("streamId null");
 			resultHolder.invokeResult(msg);
 		}
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 d963c31..5b244e6 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
@@ -82,7 +82,7 @@
 		result.onTimeout(()->{
 			logger.warn(String.format("璁惧涓嬭浇鍝嶅簲瓒呮椂锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
 			RequestMessage msg = new RequestMessage();
-			msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+			msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
 			msg.setData("Timeout");
 			resultHolder.invokeResult(msg);
 		});
@@ -92,12 +92,12 @@
 			// 鍋滄涔嬪墠鐨勪笅杞�
 			cmder.streamByeCmd(deviceId, channelId);
 		}
-		resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid, result);
+		resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid, result);
 		MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
 		if (newMediaServerItem == null) {
 			logger.warn(String.format("璁惧涓嬭浇鍝嶅簲瓒呮椂锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
 			RequestMessage msg = new RequestMessage();
-			msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+			msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
 			msg.setData("Timeout");
 			resultHolder.invokeResult(msg);
 			return result;
@@ -111,7 +111,7 @@
 		}, event -> {
 			Response response = event.getResponse();
 			RequestMessage msg = new RequestMessage();
-			msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+			msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
 			msg.setData(String.format("鍥炴斁澶辫触锛� 閿欒鐮侊細 %s, %s", response.getStatusCode(), response.getReasonPhrase()));
 			resultHolder.invokeResult(msg);
 		});
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 511ce85..30bca1d 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
@@ -91,7 +91,7 @@
 		result.onTimeout(()->{
 			logger.warn(String.format("璁惧鍥炴斁瓒呮椂锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
 			RequestMessage msg = new RequestMessage();
-			msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+			msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
 			msg.setData("Timeout");
 			resultHolder.invokeResult(msg);
 		});
@@ -101,12 +101,12 @@
 			// 鍋滄涔嬪墠鐨勫洖鏀�
 			cmder.streamByeCmd(deviceId, channelId);
 		}
-		resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid, result);
+		resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid, result);
 
 		if (newMediaServerItem == null) {
 			logger.warn(String.format("璁惧鍥炴斁瓒呮椂锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
 			RequestMessage msg = new RequestMessage();
-			msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+			msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
 			msg.setData("Timeout");
 			resultHolder.invokeResult(msg);
 			return result;
@@ -118,7 +118,7 @@
 		}, event -> {
 			Response response = event.getResponse();
 			RequestMessage msg = new RequestMessage();
-			msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+			msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
 			msg.setData(String.format("鍥炴斁澶辫触锛� 閿欒鐮侊細 %s, %s", response.getStatusCode(), response.getReasonPhrase()));
 			resultHolder.invokeResult(msg);
 		});
diff --git a/src/main/java/com/genersoft/iot/vmp/web/ApiDeviceController.java b/src/main/java/com/genersoft/iot/vmp/web/ApiDeviceController.java
index 264f2b2..764a654 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/ApiDeviceController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/ApiDeviceController.java
@@ -53,8 +53,6 @@
         if (logger.isDebugEnabled()) {
             logger.debug("鏌ヨ鎵�鏈夎棰戣澶嘇PI璋冪敤");
         }
-
-        logger.debug("鏌ヨ鎵�鏈夎棰戣澶嘇PI璋冪敤");
         JSONObject result = new JSONObject();
         List<Device> devices;
         if (start == null || limit ==null) {
diff --git a/web_src/src/components/dialog/jessibuca.vue b/web_src/src/components/dialog/jessibuca.vue
index dabd388..7e9e009 100644
--- a/web_src/src/components/dialog/jessibuca.vue
+++ b/web_src/src/components/dialog/jessibuca.vue
@@ -80,6 +80,7 @@
               container: this.$refs.container,
               videoBuffer: 0.5, // 鏈�澶х紦鍐叉椂闀匡紝鍗曚綅绉�
               isResize: true,
+              isFlv: true,
               decoder: "./static/js/jessibuca/index.js",
               // text: "WVP-PRO",
               // background: "bg.jpg",

--
Gitblit v1.8.0