From f3388dd53aa81138404a4a080b2ad2e97d0a01df Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 14 六月 2023 16:26:29 +0800
Subject: [PATCH] 修复级联录像查询sql错误
---
src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 104 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
index 5c31f90..1d4ce4b 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
@@ -1,13 +1,19 @@
package com.genersoft.iot.vmp.gb28181.utils;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.gb28181.bean.Gb28181Sdp;
import com.genersoft.iot.vmp.gb28181.bean.RemoteAddressInfo;
import com.genersoft.iot.vmp.utils.GitUtil;
import gov.nist.javax.sip.address.AddressImpl;
import gov.nist.javax.sip.address.SipUri;
import gov.nist.javax.sip.header.Subject;
import gov.nist.javax.sip.message.SIPRequest;
+import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.util.ObjectUtils;
+import javax.sdp.SdpFactory;
+import javax.sdp.SdpParseException;
+import javax.sdp.SessionDescription;
import javax.sip.PeerUnavailableException;
import javax.sip.SipFactory;
import javax.sip.header.FromHeader;
@@ -50,10 +56,10 @@
}
public static String getNewViaTag() {
- return "z9hG4bK" + System.currentTimeMillis();
+ return "z9hG4bK" + RandomStringUtils.randomNumeric(10);
}
- public static UserAgentHeader createUserAgentHeader(SipFactory sipFactory, GitUtil gitUtil) throws PeerUnavailableException, ParseException {
+ public static UserAgentHeader createUserAgentHeader(GitUtil gitUtil) throws PeerUnavailableException, ParseException {
List<String> agentParam = new ArrayList<>();
agentParam.add("WVP-Pro ");
if (gitUtil != null ) {
@@ -65,7 +71,7 @@
agentParam.add(gitUtil.getCommitTime());
}
}
- return sipFactory.createHeaderFactory().createUserAgentHeader(agentParam);
+ return SipFactory.getInstance().createHeaderFactory().createUserAgentHeader(agentParam);
}
public static String getNewFromTag(){
@@ -112,6 +118,12 @@
strTmp = String.format("%02X", moveSpeed);
builder.append(strTmp, 0, 2);
builder.append(strTmp, 0, 2);
+
+ //浼樺寲zoom浣庡�嶉�熶笅鐨勫彉鍊嶉�熺巼
+ if ((zoomSpeed > 0) && (zoomSpeed <16))
+ {
+ zoomSpeed = 16;
+ }
strTmp = String.format("%X", zoomSpeed);
builder.append(strTmp, 0, 1).append("0");
//璁＄畻鏍￠獙鐮�
@@ -121,25 +133,109 @@
return builder.toString();
}
+ /**
+ * 浠庤姹備腑鑾峰彇璁惧ip鍦板潃鍜岀鍙ｅ彿
+ * @param request 璇锋眰
+ * @param sipUseSourceIpAsRemoteAddress false 浠巚ia涓幏鍙栧湴鍧�锛� true 鐩存帴鑾峰彇杩滅▼鍦板潃
+ * @return 鍦板潃淇℃伅
+ */
public static RemoteAddressInfo getRemoteAddressFromRequest(SIPRequest request, boolean sipUseSourceIpAsRemoteAddress) {
String remoteAddress;
int remotePort;
if (sipUseSourceIpAsRemoteAddress) {
- remoteAddress = request.getRemoteAddress().getHostAddress();
- remotePort = request.getRemotePort();
+ remoteAddress = request.getPeerPacketSourceAddress().getHostAddress();
+ remotePort = request.getPeerPacketSourcePort();
+
}else {
// 鍒ゆ柇RPort鏄惁鏀瑰彉锛屾敼鍙樺垯璇存槑璺敱nat淇℃伅鍙樺寲锛屼慨鏀硅澶囦俊鎭�
// 鑾峰彇鍒伴�氫俊鍦板潃绛変俊鎭�
remoteAddress = request.getTopmostViaHeader().getReceived();
- remotePort = request.getTopmostViaHeader().getPort();
+ remotePort = request.getTopmostViaHeader().getRPort();
// 瑙ｆ瀽鏈湴鍦板潃鏇夸唬
if (ObjectUtils.isEmpty(remoteAddress) || remotePort == -1) {
- remoteAddress = request.getViaHost();
- remotePort = request.getViaPort();
+ remoteAddress = request.getPeerPacketSourceAddress().getHostAddress();
+ remotePort = request.getPeerPacketSourcePort();
}
}
return new RemoteAddressInfo(remoteAddress, remotePort);
}
+
+ public static DeviceChannel updateGps(DeviceChannel deviceChannel, String geoCoordSys) {
+ if (deviceChannel.getLongitude()*deviceChannel.getLatitude() > 0) {
+
+ if (geoCoordSys == null) {
+ geoCoordSys = "WGS84";
+ }
+ if ("WGS84".equals(geoCoordSys)) {
+ deviceChannel.setLongitudeWgs84(deviceChannel.getLongitude());
+ deviceChannel.setLatitudeWgs84(deviceChannel.getLatitude());
+ Double[] position = Coordtransform.WGS84ToGCJ02(deviceChannel.getLongitude(), deviceChannel.getLatitude());
+ deviceChannel.setLongitudeGcj02(position[0]);
+ deviceChannel.setLatitudeGcj02(position[1]);
+ }else if ("GCJ02".equals(geoCoordSys)) {
+ deviceChannel.setLongitudeGcj02(deviceChannel.getLongitude());
+ deviceChannel.setLatitudeGcj02(deviceChannel.getLatitude());
+ Double[] position = Coordtransform.GCJ02ToWGS84(deviceChannel.getLongitude(), deviceChannel.getLatitude());
+ deviceChannel.setLongitudeWgs84(position[0]);
+ deviceChannel.setLatitudeWgs84(position[1]);
+ }else {
+ deviceChannel.setLongitudeGcj02(0.00);
+ deviceChannel.setLatitudeGcj02(0.00);
+ deviceChannel.setLongitudeWgs84(0.00);
+ deviceChannel.setLatitudeWgs84(0.00);
+ }
+ }else {
+ deviceChannel.setLongitudeGcj02(deviceChannel.getLongitude());
+ deviceChannel.setLatitudeGcj02(deviceChannel.getLatitude());
+ deviceChannel.setLongitudeWgs84(deviceChannel.getLongitude());
+ deviceChannel.setLatitudeWgs84(deviceChannel.getLatitude());
+ }
+ return deviceChannel;
+ }
+
+ public static Gb28181Sdp parseSDP(String sdpStr) throws SdpParseException {
+
+ // jainSip涓嶆敮鎸亂= f=瀛楁锛� 绉婚櫎浠ヨВ鏋愩��
+ int ssrcIndex = sdpStr.indexOf("y=");
+ int mediaDescriptionIndex = sdpStr.indexOf("f=");
+ // 妫�鏌ユ槸鍚︽湁y瀛楁
+ SessionDescription sdp;
+ String ssrc = null;
+ String mediaDescription = null;
+ if (mediaDescriptionIndex == 0 && ssrcIndex == 0) {
+ sdp = SdpFactory.getInstance().createSessionDescription(sdpStr);
+ }else {
+ String lines[] = sdpStr.split("\\r?\\n");
+ StringBuilder sdpBuffer = new StringBuilder();
+ for (String line : lines) {
+ if (line.trim().startsWith("y=")) {
+ ssrc = line.substring(2);
+ }else if (line.trim().startsWith("f=")) {
+ mediaDescription = line.substring(2);
+ }else {
+ sdpBuffer.append(line.trim()).append("\r\n");
+ }
+ }
+ sdp = SdpFactory.getInstance().createSessionDescription(sdpBuffer.toString());
+ }
+ return Gb28181Sdp.getInstance(sdp, ssrc, mediaDescription);
+ }
+
+ public static String getSsrcFromSdp(String sdpStr) {
+
+ // jainSip涓嶆敮鎸亂= f=瀛楁锛� 绉婚櫎浠ヨВ鏋愩��
+ int ssrcIndex = sdpStr.indexOf("y=");
+ if (ssrcIndex == 0) {
+ return null;
+ }
+ String lines[] = sdpStr.split("\\r?\\n");
+ for (String line : lines) {
+ if (line.trim().startsWith("y=")) {
+ return line.substring(2);
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.8.0