guzijian / wvp-GB28181-pro · Commits

Commit 72b9239c5a1028ffb3f388169ba34cd21f40d71d

Authored by 648540858
1 parent eec4e347

优化消息通道

Inline Side-by-side
Showing 2 changed files with 4 additions and 1 deletions
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
  View file @72b9239
@@ -221,7 +221,7 @@ public class ZLMRTPServerFactory { @@ -221,7 +221,7 @@ public class ZLMRTPServerFactory {
221 if (localPort == 0) { 221 if (localPort == 0) {
222 return null; 222 return null;
223 } 223 }
224 - } 224 + }alarm
225 SendRtpItem sendRtpItem = new SendRtpItem(); 225 SendRtpItem sendRtpItem = new SendRtpItem();
226 sendRtpItem.setIp(ip); 226 sendRtpItem.setIp(ip);
227 sendRtpItem.setPort(port); 227 sendRtpItem.setPort(port);
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
  View file @72b9239
@@ -85,6 +85,7 @@ public class RedisAlarmMsgListener implements MessageListener { @@ -85,6 +85,7 @@ public class RedisAlarmMsgListener implements MessageListener {
85 if (parentPlatforms.size() > 0) { 85 if (parentPlatforms.size() > 0) {
86 for (ParentPlatform parentPlatform : parentPlatforms) { 86 for (ParentPlatform parentPlatform : parentPlatforms) {
87 try { 87 try {
  88 + deviceAlarm.setChannelId(parentPlatform.getDeviceGBId());
88 commanderForPlatform.sendAlarmMessage(parentPlatform, deviceAlarm); 89 commanderForPlatform.sendAlarmMessage(parentPlatform, deviceAlarm);
89 } catch (SipException | InvalidArgumentException | ParseException e) { 90 } catch (SipException | InvalidArgumentException | ParseException e) {
90 logger.error("[命令发送失败] 国标级联 发送报警: {}", e.getMessage()); 91 logger.error("[命令发送失败] 国标级联 发送报警: {}", e.getMessage());
@@ -97,6 +98,7 @@ public class RedisAlarmMsgListener implements MessageListener { @@ -97,6 +98,7 @@ public class RedisAlarmMsgListener implements MessageListener {
97 if (parentPlatforms.size() > 0) { 98 if (parentPlatforms.size() > 0) {
98 for (ParentPlatform parentPlatform : parentPlatforms) { 99 for (ParentPlatform parentPlatform : parentPlatforms) {
99 try { 100 try {
  101 + deviceAlarm.setChannelId(parentPlatform.getDeviceGBId());
100 commanderForPlatform.sendAlarmMessage(parentPlatform, deviceAlarm); 102 commanderForPlatform.sendAlarmMessage(parentPlatform, deviceAlarm);
101 } catch (SipException | InvalidArgumentException | ParseException e) { 103 } catch (SipException | InvalidArgumentException | ParseException e) {
102 logger.error("[命令发送失败] 国标级联 发送报警: {}", e.getMessage()); 104 logger.error("[命令发送失败] 国标级联 发送报警: {}", e.getMessage());
@@ -110,6 +112,7 @@ public class RedisAlarmMsgListener implements MessageListener { @@ -110,6 +112,7 @@ public class RedisAlarmMsgListener implements MessageListener {
110 if (devices.size() > 0) { 112 if (devices.size() > 0) {
111 for (Device device : devices) { 113 for (Device device : devices) {
112 try { 114 try {
  115 + deviceAlarm.setChannelId(device.getDeviceId());
113 commander.sendAlarmMessage(device, deviceAlarm); 116 commander.sendAlarmMessage(device, deviceAlarm);
114 } catch (InvalidArgumentException | SipException | ParseException e) { 117 } catch (InvalidArgumentException | SipException | ParseException e) {
115 logger.error("[命令发送失败] 发送报警: {}", e.getMessage()); 118 logger.error("[命令发送失败] 发送报警: {}", e.getMessage());