From a42dda2bd3cc1cf8c20cc61e7ad9211eadecbaf3 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 24 二月 2022 16:55:06 +0800
Subject: [PATCH] 规范数据库，添加必要约束，优化通道批量导入功能
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 157 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
index 7a0e901..29f8c05 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl;
import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.conf.UserSetup;
import com.genersoft.iot.vmp.gb28181.bean.Device;
@@ -261,7 +262,7 @@
public boolean frontEndCmd(Device device, String channelId, int cmdCode, int parameter1, int parameter2, int combineCode2) {
try {
String cmdStr= frontEndCmdString(cmdCode, parameter1, parameter2, combineCode2);
- logger.info("鎺у埗瀛楃涓诧細" + cmdStr);
+ logger.debug("鎺у埗瀛楃涓诧細" + cmdStr);
StringBuffer ptzXml = new StringBuffer(200);
ptzXml.append("<?xml version=\"1.0\" ?>\r\n");
ptzXml.append("<Control>\r\n");
@@ -1161,7 +1162,7 @@
@Override
public boolean catalogQuery(Device device, SipSubscribe.Event errorEvent) {
// 娓呯┖閫氶亾
- storager.cleanChannelsForDevice(device.getDeviceId());
+// storager.cleanChannelsForDevice(device.getDeviceId());
try {
StringBuffer catalogXml = new StringBuffer(200);
catalogXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");
@@ -1194,14 +1195,15 @@
* @param endTime 缁撴潫鏃堕棿,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
*/
@Override
- public boolean recordInfoQuery(Device device, String channelId, String startTime, String endTime) {
-
+ public boolean recordInfoQuery(Device device, String channelId, String startTime, String endTime, int sn, SipSubscribe.Event errorEvent) {
+
+
try {
StringBuffer recordInfoXml = new StringBuffer(200);
recordInfoXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");
recordInfoXml.append("<Query>\r\n");
recordInfoXml.append("<CmdType>RecordInfo</CmdType>\r\n");
- recordInfoXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
+ recordInfoXml.append("<SN>" + sn + "</SN>\r\n");
recordInfoXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
recordInfoXml.append("<StartTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(startTime) + "</StartTime>\r\n");
recordInfoXml.append("<EndTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(endTime) + "</EndTime>\r\n");
@@ -1218,7 +1220,7 @@
Request request = headerProvider.createMessageRequest(device, recordInfoXml.toString(),
"z9hG4bK-ViaRecordInfo-" + tm, "fromRec" + tm, null, callIdHeader);
- transmitRequest(device, request);
+ transmitRequest(device, request, errorEvent);
} catch (SipException | ParseException | InvalidArgumentException e) {
e.printStackTrace();
return false;
@@ -1486,7 +1488,7 @@
StringBuffer cmdXml = new StringBuffer(200);
cmdXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");
cmdXml.append("<Query>\r\n");
- cmdXml.append("<CmdType>CataLog</CmdType>\r\n");
+ cmdXml.append("<CmdType>Catalog</CmdType>\r\n");
cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
cmdXml.append("</Query>\r\n");
@@ -1496,7 +1498,10 @@
CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
: udpSipProvider.getNewCallId();
- Request request = headerProvider.createSubscribeRequest(device, cmdXml.toString(), "z9hG4bK-viaPos-" + tm, "fromTagPos" + tm, null, device.getSubscribeCycleForCatalog(), "presence" , callIdHeader);
+ // 鏈夋晥鏃堕棿榛樿涓�60绉掍互涓�
+ Request request = headerProvider.createSubscribeRequest(device, cmdXml.toString(), "z9hG4bK-viaPos-" + tm,
+ "fromTagPos" + tm, null, device.getSubscribeCycleForCatalog() + 60, "Catalog" ,
+ callIdHeader);
transmitRequest(device, request, errorEvent, okEvent);
return true;
@@ -1505,6 +1510,34 @@
e.printStackTrace();
return false;
}
+ }
+
+ @Override
+ public boolean dragZoomCmd(Device device, String channelId, String cmdString) {
+ try {
+ StringBuffer dragXml = new StringBuffer(200);
+ dragXml.append("<?xml version=\"1.0\" ?>\r\n");
+ dragXml.append("<Control>\r\n");
+ dragXml.append("<CmdType>DeviceControl</CmdType>\r\n");
+ dragXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+ if (StringUtils.isEmpty(channelId)) {
+ dragXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+ } else {
+ dragXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
+ }
+ dragXml.append(cmdString);
+ dragXml.append("</Control>\r\n");
+ String tm = Long.toString(System.currentTimeMillis());
+ CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
+ : udpSipProvider.getNewCallId();
+ Request request = headerProvider.createMessageRequest(device, dragXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader);
+ logger.debug("鎷夋淇′护锛� " + request.toString());
+ transmitRequest(device, request);
+ return true;
+ } catch (SipException | ParseException | InvalidArgumentException e) {
+ e.printStackTrace();
+ }
+ return false;
}
@@ -1543,4 +1576,120 @@
clientTransaction.sendRequest();
return clientTransaction;
}
+
+ /**
+ * 鍥炴斁鏆傚仠
+ */
+ @Override
+ public void playPauseCmd(Device device, StreamInfo streamInfo) {
+ try {
+ Long cseq = redisCatchStorage.getCSEQ(Request.INFO);
+ StringBuffer content = new StringBuffer(200);
+ content.append("PAUSE RTSP/1.0\r\n");
+ content.append("CSeq: " + cseq + "\r\n");
+ content.append("PauseTime: now\r\n");
+ Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);
+ if (request == null) {
+ return;
+ }
+ logger.info(request.toString());
+ ClientTransaction clientTransaction = null;
+ if ("TCP".equals(device.getTransport())) {
+ clientTransaction = tcpSipProvider.getNewClientTransaction(request);
+ } else if ("UDP".equals(device.getTransport())) {
+ clientTransaction = udpSipProvider.getNewClientTransaction(request);
+ }
+ if (clientTransaction != null) {
+ clientTransaction.sendRequest();
+ }
+
+ } catch (SipException | ParseException | InvalidArgumentException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 鍥炴斁鎭㈠
+ */
+ @Override
+ public void playResumeCmd(Device device, StreamInfo streamInfo) {
+ try {
+ Long cseq = redisCatchStorage.getCSEQ(Request.INFO);
+ StringBuffer content = new StringBuffer(200);
+ content.append("PLAY RTSP/1.0\r\n");
+ content.append("CSeq: " + cseq + "\r\n");
+ content.append("Range: npt=now-\r\n");
+ Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);
+ if (request == null) return;
+ logger.info(request.toString());
+ ClientTransaction clientTransaction = null;
+ if ("TCP".equals(device.getTransport())) {
+ clientTransaction = tcpSipProvider.getNewClientTransaction(request);
+ } else if ("UDP".equals(device.getTransport())) {
+ clientTransaction = udpSipProvider.getNewClientTransaction(request);
+ }
+
+ clientTransaction.sendRequest();
+
+ } catch (SipException | ParseException | InvalidArgumentException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 鍥炴斁鎷栧姩鎾斁
+ */
+ @Override
+ public void playSeekCmd(Device device, StreamInfo streamInfo, long seekTime) {
+ try {
+ Long cseq = redisCatchStorage.getCSEQ(Request.INFO);
+ StringBuffer content = new StringBuffer(200);
+ content.append("PLAY RTSP/1.0\r\n");
+ content.append("CSeq: " + cseq + "\r\n");
+ content.append("Range: npt=" + Math.abs(seekTime) + "-\r\n");
+
+ Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);
+ if (request == null) return;
+ logger.info(request.toString());
+ ClientTransaction clientTransaction = null;
+ if ("TCP".equals(device.getTransport())) {
+ clientTransaction = tcpSipProvider.getNewClientTransaction(request);
+ } else if ("UDP".equals(device.getTransport())) {
+ clientTransaction = udpSipProvider.getNewClientTransaction(request);
+ }
+
+ clientTransaction.sendRequest();
+
+ } catch (SipException | ParseException | InvalidArgumentException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 鍥炴斁鍊嶉�熸挱鏀�
+ */
+ @Override
+ public void playSpeedCmd(Device device, StreamInfo streamInfo, Double speed) {
+ try {
+ Long cseq = redisCatchStorage.getCSEQ(Request.INFO);
+ StringBuffer content = new StringBuffer(200);
+ content.append("PLAY RTSP/1.0\r\n");
+ content.append("CSeq: " + cseq + "\r\n");
+ content.append("Scale: " + String.format("%.1f",speed) + "\r\n");
+ Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);
+ if (request == null) return;
+ logger.info(request.toString());
+ ClientTransaction clientTransaction = null;
+ if ("TCP".equals(device.getTransport())) {
+ clientTransaction = tcpSipProvider.getNewClientTransaction(request);
+ } else if ("UDP".equals(device.getTransport())) {
+ clientTransaction = udpSipProvider.getNewClientTransaction(request);
+ }
+
+ clientTransaction.sendRequest();
+
+ } catch (SipException | ParseException | InvalidArgumentException e) {
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.8.0