guzijian / wvp-GB28181-pro · Commits

Commit 61a8113c39007105fb20e5c997d69f1586c86149

Authored by 648540858
1 parent 292aa4de

修改错别字

Inline Side-by-side
Showing 7 changed files with 22 additions and 22 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
  View file @61a8113
@@ -31,7 +31,7 @@ public class DeferredResultHolder { @@ -31,7 +31,7 @@ public class DeferredResultHolder {
31 31
32 public static final String CALLBACK_CMD_RECORDINFO = "CALLBACK_RECORDINFO"; 32 public static final String CALLBACK_CMD_RECORDINFO = "CALLBACK_RECORDINFO";
33 33
34 - public static final String CALLBACK_CMD_PlAY = "CALLBACK_PLAY"; 34 + public static final String CALLBACK_CMD_PLAY = "CALLBACK_PLAY";
35 35
36 public static final String CALLBACK_CMD_STOP = "CALLBACK_STOP"; 36 public static final String CALLBACK_CMD_STOP = "CALLBACK_STOP";
37 37
@@ -47,6 +47,7 @@ public class DeferredResultHolder { @@ -47,6 +47,7 @@ public class DeferredResultHolder {
47 47
48 private Map<String, DeferredResult> map = new ConcurrentHashMap<String, DeferredResult>(); 48 private Map<String, DeferredResult> map = new ConcurrentHashMap<String, DeferredResult>();
49 49
  50 +
50 public void put(String key, DeferredResult result) { 51 public void put(String key, DeferredResult result) {
51 map.put(key, result); 52 map.put(key, result);
52 } 53 }
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
  View file @61a8113
@@ -80,7 +80,7 @@ public class PlayServiceImpl implements IPlayService { @@ -80,7 +80,7 @@ public class PlayServiceImpl implements IPlayService {
80 PlayResult playResult = new PlayResult(); 80 PlayResult playResult = new PlayResult();
81 if (mediaServerItem == null) { 81 if (mediaServerItem == null) {
82 RequestMessage msg = new RequestMessage(); 82 RequestMessage msg = new RequestMessage();
83 - msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + playResult.getUuid()); 83 + msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + playResult.getUuid());
84 WVPResult wvpResult = new WVPResult(); 84 WVPResult wvpResult = new WVPResult();
85 wvpResult.setCode(-1); 85 wvpResult.setCode(-1);
86 wvpResult.setMsg("未找到可用的zlm"); 86 wvpResult.setMsg("未找到可用的zlm");
@@ -96,12 +96,12 @@ public class PlayServiceImpl implements IPlayService { @@ -96,12 +96,12 @@ public class PlayServiceImpl implements IPlayService {
96 DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(userSetup.getPlayTimeout()); 96 DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(userSetup.getPlayTimeout());
97 playResult.setResult(result); 97 playResult.setResult(result);
98 // 录像查询以channelId作为deviceId查询 98 // 录像查询以channelId作为deviceId查询
99 - resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid, result); 99 + resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid, result);
100 // 超时处理 100 // 超时处理
101 result.onTimeout(()->{ 101 result.onTimeout(()->{
102 logger.warn(String.format("设备点播超时，deviceId：%s ，channelId：%s", deviceId, channelId)); 102 logger.warn(String.format("设备点播超时，deviceId：%s ，channelId：%s", deviceId, channelId));
103 RequestMessage msg = new RequestMessage(); 103 RequestMessage msg = new RequestMessage();
104 - msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + playResult.getUuid()); 104 + msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + playResult.getUuid());
105 WVPResult wvpResult = new WVPResult(); 105 WVPResult wvpResult = new WVPResult();
106 wvpResult.setCode(-1); 106 wvpResult.setCode(-1);
107 SIPDialog dialog = streamSession.getDialog(deviceId, channelId); 107 SIPDialog dialog = streamSession.getDialog(deviceId, channelId);
@@ -170,7 +170,7 @@ public class PlayServiceImpl implements IPlayService { @@ -170,7 +170,7 @@ public class PlayServiceImpl implements IPlayService {
170 }, (event) -> { 170 }, (event) -> {
171 // 点播返回sip错误 171 // 点播返回sip错误
172 RequestMessage msg = new RequestMessage(); 172 RequestMessage msg = new RequestMessage();
173 - msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); 173 + msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
174 Response response = event.getResponse(); 174 Response response = event.getResponse();
175 mediaServerService.closeRTPServer(playResult.getDevice(), channelId); 175 mediaServerService.closeRTPServer(playResult.getDevice(), channelId);
176 WVPResult wvpResult = new WVPResult(); 176 WVPResult wvpResult = new WVPResult();
@@ -187,7 +187,7 @@ public class PlayServiceImpl implements IPlayService { @@ -187,7 +187,7 @@ public class PlayServiceImpl implements IPlayService {
187 String streamId = streamInfo.getStreamId(); 187 String streamId = streamInfo.getStreamId();
188 if (streamId == null) { 188 if (streamId == null) {
189 RequestMessage msg = new RequestMessage(); 189 RequestMessage msg = new RequestMessage();
190 - msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); 190 + msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
191 WVPResult wvpResult = new WVPResult(); 191 WVPResult wvpResult = new WVPResult();
192 wvpResult.setCode(-1); 192 wvpResult.setCode(-1);
193 wvpResult.setMsg(String.format("点播失败， redis缓存streamId等于null")); 193 wvpResult.setMsg(String.format("点播失败， redis缓存streamId等于null"));
@@ -201,7 +201,7 @@ public class PlayServiceImpl implements IPlayService { @@ -201,7 +201,7 @@ public class PlayServiceImpl implements IPlayService {
201 JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(mediaInfo, streamId); 201 JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(mediaInfo, streamId);
202 if (rtpInfo != null && rtpInfo.getBoolean("exist")) { 202 if (rtpInfo != null && rtpInfo.getBoolean("exist")) {
203 RequestMessage msg = new RequestMessage(); 203 RequestMessage msg = new RequestMessage();
204 - msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); 204 + msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
205 205
206 WVPResult wvpResult = new WVPResult(); 206 WVPResult wvpResult = new WVPResult();
207 wvpResult.setCode(0); 207 wvpResult.setCode(0);
@@ -230,7 +230,7 @@ public class PlayServiceImpl implements IPlayService { @@ -230,7 +230,7 @@ public class PlayServiceImpl implements IPlayService {
230 }, (event) -> { 230 }, (event) -> {
231 mediaServerService.closeRTPServer(playResult.getDevice(), channelId); 231 mediaServerService.closeRTPServer(playResult.getDevice(), channelId);
232 RequestMessage msg = new RequestMessage(); 232 RequestMessage msg = new RequestMessage();
233 - msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); 233 + msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
234 Response response = event.getResponse(); 234 Response response = event.getResponse();
235 235
236 WVPResult wvpResult = new WVPResult(); 236 WVPResult wvpResult = new WVPResult();
@@ -248,7 +248,7 @@ public class PlayServiceImpl implements IPlayService { @@ -248,7 +248,7 @@ public class PlayServiceImpl implements IPlayService {
248 @Override 248 @Override
249 public void onPublishHandlerForPlay(MediaServerItem mediaServerItem, JSONObject resonse, String deviceId, String channelId, String uuid) { 249 public void onPublishHandlerForPlay(MediaServerItem mediaServerItem, JSONObject resonse, String deviceId, String channelId, String uuid) {
250 RequestMessage msg = new RequestMessage(); 250 RequestMessage msg = new RequestMessage();
251 - msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); 251 + msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
252 StreamInfo streamInfo = onPublishHandler(mediaServerItem, resonse, deviceId, channelId, uuid); 252 StreamInfo streamInfo = onPublishHandler(mediaServerItem, resonse, deviceId, channelId, uuid);
253 if (streamInfo != null) { 253 if (streamInfo != null) {
254 DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId); 254 DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);
@@ -292,7 +292,7 @@ public class PlayServiceImpl implements IPlayService { @@ -292,7 +292,7 @@ public class PlayServiceImpl implements IPlayService {
292 @Override 292 @Override
293 public void onPublishHandlerForPlayBack(MediaServerItem mediaServerItem, JSONObject resonse, String deviceId, String channelId, String uuid) { 293 public void onPublishHandlerForPlayBack(MediaServerItem mediaServerItem, JSONObject resonse, String deviceId, String channelId, String uuid) {
294 RequestMessage msg = new RequestMessage(); 294 RequestMessage msg = new RequestMessage();
295 - msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); 295 + msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
296 StreamInfo streamInfo = onPublishHandler(mediaServerItem, resonse, deviceId, channelId, uuid); 296 StreamInfo streamInfo = onPublishHandler(mediaServerItem, resonse, deviceId, channelId, uuid);
297 if (streamInfo != null) { 297 if (streamInfo != null) {
298 redisCatchStorage.startPlayback(streamInfo); 298 redisCatchStorage.startPlayback(streamInfo);
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
  View file @61a8113
@@ -134,13 +134,13 @@ public class PlayController { @@ -134,13 +134,13 @@ public class PlayController {
134 json.put("deviceId", deviceId); 134 json.put("deviceId", deviceId);
135 json.put("channelId", channelId); 135 json.put("channelId", channelId);
136 RequestMessage msg = new RequestMessage(); 136 RequestMessage msg = new RequestMessage();
137 - msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); 137 + msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
138 msg.setData(json.toString()); 138 msg.setData(json.toString());
139 resultHolder.invokeResult(msg); 139 resultHolder.invokeResult(msg);
140 } else { 140 } else {
141 logger.warn("设备预览/回放停止API调用失败！"); 141 logger.warn("设备预览/回放停止API调用失败！");
142 RequestMessage msg = new RequestMessage(); 142 RequestMessage msg = new RequestMessage();
143 - msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); 143 + msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
144 msg.setData("streamId null"); 144 msg.setData("streamId null");
145 resultHolder.invokeResult(msg); 145 resultHolder.invokeResult(msg);
146 } 146 }
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java
  View file @61a8113
@@ -82,7 +82,7 @@ public class DownloadController { @@ -82,7 +82,7 @@ public class DownloadController {
82 result.onTimeout(()->{ 82 result.onTimeout(()->{
83 logger.warn(String.format("设备下载响应超时，deviceId：%s ，channelId：%s", deviceId, channelId)); 83 logger.warn(String.format("设备下载响应超时，deviceId：%s ，channelId：%s", deviceId, channelId));
84 RequestMessage msg = new RequestMessage(); 84 RequestMessage msg = new RequestMessage();
85 - msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); 85 + msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
86 msg.setData("Timeout"); 86 msg.setData("Timeout");
87 resultHolder.invokeResult(msg); 87 resultHolder.invokeResult(msg);
88 }); 88 });
@@ -92,12 +92,12 @@ public class DownloadController { @@ -92,12 +92,12 @@ public class DownloadController {
92 // 停止之前的下载 92 // 停止之前的下载
93 cmder.streamByeCmd(deviceId, channelId); 93 cmder.streamByeCmd(deviceId, channelId);
94 } 94 }
95 - resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid, result); 95 + resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid, result);
96 MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device); 96 MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
97 if (newMediaServerItem == null) { 97 if (newMediaServerItem == null) {
98 logger.warn(String.format("设备下载响应超时，deviceId：%s ，channelId：%s", deviceId, channelId)); 98 logger.warn(String.format("设备下载响应超时，deviceId：%s ，channelId：%s", deviceId, channelId));
99 RequestMessage msg = new RequestMessage(); 99 RequestMessage msg = new RequestMessage();
100 - msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); 100 + msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
101 msg.setData("Timeout"); 101 msg.setData("Timeout");
102 resultHolder.invokeResult(msg); 102 resultHolder.invokeResult(msg);
103 return result; 103 return result;
@@ -111,7 +111,7 @@ public class DownloadController { @@ -111,7 +111,7 @@ public class DownloadController {
111 }, event -> { 111 }, event -> {
112 Response response = event.getResponse(); 112 Response response = event.getResponse();
113 RequestMessage msg = new RequestMessage(); 113 RequestMessage msg = new RequestMessage();
114 - msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); 114 + msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
115 msg.setData(String.format("回放失败， 错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase())); 115 msg.setData(String.format("回放失败， 错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase()));
116 resultHolder.invokeResult(msg); 116 resultHolder.invokeResult(msg);
117 }); 117 });
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
  View file @61a8113
@@ -91,7 +91,7 @@ public class PlaybackController { @@ -91,7 +91,7 @@ public class PlaybackController {
91 result.onTimeout(()->{ 91 result.onTimeout(()->{
92 logger.warn(String.format("设备回放超时，deviceId：%s ，channelId：%s", deviceId, channelId)); 92 logger.warn(String.format("设备回放超时，deviceId：%s ，channelId：%s", deviceId, channelId));
93 RequestMessage msg = new RequestMessage(); 93 RequestMessage msg = new RequestMessage();
94 - msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); 94 + msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
95 msg.setData("Timeout"); 95 msg.setData("Timeout");
96 resultHolder.invokeResult(msg); 96 resultHolder.invokeResult(msg);
97 }); 97 });
@@ -101,12 +101,12 @@ public class PlaybackController { @@ -101,12 +101,12 @@ public class PlaybackController {
101 // 停止之前的回放 101 // 停止之前的回放
102 cmder.streamByeCmd(deviceId, channelId); 102 cmder.streamByeCmd(deviceId, channelId);
103 } 103 }
104 - resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid, result); 104 + resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid, result);
105 105
106 if (newMediaServerItem == null) { 106 if (newMediaServerItem == null) {
107 logger.warn(String.format("设备回放超时，deviceId：%s ，channelId：%s", deviceId, channelId)); 107 logger.warn(String.format("设备回放超时，deviceId：%s ，channelId：%s", deviceId, channelId));
108 RequestMessage msg = new RequestMessage(); 108 RequestMessage msg = new RequestMessage();
109 - msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); 109 + msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
110 msg.setData("Timeout"); 110 msg.setData("Timeout");
111 resultHolder.invokeResult(msg); 111 resultHolder.invokeResult(msg);
112 return result; 112 return result;
@@ -118,7 +118,7 @@ public class PlaybackController { @@ -118,7 +118,7 @@ public class PlaybackController {
118 }, event -> { 118 }, event -> {
119 Response response = event.getResponse(); 119 Response response = event.getResponse();
120 RequestMessage msg = new RequestMessage(); 120 RequestMessage msg = new RequestMessage();
121 - msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); 121 + msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
122 msg.setData(String.format("回放失败， 错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase())); 122 msg.setData(String.format("回放失败， 错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase()));
123 resultHolder.invokeResult(msg); 123 resultHolder.invokeResult(msg);
124 }); 124 });
src/main/java/com/genersoft/iot/vmp/web/ApiDeviceController.java
  View file @61a8113
@@ -53,8 +53,6 @@ public class ApiDeviceController { @@ -53,8 +53,6 @@ public class ApiDeviceController {
53 if (logger.isDebugEnabled()) { 53 if (logger.isDebugEnabled()) {
54 logger.debug("查询所有视频设备API调用"); 54 logger.debug("查询所有视频设备API调用");
55 } 55 }
56 -  
57 - logger.debug("查询所有视频设备API调用");  
58 JSONObject result = new JSONObject(); 56 JSONObject result = new JSONObject();
59 List<Device> devices; 57 List<Device> devices;
60 if (start == null || limit ==null) { 58 if (start == null || limit ==null) {
web_src/src/components/dialog/jessibuca.vue
  View file @61a8113
@@ -80,6 +80,7 @@ export default { @@ -80,6 +80,7 @@ export default {
80 container: this.$refs.container, 80 container: this.$refs.container,
81 videoBuffer: 0.5, // 最大缓冲时长，单位秒 81 videoBuffer: 0.5, // 最大缓冲时长，单位秒
82 isResize: true, 82 isResize: true,
  83 + isFlv: true,
83 decoder: "./static/js/jessibuca/index.js", 84 decoder: "./static/js/jessibuca/index.js",
84 // text: "WVP-PRO", 85 // text: "WVP-PRO",
85 // background: "bg.jpg", 86 // background: "bg.jpg",