guzijian / wvp-GB28181-pro · Commits

Commit 691313b77861eeaeee2c67002b9cee23fbf1f942

Authored by mrjackwang
Committed by GitHub
2 parents 42901d03 d21a0041

Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

Inline Side-by-side
Showing 15 changed files with 180 additions and 144 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  View file @691313b
... ... @@ -670,6 +670,7 @@ public class SIPCommander implements ISIPCommander {
670 670 try {
671 671 SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(deviceId, channelId, null, stream);
672 672 ClientTransaction transaction = streamSession.getTransactionByStream(deviceId, channelId, stream);
  673 +
673 674 if (transaction == null) {
674 675 logger.warn("[ {} -> {}]停止视频流的时候发现事务已丢失", deviceId, channelId);
675 676 SipSubscribe.EventResult<Object> eventResult = new SipSubscribe.EventResult<>();
... ... @@ -685,7 +686,12 @@ public class SIPCommander implements ISIPCommander {
685 686 if (stream == null) return;
686 687 dialog = streamSession.getDialogByStream(deviceId, channelId, stream);
687 688 }
688   -
  689 + if (ssrcTransaction != null) {
  690 + MediaServerItem mediaServerItem = mediaServerService.getOne(ssrcTransaction.getMediaServerId());
  691 + mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcTransaction.getSsrc());
  692 + mediaServerService.closeRTPServer(deviceId, channelId, ssrcTransaction.getStream());
  693 + streamSession.remove(deviceId, channelId, ssrcTransaction.getStream());
  694 + }
689 695  
690 696 if (dialog == null) {
691 697 logger.warn("[ {} -> {}]停止视频流的时候发现对话已丢失", deviceId, channelId);
... ... @@ -730,12 +736,6 @@ public class SIPCommander implements ISIPCommander {
730 736  
731 737 dialog.sendRequest(clientTransaction);
732 738  
733   - if (ssrcTransaction != null) {
734   - MediaServerItem mediaServerItem = mediaServerService.getOne(ssrcTransaction.getMediaServerId());
735   - mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcTransaction.getSsrc());
736   - mediaServerService.closeRTPServer(deviceId, channelId, ssrcTransaction.getStream());
737   - streamSession.remove(deviceId, channelId, ssrcTransaction.getStream());
738   - }
739 739 } catch (SipException | ParseException e) {
740 740 e.printStackTrace();
741 741 }
... ...
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
  View file @691313b
... ... @@ -372,12 +372,12 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
372 372 }
373 373 }
374 374 if (playTransaction == null) {
375   - SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, null, true);
  375 + String streamId = null;
376 376 if (mediaServerItem.isRtpEnable()) {
377   - sendRtpItem.setStreamId(String.format("%s_%s", device.getDeviceId(), channelId));
378   - }else {
379   - sendRtpItem.setStreamId(ssrcInfo.getStream());
  377 + streamId = String.format("%s_%s", device.getDeviceId(), channelId);
380 378 }
  379 + SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId, true);
  380 + sendRtpItem.setStreamId(ssrcInfo.getStream());
381 381 // 写入redis， 超时时回复
382 382 redisCatchStorage.updateSendRTPSever(sendRtpItem);
383 383 playService.play(mediaServerItem, ssrcInfo, device, channelId, hookEvent, errorEvent, (code, msg)->{
... ...
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java
  View file @691313b
... ... @@ -100,7 +100,6 @@ public class RegisterResponseProcessor extends SIPResponseProcessorAbstract {
100 100 subscribeHolder.removeCatalogSubscribe(platformGBId);
101 101 subscribeHolder.removeMobilePositionSubscribe(platformGBId);
102 102 }
103   -
104 103 }
105 104 }
106 105  
... ...
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
  View file @691313b
... ... @@ -191,7 +191,7 @@ public class ZLMHttpHookListener {
191 191 JSONObject ret = new JSONObject();
192 192 ret.put("code", 0);
193 193 ret.put("msg", "success");
194   - ret.put("enableHls", true);
  194 + ret.put("enable_hls", true);
195 195 String mediaServerId = json.getString("mediaServerId");
196 196 ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_publish, json);
197 197 if (subscribe != null) {
... ... @@ -206,9 +206,9 @@ public class ZLMHttpHookListener {
206 206 String app = json.getString("app");
207 207 String stream = json.getString("stream");
208 208 if ("rtp".equals(app)) {
209   - ret.put("enableMP4", userSetup.getRecordSip());
  209 + ret.put("enable_mp4", userSetup.getRecordSip());
210 210 }else {
211   - ret.put("enableMP4", userSetup.isRecordPushLive());
  211 + ret.put("enable_mp4", userSetup.isRecordPushLive());
212 212 }
213 213 List<SsrcTransaction> ssrcTransactionForAll = sessionManager.getSsrcTransactionForAll(null, null, null, stream);
214 214 if (ssrcTransactionForAll != null && ssrcTransactionForAll.size() == 1) {
... ...
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
  View file @691313b
... ... @@ -10,8 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
10 10 import org.springframework.stereotype.Component;
11 11 import org.springframework.util.StringUtils;
12 12  
13   -import java.util.HashMap;
14   -import java.util.Map;
  13 +import java.util.*;
15 14  
16 15 @Component
17 16 public class ZLMRTPServerFactory {
... ... @@ -23,54 +22,80 @@ public class ZLMRTPServerFactory {
23 22  
24 23 private int[] portRangeArray = new int[2];
25 24  
26   - public int createRTPServer(MediaServerItem mediaServerItem, String streamId) {
27   - Map<String, Integer> currentStreams = new HashMap<>();
  25 + public int getFreePort(MediaServerItem mediaServerItem, int startPort, int endPort, List<Integer> usedFreelist) {
  26 + if (endPort <= startPort) return -1;
  27 + if (usedFreelist == null) {
  28 + usedFreelist = new ArrayList<>();
  29 + }
28 30 JSONObject listRtpServerJsonResult = zlmresTfulUtils.listRtpServer(mediaServerItem);
29 31 if (listRtpServerJsonResult != null) {
30 32 JSONArray data = listRtpServerJsonResult.getJSONArray("data");
31 33 if (data != null) {
32 34 for (int i = 0; i < data.size(); i++) {
33 35 JSONObject dataItem = data.getJSONObject(i);
34   - currentStreams.put(dataItem.getString("stream_id"), dataItem.getInteger("port"));
  36 + usedFreelist.add(dataItem.getInteger("port"));
35 37 }
36 38 }
37 39 }
38   - // 已经在推流
39   - if (currentStreams.get(streamId) != null) {
40   - Map<String, Object> closeRtpServerParam = new HashMap<>();
41   - closeRtpServerParam.put("stream_id", streamId);
42   - zlmresTfulUtils.closeRtpServer(mediaServerItem, closeRtpServerParam);
43   - currentStreams.remove(streamId);
44   - }
45 40  
46 41 Map<String, Object> param = new HashMap<>();
47 42 int result = -1;
48   - // 不设置推流端口端则使用随机端口
49   - if (!StringUtils.isEmpty(mediaServerItem.getSendRtpPortRange())){
50   - int newPort = getPortFromportRange(mediaServerItem);
51   - param.put("port", newPort);
  43 + // 设置推流端口
  44 + if (startPort%2 == 1) {
  45 + startPort ++;
  46 + }
  47 + boolean checkPort = false;
  48 + for (int i = startPort; i < endPort + 1; i+=2) {
  49 + if (!usedFreelist.contains(i)){
  50 + checkPort = true;
  51 + startPort = i;
  52 + break;
  53 + }
  54 + }
  55 + if (!checkPort) {
  56 + logger.warn("未找到节点{}上范围[{}-{}]的空闲端口", mediaServerItem.getId(), startPort, endPort);
  57 + return -1;
  58 + }
  59 + param.put("port", startPort);
  60 + String stream = UUID.randomUUID().toString();
  61 + param.put("enable_tcp", 1);
  62 + param.put("stream_id", stream);
  63 + param.put("port", 0);
  64 + JSONObject openRtpServerResultJson = zlmresTfulUtils.openRtpServer(mediaServerItem, param);
  65 +
  66 + if (openRtpServerResultJson != null) {
  67 + if (openRtpServerResultJson.getInteger("code") == 0) {
  68 + result= openRtpServerResultJson.getInteger("port");
  69 + Map<String, Object> closeRtpServerParam = new HashMap<>();
  70 + closeRtpServerParam.put("stream_id", stream);
  71 + zlmresTfulUtils.closeRtpServer(mediaServerItem, closeRtpServerParam);
  72 + }else {
  73 + usedFreelist.add(startPort);
  74 + startPort +=2;
  75 + result = getFreePort(mediaServerItem, startPort, endPort,usedFreelist);
  76 + }
  77 + }else {
  78 + // 检查ZLM状态
  79 + logger.error("创建RTP Server 失败 {}: 请检查ZLM服务", param.get("port"));
52 80 }
  81 + return result;
  82 + }
  83 +
  84 + public int createRTPServer(MediaServerItem mediaServerItem, String streamId) {
  85 +
  86 + Map<String, Object> param = new HashMap<>();
  87 + int result = -1;
  88 + // 推流端口设置0则使用随机端口
53 89 param.put("enable_tcp", 1);
54 90 param.put("stream_id", streamId);
  91 + param.put("port", 0);
55 92 JSONObject openRtpServerResultJson = zlmresTfulUtils.openRtpServer(mediaServerItem, param);
56 93  
57 94 if (openRtpServerResultJson != null) {
58   - switch (openRtpServerResultJson.getInteger("code")){
59   - case 0:
60   - result= openRtpServerResultJson.getInteger("port");
61   - break;
62   - case -300: // id已经存在, 可能已经在其他端口推流
63   - Map<String, Object> closeRtpServerParam = new HashMap<>();
64   - closeRtpServerParam.put("stream_id", streamId);
65   - zlmresTfulUtils.closeRtpServer(mediaServerItem, closeRtpServerParam);
66   - result = createRTPServer(mediaServerItem, streamId);;
67   - break;
68   - case -400: // 端口占用
69   - result= createRTPServer(mediaServerItem, streamId);
70   - break;
71   - default:
72   - logger.error("创建RTP Server 失败 {}: " + openRtpServerResultJson.getString("msg"), param.get("port"));
73   - break;
  95 + if (openRtpServerResultJson.getInteger("code") == 0) {
  96 + result= openRtpServerResultJson.getInteger("port");
  97 + }else {
  98 + logger.error("创建RTP Server 失败 {}: ", openRtpServerResultJson.getString("msg"));
74 99 }
75 100 }else {
76 101 // 检查ZLM状态
... ... @@ -99,32 +124,32 @@ public class ZLMRTPServerFactory {
99 124 return result;
100 125 }
101 126  
102   - private int getPortFromportRange(MediaServerItem mediaServerItem) {
103   - int currentPort = mediaServerItem.getCurrentPort();
104   - if (currentPort == 0) {
105   - String[] portRangeStrArray = mediaServerItem.getSendRtpPortRange().split(",");
106   - if (portRangeStrArray.length != 2) {
107   - portRangeArray[0] = 30000;
108   - portRangeArray[1] = 30500;
109   - }else {
110   - portRangeArray[0] = Integer.parseInt(portRangeStrArray[0]);
111   - portRangeArray[1] = Integer.parseInt(portRangeStrArray[1]);
112   - }
113   - }
114   -
115   - if (currentPort == 0 || currentPort++ > portRangeArray[1]) {
116   - currentPort = portRangeArray[0];
117   - mediaServerItem.setCurrentPort(currentPort);
118   - return portRangeArray[0];
119   - } else {
120   - if (currentPort % 2 == 1) {
121   - currentPort++;
122   - }
123   - currentPort++;
124   - mediaServerItem.setCurrentPort(currentPort);
125   - return currentPort;
126   - }
127   - }
  127 +// private int getPortFromportRange(MediaServerItem mediaServerItem) {
  128 +// int currentPort = mediaServerItem.getCurrentPort();
  129 +// if (currentPort == 0) {
  130 +// String[] portRangeStrArray = mediaServerItem.getSendRtpPortRange().split(",");
  131 +// if (portRangeStrArray.length != 2) {
  132 +// portRangeArray[0] = 30000;
  133 +// portRangeArray[1] = 30500;
  134 +// }else {
  135 +// portRangeArray[0] = Integer.parseInt(portRangeStrArray[0]);
  136 +// portRangeArray[1] = Integer.parseInt(portRangeStrArray[1]);
  137 +// }
  138 +// }
  139 +//
  140 +// if (currentPort == 0 || currentPort++ > portRangeArray[1]) {
  141 +// currentPort = portRangeArray[0];
  142 +// mediaServerItem.setCurrentPort(currentPort);
  143 +// return portRangeArray[0];
  144 +// } else {
  145 +// if (currentPort % 2 == 1) {
  146 +// currentPort++;
  147 +// }
  148 +// currentPort++;
  149 +// mediaServerItem.setCurrentPort(currentPort);
  150 +// return currentPort;
  151 +// }
  152 +// }
128 153  
129 154 /**
130 155 * 创建一个国标推流
... ... @@ -139,13 +164,18 @@ public class ZLMRTPServerFactory {
139 164 public SendRtpItem createSendRtpItem(MediaServerItem serverItem, String ip, int port, String ssrc, String platformId, String deviceId, String channelId, boolean tcp){
140 165  
141 166 // 使用RTPServer 功能找一个可用的端口
142   - String playSsrc = serverItem.getSsrcConfig().getPlaySsrc();
143   - int localPort = createRTPServer(serverItem, playSsrc);
144   - if (localPort != -1) {
145   - // TODO 高并发时可能因为未放入缓存而ssrc冲突
146   - serverItem.getSsrcConfig().releaseSsrc(playSsrc);
147   - closeRTPServer(serverItem, playSsrc);
  167 + String sendRtpPortRange = serverItem.getSendRtpPortRange();
  168 + if (StringUtils.isEmpty(sendRtpPortRange)) {
  169 + return null;
  170 + }
  171 + String[] portRangeStrArray = serverItem.getSendRtpPortRange().split(",");
  172 + int localPort = -1;
  173 + if (portRangeStrArray.length != 2) {
  174 + localPort = getFreePort(serverItem, 30000, 30500, null);
148 175 }else {
  176 + localPort = getFreePort(serverItem, Integer.parseInt(portRangeStrArray[0]), Integer.parseInt(portRangeStrArray[1]), null);
  177 + }
  178 + if (localPort == -1) {
149 179 logger.error("没有可用的端口");
150 180 return null;
151 181 }
... ... @@ -174,13 +204,19 @@ public class ZLMRTPServerFactory {
174 204 * @return SendRtpItem
175 205 */
176 206 public SendRtpItem createSendRtpItem(MediaServerItem serverItem, String ip, int port, String ssrc, String platformId, String app, String stream, String channelId, boolean tcp){
177   - String playSsrc = serverItem.getSsrcConfig().getPlaySsrc();
178   - int localPort = createRTPServer(serverItem, playSsrc);
179   - if (localPort != -1) {
180   - // TODO 高并发时可能因为未放入缓存而ssrc冲突
181   - serverItem.getSsrcConfig().releaseSsrc(ssrc);
182   - closeRTPServer(serverItem, playSsrc);
  207 + // 使用RTPServer 功能找一个可用的端口
  208 + String sendRtpPortRange = serverItem.getSendRtpPortRange();
  209 + if (StringUtils.isEmpty(sendRtpPortRange)) {
  210 + return null;
  211 + }
  212 + String[] portRangeStrArray = serverItem.getSendRtpPortRange().split(",");
  213 + int localPort = -1;
  214 + if (portRangeStrArray.length != 2) {
  215 + localPort = getFreePort(serverItem, 30000, 30500, null);
183 216 }else {
  217 + localPort = getFreePort(serverItem, Integer.parseInt(portRangeStrArray[0]), Integer.parseInt(portRangeStrArray[1]), null);
  218 + }
  219 + if (localPort == -1) {
184 220 logger.error("没有可用的端口");
185 221 return null;
186 222 }
... ... @@ -199,7 +235,7 @@ public class ZLMRTPServerFactory {
199 235 }
200 236  
201 237 /**
202   - * 调用zlm RESTful API —— startSendRtp
  238 + * 调用zlm RESTFUL API —— startSendRtp
203 239 */
204 240 public JSONObject startSendRtpStream(MediaServerItem mediaServerItem, Map<String, Object>param) {
205 241 Boolean result = false;
... ... @@ -208,9 +244,9 @@ public class ZLMRTPServerFactory {
208 244 logger.error("RTP推流失败: 请检查ZLM服务");
209 245 } else if (jsonObject.getInteger("code") == 0) {
210 246 result= true;
211   - logger.info("RTP推流[ {}/{} ]请求成功，本地推流端口：{}" ,param.get("app"), param.get("stream"), jsonObject.getString("local_port"));
  247 + logger.info("RTP推流成功[ {}/{} ]，本地推流端口：{}" ,param.get("app"), param.get("stream"), jsonObject.getString("local_port"));
212 248 } else {
213   - logger.error("RTP推流失败: " + jsonObject.getString("msg"));
  249 + logger.error("RTP推流失败: {}, 参数：{}",jsonObject.getString("msg"),JSONObject.toJSON(param));
214 250 }
215 251 return jsonObject;
216 252 }
... ... @@ -265,7 +301,7 @@ public class ZLMRTPServerFactory {
265 301 result= true;
266 302 logger.info("停止RTP推流成功");
267 303 } else {
268   - logger.error("停止RTP推流失败: " + jsonObject.getString("msg"));
  304 + logger.error("RTP推流失败: {}, 参数：{}",jsonObject.getString("msg"),JSONObject.toJSON(param));
269 305 }
270 306 return result;
271 307 }
... ...
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
  View file @691313b
... ... @@ -194,6 +194,9 @@ public class ZLMServerConfig {
194 194 @JSONField(name = "rtp_proxy.port")
195 195 private int rtpProxyPort;
196 196  
  197 + @JSONField(name = "rtp_proxy.port_range")
  198 + private String portRange;
  199 +
197 200 @JSONField(name = "rtp_proxy.timeoutSec")
198 201 private String rtpProxyTimeoutSec;
199 202  
... ... @@ -802,4 +805,12 @@ public class ZLMServerConfig {
802 805 public void setHookAliveInterval(int hookAliveInterval) {
803 806 this.hookAliveInterval = hookAliveInterval;
804 807 }
  808 +
  809 + public String getPortRange() {
  810 + return portRange;
  811 + }
  812 +
  813 + public void setPortRange(String portRange) {
  814 + this.portRange = portRange;
  815 + }
805 816 }
... ...
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
  View file @691313b
... ... @@ -91,7 +91,7 @@ public class MediaServerItem{
91 91 streamNoneReaderDelayMS = zlmServerConfig.getGeneralStreamNoneReaderDelayMS();
92 92 hookAliveInterval = zlmServerConfig.getHookAliveInterval();
93 93 rtpEnable = false; // 默认使用单端口;直到用户自己设置开启多端口
94   - rtpPortRange = "30000,30500"; // 默认使用30000,30500作为级联时发送流的端口号
  94 + rtpPortRange = zlmServerConfig.getPortRange().replace("_",","); // 默认使用30000,30500作为级联时发送流的端口号
95 95 sendRtpPortRange = "30000,30500"; // 默认使用30000,30500作为级联时发送流的端口号
96 96 recordAssistPort = 0; // 默认关闭
97 97  
... ...
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
  View file @691313b
... ... @@ -521,6 +521,9 @@ public class MediaServerServiceImpl implements IMediaServerService {
521 521 // 最多等待未初始化的Track时间，单位毫秒，超时之后会忽略未初始化的Track, 设置此选项优化那些音频错误的不规范流，
522 522 // 等zlm支持给每个rtpServer设置关闭音频的时候可以不设置此选项
523 523 param.put("general.wait_track_ready_ms", "3000" );
  524 + if (mediaServerItem.isRtpEnable() && !StringUtils.isEmpty(mediaServerItem.getRtpPortRange())) {
  525 + param.put("rtp_proxy.port_range", mediaServerItem.getRtpPortRange().replace(",", "-"));
  526 + }
524 527  
525 528 JSONObject responseJSON = zlmresTfulUtils.setServerConfig(mediaServerItem, param);
526 529  
... ...
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
  View file @691313b
... ... @@ -411,38 +411,38 @@ public class StreamPushServiceImpl implements IStreamPushService {
411 411 // 遍历存储结果，查找app+Stream->platformId+catalogId的对应关系，然后执行批量写入
412 412 for (StreamPushItem streamPushItem : streamPushItemsForPlatform) {
413 413 List<String[]> platFormInfoList = streamPushItemsForAll.get(streamPushItem.getApp() + streamPushItem.getStream());
414   - if (platFormInfoList != null) {
415   - if (platFormInfoList.size() > 0) {
416   - for (String[] platFormInfoArray : platFormInfoList) {
417   - StreamPushItem streamPushItemForPlatform = new StreamPushItem();
418   - streamPushItemForPlatform.setGbStreamId(streamPushItem.getGbStreamId());
419   - if (platFormInfoArray.length > 0) {
420   - // 数组 platFormInfoArray 0 为平台ID。 1为目录ID
421   - // 不存在这个平台，则忽略导入此关联关系
422   - if (platformInfoMap.get(platFormInfoArray[0]) == null
423   - || platformInfoMap.get(platFormInfoArray[0]).get(platFormInfoArray[1]) == null) {
424   - logger.info("导入数据时不存在平台或目录{}/{},已导入未分配", platFormInfoArray[0], platFormInfoArray[1] );
425   - continue;
426   - }
427   - streamPushItemForPlatform.setPlatformId(platFormInfoArray[0]);
428   -
429   - List<GbStream> gbStreamList = platformForEvent.get(streamPushItem.getPlatformId());
430   - if (gbStreamList == null) {
431   - gbStreamList = new ArrayList<>();
432   - platformForEvent.put(platFormInfoArray[0], gbStreamList);
433   - }
434   - // 为发送通知整理数据
435   - streamPushItemForPlatform.setName(streamPushItem.getName());
436   - streamPushItemForPlatform.setApp(streamPushItem.getApp());
437   - streamPushItemForPlatform.setStream(streamPushItem.getStream());
438   - streamPushItemForPlatform.setGbId(streamPushItem.getGbId());
439   - gbStreamList.add(streamPushItemForPlatform);
  414 + if (platFormInfoList != null && platFormInfoList.size() > 0) {
  415 + for (String[] platFormInfoArray : platFormInfoList) {
  416 + StreamPushItem streamPushItemForPlatform = new StreamPushItem();
  417 + streamPushItemForPlatform.setGbStreamId(streamPushItem.getGbStreamId());
  418 + if (platFormInfoArray.length > 0) {
  419 + // 数组 platFormInfoArray 0 为平台ID。 1为目录ID
  420 + // 不存在这个平台，则忽略导入此关联关系
  421 + if (platformInfoMap.get(platFormInfoArray[0]) == null
  422 + || platformInfoMap.get(platFormInfoArray[0]).get(platFormInfoArray[1]) == null) {
  423 + logger.info("导入数据时不存在平台或目录{}/{},已导入未分配", platFormInfoArray[0], platFormInfoArray[1] );
  424 + continue;
440 425 }
441   - if (platFormInfoArray.length > 1) {
442   - streamPushItemForPlatform.setCatalogId(platFormInfoArray[1]);
  426 + streamPushItemForPlatform.setPlatformId(platFormInfoArray[0]);
  427 + if (platFormInfoArray[0].equals("34020000002110000001")) {
  428 + System.out.println(111);
443 429 }
444   - streamPushItemListFroPlatform.add(streamPushItemForPlatform);
  430 + List<GbStream> gbStreamList = platformForEvent.get(platFormInfoArray[0]);
  431 + if (gbStreamList == null) {
  432 + gbStreamList = new ArrayList<>();
  433 + platformForEvent.put(platFormInfoArray[0], gbStreamList);
  434 + }
  435 + // 为发送通知整理数据
  436 + streamPushItemForPlatform.setName(streamPushItem.getName());
  437 + streamPushItemForPlatform.setApp(streamPushItem.getApp());
  438 + streamPushItemForPlatform.setStream(streamPushItem.getStream());
  439 + streamPushItemForPlatform.setGbId(streamPushItem.getGbId());
  440 + gbStreamList.add(streamPushItemForPlatform);
  441 + }
  442 + if (platFormInfoArray.length > 1) {
  443 + streamPushItemForPlatform.setCatalogId(platFormInfoArray[1]);
445 444 }
  445 + streamPushItemListFroPlatform.add(streamPushItemForPlatform);
446 446 }
447 447  
448 448 }
... ...
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
  View file @691313b
... ... @@ -885,12 +885,11 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
885 885 List<ParentPlatform> parentPlatforms = parentPlatformMapper.selectAllAhareAllLiveStream();
886 886 if (parentPlatforms.size() > 0) {
887 887 for (ParentPlatform parentPlatform : parentPlatforms) {
888   - streamPushItem.setCatalogId(parentPlatform.getCatalogId());
889   - streamPushItem.setPlatformId(parentPlatform.getServerGBId());
890   - String stream = streamPushItem.getStream();
891   - StreamProxyItem streamProxyItems = platformGbStreamMapper.selectOne(streamPushItem.getApp(), stream,
  888 + StreamProxyItem streamProxyItems = platformGbStreamMapper.selectOne(streamPushItem.getApp(), streamPushItem.getStream(),
892 889 parentPlatform.getServerGBId());
893 890 if (streamProxyItems == null) {
  891 + streamPushItem.setCatalogId(parentPlatform.getCatalogId());
  892 + streamPushItem.setPlatformId(parentPlatform.getServerGBId());
894 893 platformGbStreamMapper.add(streamPushItem);
895 894 eventPublisher.catalogEventPublishForStream(parentPlatform.getServerGBId(), streamPushItem, CatalogEvent.ADD);
896 895 }
... ...
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
  View file @691313b
... ... @@ -109,7 +109,6 @@ public class PlayController {
109 109 // 录像查询以channelId作为deviceId查询
110 110 String key = DeferredResultHolder.CALLBACK_CMD_STOP + deviceId + channelId;
111 111 resultHolder.put(key, uuid, result);
112   - Device device = storager.queryVideoDevice(deviceId);
113 112 StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
114 113 if (streamInfo == null) {
115 114 RequestMessage msg = new RequestMessage();
... ... @@ -120,15 +119,14 @@ public class PlayController {
120 119 storager.stopPlay(deviceId, channelId);
121 120 return result;
122 121 }
123   - cmder.streamByeCmd(deviceId, channelId, streamInfo.getStream(), null, (event) -> {
  122 + cmder.streamByeCmd(deviceId, channelId, streamInfo.getStream(), null, eventResult -> {
124 123 redisCatchStorage.stopPlay(streamInfo);
125 124 storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
126   - RequestMessage msg = new RequestMessage();
127   - msg.setId(uuid);
128   - msg.setKey(key);
129   - //Response response = event.getResponse();
130   - msg.setData(String.format("success"));
131   - resultHolder.invokeAllResult(msg);
  125 + RequestMessage msgForSuccess = new RequestMessage();
  126 + msgForSuccess.setId(uuid);
  127 + msgForSuccess.setKey(key);
  128 + msgForSuccess.setData(String.format("success"));
  129 + resultHolder.invokeAllResult(msgForSuccess);
132 130 });
133 131  
134 132 if (deviceId != null || channelId != null) {
... ...
src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
  View file @691313b
... ... @@ -168,16 +168,6 @@ public class StreamPushController {
168 168 result.setResult(ResponseEntity.status(HttpStatus.BAD_REQUEST).body(wvpResult));
169 169 return result;
170 170 }
171   -// if (!file.getContentType().endsWith(".xls")
172   -// && !file.getContentType().endsWith(".csv")
173   -// && !file.getContentType().endsWith(".xlsx") ) {
174   -// logger.warn("通道导入文件类型错误: {}",file.getContentType() );
175   -// WVPResult<Object> wvpResult = new WVPResult<>();
176   -// wvpResult.setCode(-1);
177   -// wvpResult.setMsg("文件类型错误，请使用");
178   -// result.setResult(ResponseEntity.status(HttpStatus.BAD_REQUEST).body(wvpResult));
179   -// return result;
180   -// }
181 171 // 同时只处理一个文件
182 172 if (resultHolder.exist(key, null)) {
183 173 logger.warn("已有导入任务正在执行");
... ...
src/main/resources/all-application.yml
  View file @691313b
... ... @@ -147,7 +147,7 @@ media:
147 147 rtp:
148 148 # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输
149 149 enable: true
150   - # [可选] 在此范围内选择端口用于媒体流传输,
  150 + # [可选] 在此范围内选择端口用于媒体流传输, 必须提前在zlm上配置该属性，不然自动配置此属性可能不成功
151 151 port-range: 30000,30500 # 端口范围
152 152 # [可选] 国标级联在此范围内选择端口发送媒体流,
153 153 send-port-range: 30000,30500 # 端口范围
... ...
src/main/resources/application-dev.yml
  View file @691313b
... ... @@ -76,7 +76,7 @@ media:
76 76 rtp:
77 77 # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输
78 78 enable: true
79   - # [可选] 在此范围内选择端口用于媒体流传输,
  79 + # [可选] 在此范围内选择端口用于媒体流传输, 必须提前在zlm上配置该属性，不然自动配置此属性可能不成功
80 80 port-range: 30000,30500 # 端口范围
81 81 # [可选] 国标级联在此范围内选择端口发送媒体流,
82 82 send-port-range: 30000,30500 # 端口范围
... ...
web_src/src/components/dialog/chooseChannelForStream.vue
  View file @691313b
... ... @@ -174,7 +174,7 @@ export default {
174 174 page: that.currentPage,
175 175 count: that.count,
176 176 query: that.searchSrt,
177   - pushing: that.online,
  177 + pushing: that.pushing,
178 178 platformId: that.platformId,
179 179 catalogId: that.catalogId,
180 180 mediaServerId: that.mediaServerId
... ...