From 72b9239c5a1028ffb3f388169ba34cd21f40d71d Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Thu, 16 Mar 2023 20:32:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E9=80=9A?= =?UTF-8?q?=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java | 2 +- .../iot/vmp/service/redisMsg/RedisAlarmMsgListener.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java index 9bf1a3ad..c627215e 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java +++ b/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); diff --git a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java index 43528ecc..6eacd394 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java +++ b/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());