Commit 72b9239c5a1028ffb3f388169ba34cd21f40d71d

Authored by 648540858
1 parent eec4e347

优化消息通道

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