648540858 2 роки тому
батько
коміт
72b9239c5a

+ 1 - 1
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java

@@ -221,7 +221,7 @@ public class ZLMRTPServerFactory {
             if (localPort == 0) {
                 return null;
             }
-        }
+        }alarm
         SendRtpItem sendRtpItem = new SendRtpItem();
         sendRtpItem.setIp(ip);
         sendRtpItem.setPort(port);

+ 3 - 0
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java

@@ -85,6 +85,7 @@ public class RedisAlarmMsgListener implements MessageListener {
                                 if (parentPlatforms.size() > 0) {
                                     for (ParentPlatform parentPlatform : parentPlatforms) {
                                         try {
+                                            deviceAlarm.setChannelId(parentPlatform.getDeviceGBId());
                                             commanderForPlatform.sendAlarmMessage(parentPlatform, deviceAlarm);
                                         } catch (SipException | InvalidArgumentException | ParseException e) {
                                             logger.error("[命令发送失败] 国标级联 发送报警: {}", e.getMessage());
@@ -97,6 +98,7 @@ public class RedisAlarmMsgListener implements MessageListener {
                                 if (parentPlatforms.size() > 0) {
                                     for (ParentPlatform parentPlatform : parentPlatforms) {
                                         try {
+                                            deviceAlarm.setChannelId(parentPlatform.getDeviceGBId());
                                             commanderForPlatform.sendAlarmMessage(parentPlatform, deviceAlarm);
                                         } catch (SipException | InvalidArgumentException | ParseException e) {
                                             logger.error("[命令发送失败] 国标级联 发送报警: {}", e.getMessage());
@@ -110,6 +112,7 @@ public class RedisAlarmMsgListener implements MessageListener {
                             if (devices.size() > 0) {
                                 for (Device device : devices) {
                                     try {
+                                        deviceAlarm.setChannelId(device.getDeviceId());
                                         commander.sendAlarmMessage(device, deviceAlarm);
                                     } catch (InvalidArgumentException | SipException | ParseException e) {
                                         logger.error("[命令发送失败] 发送报警: {}", e.getMessage());