From e4754af417b176f5e0ab998e6594d875bc0a069c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 06 七月 2023 15:35:59 +0800
Subject: [PATCH] 修复数据错误导致无法转成JSON返回 #919
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
index 9f69950..e084f35 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
@@ -80,7 +80,6 @@
public void process(RequestEvent evt) {
try {
RequestEventExt evtExt = (RequestEventExt) evt;
- String requestAddress = evtExt.getRemoteIpAddress() + ":" + evtExt.getRemotePort();
SIPRequest request = (SIPRequest)evt.getRequest();
Response response = null;
@@ -91,12 +90,13 @@
AddressImpl address = (AddressImpl) fromHeader.getAddress();
SipUri uri = (SipUri) address.getURI();
String deviceId = uri.getUser();
- logger.info("[娉ㄥ唽璇锋眰] 璁惧锛歿}, 寮�濮嬪鐞�: {}", deviceId, requestAddress);
+
Device device = deviceService.getDevice(deviceId);
RemoteAddressInfo remoteAddressInfo = SipUtils.getRemoteAddressFromRequest(request,
userSetting.getSipUseSourceIpAsRemoteAddress());
-
+ String requestAddress = remoteAddressInfo.getIp() + ":" + remoteAddressInfo.getPort();
+ logger.info("[娉ㄥ唽璇锋眰] 璁惧锛歿}, 寮�濮嬪鐞�: {}", deviceId, requestAddress);
if (device != null &&
device.getSipTransactionInfo() != null &&
request.getCallIdHeader().getCallId().equals(device.getSipTransactionInfo().getCallId())) {
@@ -164,10 +164,20 @@
device.setStreamMode("UDP");
device.setCharset("GB2312");
device.setGeoCoordSys("WGS84");
- device.setTreeType("CivilCode");
device.setDeviceId(deviceId);
- device.setOnline(0);
+ device.setOnLine(false);
+ }else {
+ if (ObjectUtils.isEmpty(device.getStreamMode())) {
+ device.setStreamMode("UDP");
+ }
+ if (ObjectUtils.isEmpty(device.getCharset())) {
+ device.setCharset("GB2312");
+ }
+ if (ObjectUtils.isEmpty(device.getGeoCoordSys())) {
+ device.setGeoCoordSys("WGS84");
+ }
}
+
device.setIp(remoteAddressInfo.getIp());
device.setPort(remoteAddressInfo.getPort());
device.setHostAddress(remoteAddressInfo.getIp().concat(":").concat(String.valueOf(remoteAddressInfo.getPort())));
--
Gitblit v1.8.0