XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改错别字

Browse Source
This commit is contained in:
648540858
2021-10-18 17:31:28 +08:00
parent 292aa4dec4
commit 61a8113c39
7 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
View File

@@ -134,13 +134,13 @@ public class PlayController {
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);
}

8
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java
View File

@@ -82,7 +82,7 @@ public class DownloadController {
result.onTimeout(()->{
logger.warn(String.format("设备下载响应超时，deviceId：%s ，channelId：%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 @@ public class DownloadController {
// 停止之前的下载
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("设备下载响应超时，deviceId：%s ，channelId：%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 @@ public class DownloadController {
}, 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);
});

8
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
View File

@@ -91,7 +91,7 @@ public class PlaybackController {
result.onTimeout(()->{
logger.warn(String.format("设备回放超时，deviceId：%s ，channelId：%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 @@ public class PlaybackController {
// 停止之前的回放
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("设备回放超时，deviceId：%s ，channelId：%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 @@ public class PlaybackController {
}, 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);
});