Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整国标级联时设备信息的获取

pull/1642/head
648540858 2024-09-28 14:04:43 +08:00
parent b4688f53dc
commit 8ef8773db6
6 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
View File

@ -185,8 +185,9 @@ public class ByeRequestProcessor extends SIPRequestProcessorParent implements In
} }
log.info("[收到bye] 来自：{}, 通道: {}, 类型： {}", ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getType()); log.info("[收到bye] 来自：{}, 通道: {}, 类型： {}", ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getType());
Platform platform = platformService.queryPlatformByServerGBId(ssrcTransaction.getDeviceId());
if (platform != null ) { if (ssrcTransaction.getPlatformId() != null ) {
Platform platform = platformService.queryPlatformByServerGBId(ssrcTransaction.getDeviceId());
if (ssrcTransaction.getType().equals(InviteSessionType.BROADCAST)) { if (ssrcTransaction.getType().equals(InviteSessionType.BROADCAST)) {
log.info("[收到bye] 上级停止语音对讲，来自：{}, 通道已停止推流: {}", ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId()); log.info("[收到bye] 上级停止语音对讲，来自：{}, 通道已停止推流: {}", ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId());
CommonGBChannel channel = channelService.getOne(ssrcTransaction.getChannelId()); CommonGBChannel channel = channelService.getOne(ssrcTransaction.getChannelId());

2
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
View File

@ -109,7 +109,7 @@ public class InfoRequestProcessor extends SIPRequestProcessorParent implements I
} }
// 根据通道ID，获取所属设备 // 根据通道ID，获取所属设备
Device device = deviceService.getDeviceByChannelId(sendRtpInfo.getChannelId()); Device device = deviceService.getDevice(channel.getGbDeviceDbId());
if (device == null) { if (device == null) {
// 不存在则回复404 // 不存在则回复404
log.warn("[INFO 消息] 通道所属设备不存在， 通道ID： {}", sendRtpInfo.getChannelId()); log.warn("[INFO 消息] 通道所属设备不存在， 通道ID： {}", sendRtpInfo.getChannelId());

16
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/cmd/DeviceControlQueryMessageHandler.java
View File

@ -145,7 +145,7 @@ public class DeviceControlQueryMessageHandler extends SIPRequestProcessorParent
return; return;
} }
// 根据通道ID，获取所属设备 // 根据通道ID，获取所属设备
Device device = deviceService.getDeviceByChannelId(channel.getGbId()); Device device = deviceService.getDevice(channel.getGbDeviceDbId());
if (device == null) { if (device == null) {
// 不存在则回复404 // 不存在则回复404
log.warn("[INFO 消息] 通道所属设备不存在， 通道ID： {}", channel.getGbId()); log.warn("[INFO 消息] 通道所属设备不存在， 通道ID： {}", channel.getGbId());
@ -195,7 +195,7 @@ public class DeviceControlQueryMessageHandler extends SIPRequestProcessorParent
return; return;
} }
// 根据通道ID，获取所属设备 // 根据通道ID，获取所属设备
Device device = deviceService.getDeviceByChannelId(channel.getGbId()); Device device = deviceService.getDevice(channel.getGbDeviceDbId());
if (device == null) { if (device == null) {
// 不存在则回复404 // 不存在则回复404
log.warn("[INFO 消息] 通道所属设备不存在， 通道ID： {}", channel.getGbId()); log.warn("[INFO 消息] 通道所属设备不存在， 通道ID： {}", channel.getGbId());
@ -243,7 +243,7 @@ public class DeviceControlQueryMessageHandler extends SIPRequestProcessorParent
return; return;
} }
// 根据通道ID，获取所属设备 // 根据通道ID，获取所属设备
Device device = deviceService.getDeviceByChannelId(channel.getGbId()); Device device = deviceService.getDevice(channel.getGbDeviceDbId());
if (device == null) { if (device == null) {
// 不存在则回复404 // 不存在则回复404
log.warn("[INFO 消息] 通道所属设备不存在， 通道ID： {}", channel.getGbId()); log.warn("[INFO 消息] 通道所属设备不存在， 通道ID： {}", channel.getGbId());
@ -278,7 +278,7 @@ public class DeviceControlQueryMessageHandler extends SIPRequestProcessorParent
return; return;
} }
// 根据通道ID，获取所属设备 // 根据通道ID，获取所属设备
Device device = deviceService.getDeviceByChannelId(channel.getGbId()); Device device = deviceService.getDevice(channel.getGbDeviceDbId());
if (device == null) { if (device == null) {
// 不存在则回复404 // 不存在则回复404
log.warn("[INFO 消息] 通道所属设备不存在， 通道ID： {}", channel.getGbId()); log.warn("[INFO 消息] 通道所属设备不存在， 通道ID： {}", channel.getGbId());
@ -341,7 +341,7 @@ public class DeviceControlQueryMessageHandler extends SIPRequestProcessorParent
return; return;
} }
// 根据通道ID，获取所属设备 // 根据通道ID，获取所属设备
Device device = deviceService.getDeviceByChannelId(channel.getGbId()); Device device = deviceService.getDevice(channel.getGbDeviceDbId());
if (device == null) { if (device == null) {
// 不存在则回复404 // 不存在则回复404
log.warn("[INFO 消息] 通道所属设备不存在， 通道ID： {}", channel.getGbId()); log.warn("[INFO 消息] 通道所属设备不存在， 通道ID： {}", channel.getGbId());
@ -393,7 +393,7 @@ public class DeviceControlQueryMessageHandler extends SIPRequestProcessorParent
return; return;
} }
// 根据通道ID，获取所属设备 // 根据通道ID，获取所属设备
Device device = deviceService.getDeviceByChannelId(channel.getGbId()); Device device = deviceService.getDevice(channel.getGbDeviceDbId());
if (device == null) { if (device == null) {
// 不存在则回复404 // 不存在则回复404
log.warn("[INFO 消息] 通道所属设备不存在， 通道ID： {}", channel.getGbId()); log.warn("[INFO 消息] 通道所属设备不存在， 通道ID： {}", channel.getGbId());
@ -439,7 +439,7 @@ public class DeviceControlQueryMessageHandler extends SIPRequestProcessorParent
return; return;
} }
// 根据通道ID，获取所属设备 // 根据通道ID，获取所属设备
Device device = deviceService.getDeviceByChannelId(channel.getGbId()); Device device = deviceService.getDevice(channel.getGbDeviceDbId());
if (device == null) { if (device == null) {
// 不存在则回复404 // 不存在则回复404
log.warn("[INFO 消息] 通道所属设备不存在， 通道ID： {}", channel.getGbId()); log.warn("[INFO 消息] 通道所属设备不存在， 通道ID： {}", channel.getGbId());
@ -491,7 +491,7 @@ public class DeviceControlQueryMessageHandler extends SIPRequestProcessorParent
return; return;
} }
// 根据通道ID，获取所属设备 // 根据通道ID，获取所属设备
Device device = deviceService.getDeviceByChannelId(channel.getGbId()); Device device = deviceService.getDevice(channel.getGbDeviceDbId());
if (device == null) { if (device == null) {
// 不存在则回复404 // 不存在则回复404
log.warn("[INFO 消息] 通道所属设备不存在， 通道ID： {}", channel.getGbId()); log.warn("[INFO 消息] 通道所属设备不存在， 通道ID： {}", channel.getGbId());

3
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java
View File

@ -70,9 +70,6 @@ public class AlarmNotifyMessageHandler extends SIPRequestProcessorParent impleme
@Autowired @Autowired
private ThreadPoolTaskExecutor taskExecutor; private ThreadPoolTaskExecutor taskExecutor;
@Autowired
private EventPublisher eventPublisher;
@Override @Override
public void afterPropertiesSet() throws Exception { public void afterPropertiesSet() throws Exception {

4
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/DeviceInfoQueryMessageHandler.java
View File

@ -106,10 +106,10 @@ public class DeviceInfoQueryMessageHandler extends SIPRequestProcessorParent imp
} }
// 根据通道ID，获取所属设备 // 根据通道ID，获取所属设备
Device device = deviceService.getDeviceByChannelId(channel.getGbId()); Device device = deviceService.getDevice(channel.getGbDeviceDbId());
if (device == null) { if (device == null) {
// 不存在则回复404 // 不存在则回复404
log.warn("[DeviceInfo] 通道所属设备不存在， 通道ID： {}", channel.getGbId()); log.warn("[DeviceInfo] 通道所属设备不存在， 通道ID： {}", channel.getGbDeviceDbId());
try { try {
responseAck(request, Response.NOT_FOUND, "device not found "); responseAck(request, Response.NOT_FOUND, "device not found ");

2
src/main/resources/application.yml
View File

@ -2,4 +2,4 @@ spring:
application: application:
name: wvp name: wvp
profiles: profiles:
active: 272重构-postgre active: 272重构