From 3745c80567cfdbd02cb60b2351d048f63eb6c1a2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 09 十一月 2021 11:56:21 +0800
Subject: [PATCH] 重构28181信令的message结构
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java | 4
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/DeviceControlMessageHandler.java | 109 ++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java | 6
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/DeviceStatusMessageHandler.java | 73 +
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/DeviceInfoMessageHandler.java | 60 +
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java | 178 ++++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MobilePositionMessageHandler.java | 101 ++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java | 91 ++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceConfigMessageHandler.java | 58 +
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmMessageHandler.java | 112 ++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/CheckForAllRecordsThread.java | 15
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java | 6
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/MobilePositionMessageHandler.java | 103 ++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/MessageRequestProcessor1.java | 24
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java | 61 +
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/ResponseMessageHandler.java | 21
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceStatusMessageHandler.java | 89 ++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoMessageHandler.java | 153 +++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/CancelRequestProcessor.java | 6
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java | 6
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java | 6
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/AlarmMessageHandler.java | 58 +
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveMessageHandler.java | 61 +
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceControlMessageHandler.java | 59 +
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java | 6
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java | 17
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java | 4
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorAbstract.java | 158 ---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/ConfigDownloadMessageHandler.java | 81 +
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastMessageHandler.java | 72 +
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogMessageHandler.java | 118 ++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/QueryMessageHandler.java | 21
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java | 6
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/ControlMessageHandler.java | 21
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceInfoMessageHandler.java | 103 ++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusMessageHandler.java | 73 +
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/IMessageHandler.java | 23
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java | 43 +
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/NotifyMessageHandler.java | 16
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogMessageHandler.java | 182 ++++
40 files changed, 2,200 insertions(+), 204 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
index 5a573f7..3d9b827 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
@@ -77,7 +77,7 @@
return sipStack;
}
- @Bean("tcpSipProvider")
+ @Bean(name = "tcpSipProvider")
@DependsOn("sipStack")
private SipProviderImpl startTcpListener() {
ListeningPoint tcpListeningPoint = null;
@@ -100,7 +100,7 @@
return tcpSipProvider;
}
- @Bean("udpSipProvider")
+ @Bean(name = "udpSipProvider")
@DependsOn("sipStack")
private SipProviderImpl startUdpListener() {
ListeningPoint udpListeningPoint = null;
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java
index 3d59260..b347891 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java
@@ -16,8 +16,8 @@
/**
* @description: 鍦ㄧ嚎浜嬩欢鐩戝惉鍣紝鐩戝惉鍒扮绾垮悗锛屼慨鏀硅澶囩鍦ㄧ嚎鐘舵�併�� 璁惧鍦ㄧ嚎鏈変袱涓潵婧愶細
- * 1銆佽澶囦富鍔ㄦ敞閿�锛屽彂閫佹敞閿�鎸囦护锛寋@link com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.RegisterRequestProcessor}
- * 2銆佽澶囨湭鐭ュ師鍥犵绾匡紝蹇冭烦瓒呮椂,{@link com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.MessageRequestProcessor}
+ * 1銆佽澶囦富鍔ㄦ敞閿�锛屽彂閫佹敞閿�鎸囦护
+ * 2銆佽澶囨湭鐭ュ師鍥犵绾匡紝蹇冭烦瓒呮椂
* @author: swwheihei
* @date: 2020骞�5鏈�6鏃� 涓嬪崍1:51:23
*/
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java
index b3175d0..e385e0b 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java
@@ -1,14 +1,18 @@
package com.genersoft.iot.vmp.gb28181.transmit;
+import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.event.response.ISIPResponseProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.event.timeout.ITimeoutProcessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.sip.*;
import javax.sip.header.CSeqHeader;
+import javax.sip.header.CallIdHeader;
+import javax.sip.message.Response;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -25,6 +29,9 @@
private static Map<String, ISIPRequestProcessor> requestProcessorMap = new ConcurrentHashMap<>();
private static Map<String, ISIPResponseProcessor> responseProcessorMap = new ConcurrentHashMap<>();
private static ITimeoutProcessor timeoutProcessor;
+
+ @Autowired
+ private SipSubscribe sipSubscribe;
/**
* 娣诲姞 request璁㈤槄
@@ -73,14 +80,54 @@
*/
@Override
public void processResponse(ResponseEvent responseEvent) {
- CSeqHeader cseqHeader = (CSeqHeader) responseEvent.getResponse().getHeader(CSeqHeader.NAME);
- String method = cseqHeader.getMethod();
- ISIPResponseProcessor sipRequestProcessor = responseProcessorMap.get(method);
- if (sipRequestProcessor == null) {
- logger.warn("涓嶆敮鎸佹柟娉晎}鐨剅esponse", method);
- return;
+ logger.debug(responseEvent.getResponse().toString());
+// CSeqHeader cseqHeader = (CSeqHeader) responseEvent.getResponse().getHeader(CSeqHeader.NAME);
+// String method = cseqHeader.getMethod();
+// ISIPResponseProcessor sipRequestProcessor = responseProcessorMap.get(method);
+// if (sipRequestProcessor == null) {
+// logger.warn("涓嶆敮鎸佹柟娉晎}鐨剅esponse", method);
+// return;
+// }
+// sipRequestProcessor.process(responseEvent);
+
+
+ Response response = responseEvent.getResponse();
+ logger.debug(responseEvent.getResponse().toString());
+ int status = response.getStatusCode();
+ if (((status >= 200) && (status < 300)) || status == 401) { // Success!
+// ISIPResponseProcessor processor = processorFactory.createResponseProcessor(evt);
+ CSeqHeader cseqHeader = (CSeqHeader) responseEvent.getResponse().getHeader(CSeqHeader.NAME);
+ String method = cseqHeader.getMethod();
+ ISIPResponseProcessor sipRequestProcessor = responseProcessorMap.get(method);
+ if (sipRequestProcessor != null) {
+ sipRequestProcessor.process(responseEvent);
+ }
+ if (responseEvent.getResponse() != null && sipSubscribe.getOkSubscribesSize() > 0 ) {
+ CallIdHeader callIdHeader = (CallIdHeader)responseEvent.getResponse().getHeader(CallIdHeader.NAME);
+ if (callIdHeader != null) {
+ SipSubscribe.Event subscribe = sipSubscribe.getOkSubscribe(callIdHeader.getCallId());
+ if (subscribe != null) {
+ SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(responseEvent);
+ subscribe.response(eventResult);
+ }
+ }
+ }
+ } else if ((status >= 100) && (status < 200)) {
+ // 澧炲姞鍏跺畠鏃犻渶鍥炲鐨勫搷搴旓紝濡�101銆�180绛�
+ } else {
+ logger.warn("鎺ユ敹鍒板け璐ョ殑response鍝嶅簲锛乻tatus锛�" + status + ",message:" + response.getReasonPhrase()/* .getContent().toString()*/);
+ if (responseEvent.getResponse() != null && sipSubscribe.getErrorSubscribesSize() > 0 ) {
+ CallIdHeader callIdHeader = (CallIdHeader)responseEvent.getResponse().getHeader(CallIdHeader.NAME);
+ if (callIdHeader != null) {
+ SipSubscribe.Event subscribe = sipSubscribe.getErrorSubscribe(callIdHeader.getCallId());
+ if (subscribe != null) {
+ SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(responseEvent);
+ subscribe.response(eventResult);
+ }
+ }
+ }
}
- sipRequestProcessor.process(responseEvent);
+
}
/**
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/CheckForAllRecordsThread.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/CheckForAllRecordsThread.java
index c6f3780..a046025 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/CheckForAllRecordsThread.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/CheckForAllRecordsThread.java
@@ -1,16 +1,15 @@
package com.genersoft.iot.vmp.gb28181.transmit.callback;
+import com.genersoft.iot.vmp.gb28181.bean.RecordInfo;
+import com.genersoft.iot.vmp.gb28181.bean.RecordItem;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd.RecordInfoMessageHandler;
+import com.genersoft.iot.vmp.utils.redis.RedisUtil;
+import org.slf4j.Logger;
+
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.concurrent.TimeUnit;
-
-import com.genersoft.iot.vmp.gb28181.bean.RecordInfo;
-import com.genersoft.iot.vmp.gb28181.bean.RecordItem;
-import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.MessageRequestProcessor;
-import com.genersoft.iot.vmp.utils.redis.RedisUtil;
-
-import org.slf4j.Logger;
@SuppressWarnings("unchecked")
public class CheckForAllRecordsThread extends Thread {
@@ -58,7 +57,7 @@
msg.setData(recordInfo);
deferredResultHolder.invokeAllResult(msg);
logger.info("澶勭悊瀹屾垚锛岃繑鍥炵粨鏋�");
- MessageRequestProcessor.threadNameList.remove(cacheKey);
+ RecordInfoMessageHandler.threadNameList.remove(cacheKey);
}
public void setRedis(RedisUtil redis) {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorAbstract.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorAbstract.java
index 6cb9e7e..dd098f7 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorAbstract.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorAbstract.java
@@ -1,40 +1,16 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request;
import gov.nist.javax.sip.SipProviderImpl;
-import gov.nist.javax.sip.SipStackImpl;
-import gov.nist.javax.sip.message.SIPRequest;
-import gov.nist.javax.sip.stack.SIPServerTransaction;
-import org.dom4j.Document;
-import org.dom4j.DocumentException;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
-
-import javax.sip.*;
-import javax.sip.address.Address;
-import javax.sip.address.AddressFactory;
-import javax.sip.address.SipURI;
-import javax.sip.header.ContentTypeHeader;
-import javax.sip.header.HeaderFactory;
-import javax.sip.header.ViaHeader;
-import javax.sip.message.MessageFactory;
-import javax.sip.message.Request;
-import javax.sip.message.Response;
-import java.io.ByteArrayInputStream;
-import java.text.ParseException;
/**
* @description:澶勭悊鎺ユ敹IPCamera鍙戞潵鐨凷IP鍗忚璇锋眰娑堟伅
* @author: songww
* @date: 2020骞�5鏈�3鏃� 涓嬪崍4:42:22
*/
-public abstract class SIPRequestProcessorAbstract implements InitializingBean, ISIPRequestProcessor {
+public abstract class SIPRequestProcessorAbstract {
- private final static Logger logger = LoggerFactory.getLogger(SIPRequestProcessorAbstract.class);
@Autowired
@Qualifier(value="tcpSipProvider")
@@ -43,137 +19,5 @@
@Autowired
@Qualifier(value="udpSipProvider")
private SipProviderImpl udpSipProvider;
-
- /**
- * 鏍规嵁 RequestEvent 鑾峰彇 ServerTransaction
- * @param evt
- * @return
- */
- public ServerTransaction getServerTransaction(RequestEvent evt) {
- Request request = evt.getRequest();
- ServerTransaction serverTransaction = evt.getServerTransaction();
- // 鍒ゆ柇TCP杩樻槸UDP
- boolean isTcp = false;
- ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
- String transport = reqViaHeader.getTransport();
- if (transport.equals("TCP")) {
- isTcp = true;
- }
-
- if (serverTransaction == null) {
- try {
- if (isTcp) {
- SipStackImpl stack = (SipStackImpl)tcpSipProvider.getSipStack();
- serverTransaction = (SIPServerTransaction) stack.findTransaction((SIPRequest)request, true);
- if (serverTransaction == null) {
- serverTransaction = tcpSipProvider.getNewServerTransaction(request);
- }
- } else {
- SipStackImpl stack = (SipStackImpl)udpSipProvider.getSipStack();
- serverTransaction = (SIPServerTransaction) stack.findTransaction((SIPRequest)request, true);
- if (serverTransaction == null) {
- serverTransaction = udpSipProvider.getNewServerTransaction(request);
- }
- }
- } catch (TransactionAlreadyExistsException e) {
- logger.error(e.getMessage());
- } catch (TransactionUnavailableException e) {
- logger.error(e.getMessage());
- }
- }
- return serverTransaction;
- }
-
- public AddressFactory getAddressFactory() {
- try {
- return SipFactory.getInstance().createAddressFactory();
- } catch (PeerUnavailableException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- public HeaderFactory getHeaderFactory() {
- try {
- return SipFactory.getInstance().createHeaderFactory();
- } catch (PeerUnavailableException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- public MessageFactory getMessageFactory() {
- try {
- return SipFactory.getInstance().createMessageFactory();
- } catch (PeerUnavailableException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- /***
- * 鍥炲鐘舵�佺爜
- * 100 trying
- * 200 OK
- * 400
- * 404
- * @param evt
- * @throws SipException
- * @throws InvalidArgumentException
- * @throws ParseException
- */
- public void responseAck(RequestEvent evt, int statusCode) throws SipException, InvalidArgumentException, ParseException {
- Response response = getMessageFactory().createResponse(statusCode, evt.getRequest());
- ServerTransaction serverTransaction = getServerTransaction(evt);
- serverTransaction.sendResponse(response);
- if (statusCode >= 200) {
- if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete();
- }
- }
-
- public void responseAck(RequestEvent evt, int statusCode, String msg) throws SipException, InvalidArgumentException, ParseException {
- Response response = getMessageFactory().createResponse(statusCode, evt.getRequest());
- response.setReasonPhrase(msg);
- ServerTransaction serverTransaction = getServerTransaction(evt);
- serverTransaction.sendResponse(response);
- if (statusCode >= 200) {
- if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete();
- }
- }
-
- /**
- * 鍥炲甯dp鐨�200
- * @param evt
- * @param sdp
- * @throws SipException
- * @throws InvalidArgumentException
- * @throws ParseException
- */
- public void responseAck(RequestEvent evt, String sdp) throws SipException, InvalidArgumentException, ParseException {
- Response response = getMessageFactory().createResponse(Response.OK, evt.getRequest());
- SipFactory sipFactory = SipFactory.getInstance();
- ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("APPLICATION", "SDP");
- response.setContent(sdp, contentTypeHeader);
-
- SipURI sipURI = (SipURI)evt.getRequest().getRequestURI();
-
- Address concatAddress = sipFactory.createAddressFactory().createAddress(
- sipFactory.createAddressFactory().createSipURI(sipURI.getUser(), sipURI.getHost()+":"+sipURI.getPort()
- ));
- response.addHeader(sipFactory.createHeaderFactory().createContactHeader(concatAddress));
- getServerTransaction(evt).sendResponse(response);
- }
-
- public Element getRootElement(RequestEvent evt) throws DocumentException {
- return getRootElement(evt, "gb2312");
- }
- public Element getRootElement(RequestEvent evt, String charset) throws DocumentException {
- if (charset == null) charset = "gb2312";
- Request request = evt.getRequest();
- SAXReader reader = new SAXReader();
- reader.setEncoding(charset);
- Document xml = reader.read(new ByteArrayInputStream(request.getRawContent()));
- return xml.getRootElement();
- }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
new file mode 100644
index 0000000..ea772d0
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
@@ -0,0 +1,178 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request;
+
+import gov.nist.javax.sip.SipProviderImpl;
+import gov.nist.javax.sip.SipStackImpl;
+import gov.nist.javax.sip.message.SIPRequest;
+import gov.nist.javax.sip.stack.SIPServerTransaction;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+
+import javax.sip.*;
+import javax.sip.address.Address;
+import javax.sip.address.AddressFactory;
+import javax.sip.address.SipURI;
+import javax.sip.header.ContentTypeHeader;
+import javax.sip.header.HeaderFactory;
+import javax.sip.header.ViaHeader;
+import javax.sip.message.MessageFactory;
+import javax.sip.message.Request;
+import javax.sip.message.Response;
+import java.io.ByteArrayInputStream;
+import java.text.ParseException;
+
+/**
+ * @description:澶勭悊鎺ユ敹IPCamera鍙戞潵鐨凷IP鍗忚璇锋眰娑堟伅
+ * @author: songww
+ * @date: 2020骞�5鏈�3鏃� 涓嬪崍4:42:22
+ */
+public abstract class SIPRequestProcessorParent {
+
+ private final static Logger logger = LoggerFactory.getLogger(SIPRequestProcessorParent.class);
+
+ @Autowired
+ @Qualifier(value="tcpSipProvider")
+ private SipProviderImpl tcpSipProvider;
+
+ @Autowired
+ @Qualifier(value="udpSipProvider")
+ private SipProviderImpl udpSipProvider;
+
+ /**
+ * 鏍规嵁 RequestEvent 鑾峰彇 ServerTransaction
+ * @param evt
+ * @return
+ */
+ public ServerTransaction getServerTransaction(RequestEvent evt) {
+ Request request = evt.getRequest();
+ ServerTransaction serverTransaction = evt.getServerTransaction();
+ // 鍒ゆ柇TCP杩樻槸UDP
+ boolean isTcp = false;
+ ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
+ String transport = reqViaHeader.getTransport();
+ if (transport.equals("TCP")) {
+ isTcp = true;
+ }
+
+ if (serverTransaction == null) {
+ try {
+ if (isTcp) {
+ SipStackImpl stack = (SipStackImpl)tcpSipProvider.getSipStack();
+ serverTransaction = (SIPServerTransaction) stack.findTransaction((SIPRequest)request, true);
+ if (serverTransaction == null) {
+ serverTransaction = tcpSipProvider.getNewServerTransaction(request);
+ }
+ } else {
+ SipStackImpl stack = (SipStackImpl)udpSipProvider.getSipStack();
+ serverTransaction = (SIPServerTransaction) stack.findTransaction((SIPRequest)request, true);
+ if (serverTransaction == null) {
+ serverTransaction = udpSipProvider.getNewServerTransaction(request);
+ }
+ }
+ } catch (TransactionAlreadyExistsException e) {
+ logger.error(e.getMessage());
+ } catch (TransactionUnavailableException e) {
+ logger.error(e.getMessage());
+ }
+ }
+ return serverTransaction;
+ }
+
+ public AddressFactory getAddressFactory() {
+ try {
+ return SipFactory.getInstance().createAddressFactory();
+ } catch (PeerUnavailableException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public HeaderFactory getHeaderFactory() {
+ try {
+ return SipFactory.getInstance().createHeaderFactory();
+ } catch (PeerUnavailableException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public MessageFactory getMessageFactory() {
+ try {
+ return SipFactory.getInstance().createMessageFactory();
+ } catch (PeerUnavailableException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ /***
+ * 鍥炲鐘舵�佺爜
+ * 100 trying
+ * 200 OK
+ * 400
+ * 404
+ * @param evt
+ * @throws SipException
+ * @throws InvalidArgumentException
+ * @throws ParseException
+ */
+ public void responseAck(RequestEvent evt, int statusCode) throws SipException, InvalidArgumentException, ParseException {
+ Response response = getMessageFactory().createResponse(statusCode, evt.getRequest());
+ ServerTransaction serverTransaction = getServerTransaction(evt);
+ serverTransaction.sendResponse(response);
+ if (statusCode >= 200) {
+ if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete();
+ }
+ }
+
+ public void responseAck(RequestEvent evt, int statusCode, String msg) throws SipException, InvalidArgumentException, ParseException {
+ Response response = getMessageFactory().createResponse(statusCode, evt.getRequest());
+ response.setReasonPhrase(msg);
+ ServerTransaction serverTransaction = getServerTransaction(evt);
+ serverTransaction.sendResponse(response);
+ if (statusCode >= 200) {
+ if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete();
+ }
+ }
+
+ /**
+ * 鍥炲甯dp鐨�200
+ * @param evt
+ * @param sdp
+ * @throws SipException
+ * @throws InvalidArgumentException
+ * @throws ParseException
+ */
+ public void responseAck(RequestEvent evt, String sdp) throws SipException, InvalidArgumentException, ParseException {
+ Response response = getMessageFactory().createResponse(Response.OK, evt.getRequest());
+ SipFactory sipFactory = SipFactory.getInstance();
+ ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("APPLICATION", "SDP");
+ response.setContent(sdp, contentTypeHeader);
+
+ SipURI sipURI = (SipURI)evt.getRequest().getRequestURI();
+
+ Address concatAddress = sipFactory.createAddressFactory().createAddress(
+ sipFactory.createAddressFactory().createSipURI(sipURI.getUser(), sipURI.getHost()+":"+sipURI.getPort()
+ ));
+ response.addHeader(sipFactory.createHeaderFactory().createContactHeader(concatAddress));
+ getServerTransaction(evt).sendResponse(response);
+ }
+
+ public Element getRootElement(RequestEvent evt) throws DocumentException {
+ return getRootElement(evt, "gb2312");
+ }
+ public Element getRootElement(RequestEvent evt, String charset) throws DocumentException {
+ if (charset == null) charset = "gb2312";
+ Request request = evt.getRequest();
+ SAXReader reader = new SAXReader();
+ reader.setEncoding(charset);
+ Document xml = reader.read(new ByteArrayInputStream(request.getRawContent()));
+ return xml.getRootElement();
+ }
+
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
index 4121758..8363d6f 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
@@ -3,13 +3,15 @@
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
-import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorAbstract;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -29,7 +31,7 @@
* @date: 2020骞�5鏈�3鏃� 涓嬪崍5:31:45
*/
@Component
-public class AckRequestProcessor extends SIPRequestProcessorAbstract {
+public class AckRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
private Logger logger = LoggerFactory.getLogger(AckRequestProcessor.class);
private String method = "ACK";
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
index 275e2cf..c97b55a 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
@@ -5,7 +5,8 @@
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
-import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorAbstract;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
@@ -13,6 +14,7 @@
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -32,7 +34,7 @@
* @date: 2021骞�3鏈�9鏃�
*/
@Component
-public class ByeRequestProcessor extends SIPRequestProcessorAbstract {
+public class ByeRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
private Logger logger = LoggerFactory.getLogger(ByeRequestProcessor.class);
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/CancelRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/CancelRequestProcessor.java
index b2bd9d9..2e98e33 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/CancelRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/CancelRequestProcessor.java
@@ -1,7 +1,9 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
-import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorAbstract;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -13,7 +15,7 @@
* @date: 2020骞�5鏈�3鏃� 涓嬪崍5:32:23
*/
@Component
-public class CancelRequestProcessor extends SIPRequestProcessorAbstract {
+public class CancelRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
private String method = "CANCEL";
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
index 6984fab..5eda75d 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
@@ -4,7 +4,8 @@
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;
-import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorAbstract;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
@@ -16,6 +17,7 @@
import gov.nist.javax.sip.address.SipUri;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -38,7 +40,7 @@
*/
@SuppressWarnings("rawtypes")
@Component
-public class InviteRequestProcessor extends SIPRequestProcessorAbstract {
+public class InviteRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
private final static Logger logger = LoggerFactory.getLogger(InviteRequestProcessor.class);
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/MessageRequestProcessor1.java
similarity index 98%
rename from src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/MessageRequestProcessor.java
rename to src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/MessageRequestProcessor1.java
index f4d2b86..847f7e1 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/MessageRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/MessageRequestProcessor1.java
@@ -15,7 +15,8 @@
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;
-import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorAbstract;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.gb28181.utils.DateUtil;
import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;
import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
@@ -33,6 +34,7 @@
import org.dom4j.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
@@ -44,24 +46,24 @@
import javax.sip.header.ToHeader;
import javax.sip.message.Response;
import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
/**
- * @description:MESSAGE璇锋眰澶勭悊鍣�
- * @author: swwheihei
- * @date: 2020骞�5鏈�3鏃� 涓嬪崍5:32:41
+ * @description: MESSAGE璇锋眰鍒嗗彂澶勭悊鍣紝
+ * @author: panlinlin
+ * @date: 2021骞�11鏈�8鏃� 10锛�28
*/
@SuppressWarnings(value={"unchecked", "rawtypes"})
@Component
-public class MessageRequestProcessor extends SIPRequestProcessorAbstract {
+public class MessageRequestProcessor1 extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
public static volatile List<String> threadNameList = new ArrayList();
- private final static Logger logger = LoggerFactory.getLogger(MessageRequestProcessor.class);
+ private final static Logger logger = LoggerFactory.getLogger(MessageRequestProcessor1.class);
+ private static Map<String, ISIPRequestProcessor> messageHandlerMap = new ConcurrentHashMap<>();
+
private final static String CACHE_RECORDINFO_KEY = "CACHE_RECORDINFO_";
private static final String MESSAGE_KEEP_ALIVE = "Keepalive";
@@ -77,7 +79,7 @@
private static final String MESSAGE_DEVICE_CONFIG = "DeviceConfig";
private static final String MESSAGE_MOBILE_POSITION = "MobilePosition";
private static final String MESSAGE_PRESET_QUERY = "PresetQuery";
- private String method = "MESSAGE";
+ private String method = "MESSAGE1111";
@Autowired
private UserSetup userSetup;
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
index 88bf45a..5347d7d 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
@@ -8,7 +8,8 @@
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
-import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorAbstract;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;
import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
@@ -20,6 +21,7 @@
import org.dom4j.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
@@ -38,7 +40,7 @@
* @date: 2021骞�1鏈�27鏃�
*/
@Component
-public class NotifyRequestProcessor extends SIPRequestProcessorAbstract {
+public class NotifyRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
private final static Logger logger = LoggerFactory.getLogger(NotifyRequestProcessor.class);
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 e16043d..10e99cb 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
@@ -8,7 +8,8 @@
import com.genersoft.iot.vmp.gb28181.bean.WvpSipDate;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
-import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorAbstract;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import gov.nist.javax.sip.RequestEventExt;
import gov.nist.javax.sip.address.AddressImpl;
@@ -17,6 +18,7 @@
import gov.nist.javax.sip.header.SIPDateHeader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
@@ -39,7 +41,7 @@
* @date: 2020骞�5鏈�3鏃� 涓嬪崍4:47:25
*/
@Component
-public class RegisterRequestProcessor extends SIPRequestProcessorAbstract {
+public class RegisterRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
private Logger logger = LoggerFactory.getLogger(RegisterRequestProcessor.class);
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
index d5f582c..ba835db 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
@@ -1,9 +1,11 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
-import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorAbstract;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -22,7 +24,7 @@
* @date: 2020骞�5鏈�3鏃� 涓嬪崍5:31:20
*/
@Component
-public class SubscribeRequestProcessor extends SIPRequestProcessorAbstract {
+public class SubscribeRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
private Logger logger = LoggerFactory.getLogger(SubscribeRequestProcessor.class);
private String method = "SUBSCRIBE";
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/IMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/IMessageHandler.java
new file mode 100644
index 0000000..7eba0d5
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/IMessageHandler.java
@@ -0,0 +1,23 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message;
+
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import org.dom4j.Element;
+
+import javax.sip.RequestEvent;
+
+public interface IMessageHandler {
+ /**
+ * 澶勭悊鏉ヨ嚜璁惧鐨勪俊鎭�
+ * @param evt
+ * @param device
+ */
+ void handForDevice(RequestEvent evt, Device device, Element element);
+
+ /**
+ * 澶勭悊鏉ヨ嚜骞冲彴鐨勪俊鎭�
+ * @param evt
+ * @param parentPlatform
+ */
+ void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element element);
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java
new file mode 100644
index 0000000..efc8259
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java
@@ -0,0 +1,43 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message;
+
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import org.dom4j.Element;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.sip.RequestEvent;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
+
+public abstract class MessageHandlerAbstract extends SIPRequestProcessorParent implements IMessageHandler{
+
+ public static Map<String, IMessageHandler> messageHandlerMap = new ConcurrentHashMap<>();
+
+ @Autowired
+ public MessageRequestProcessor messageRequestProcessor;
+
+ public void addHandler(String cmdType, IMessageHandler messageHandler) {
+ messageHandlerMap.put(cmdType, messageHandler);
+ }
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element element) {
+ String cmd = getText(element, "CmdType");
+ IMessageHandler messageHandler = messageHandlerMap.get(cmd);
+ if (messageHandler != null) {
+ messageHandler.handForDevice(evt, device, element);
+ }
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element element) {
+ String cmd = getText(element, "CmdType");
+ IMessageHandler messageHandler = messageHandlerMap.get(cmd);
+ if (messageHandler != null) {
+ messageHandler.handForPlatform(evt, parentPlatform, element);
+ }
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java
new file mode 100644
index 0000000..241ee68
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java
@@ -0,0 +1,91 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message;
+
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.sip.InvalidArgumentException;
+import javax.sip.RequestEvent;
+import javax.sip.SipException;
+import javax.sip.message.Response;
+import java.text.ParseException;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Component
+public class MessageRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
+
+ private final static Logger logger = LoggerFactory.getLogger(MessageRequestProcessor.class);
+
+ private final String method = "MESSAGE";
+
+ private static Map<String, IMessageHandler> messageHandlerMap = new ConcurrentHashMap<>();
+
+ @Autowired
+ private SIPProcessorObserver sipProcessorObserver;
+
+ @Autowired
+ private IVideoManagerStorager storage;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ // 娣诲姞娑堟伅澶勭悊鐨勮闃�
+ sipProcessorObserver.addRequestProcessor(method, this);
+ }
+
+ public void addHandler(String name, IMessageHandler handler) {
+ messageHandlerMap.put(name, handler);
+ }
+
+ @Override
+ public void process(RequestEvent evt) {
+ logger.debug("鎺ユ敹鍒版秷鎭細" + evt.getRequest());
+ String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
+ // 鏌ヨ璁惧鏄惁瀛樺湪
+ Device device = storage.queryVideoDevice(deviceId);
+ // 鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪
+ ParentPlatform parentPlatform = storage.queryParentPlatByServerGBId(deviceId);
+ try {
+ if (device == null && parentPlatform == null) {
+ // 涓嶅瓨鍦ㄥ垯鍥炲404
+ responseAck(evt, Response.NOT_FOUND, "device id not found");
+ }else {
+ Element rootElement = getRootElement(evt);
+ String name = rootElement.getName();
+ IMessageHandler messageHandler = messageHandlerMap.get(name);
+ if (messageHandler != null) {
+ if (device != null) {
+ messageHandler.handForDevice(evt, device, rootElement);
+ }else { // 鐢变簬涓婇潰宸茬粡鍒ゆ柇閮戒负null鍒欑洿鎺ヨ繑鍥烇紝鎵�浠ヨ繖閲宒evice鍜宲arentPlatform蹇呮湁涓�涓笉涓簄ull
+ messageHandler.handForPlatform(evt, parentPlatform, rootElement);
+ }
+ }else {
+ // 涓嶆敮鎸佺殑message
+ // 涓嶅瓨鍦ㄥ垯鍥炲415
+ responseAck(evt, Response.UNSUPPORTED_MEDIA_TYPE, "Unsupported message type, must Control/Notify/Query/Response");
+ }
+ }
+ } catch (SipException e) {
+ logger.warn("SIP 鍥炲閿欒", e);
+ } catch (InvalidArgumentException e) {
+ logger.warn("鍙傛暟鏃犳晥", e);
+ } catch (ParseException e) {
+ logger.warn("SIP鍥炲鏃惰В鏋愬紓甯�", e);
+ } catch (DocumentException e) {
+ logger.warn("瑙ｆ瀽XML娑堟伅鍐呭寮傚父", e);
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/ControlMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/ControlMessageHandler.java
new file mode 100644
index 0000000..b533082
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/ControlMessageHandler.java
@@ -0,0 +1,21 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.control;
+
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.MessageHandlerAbstract;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.MessageRequestProcessor;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ControlMessageHandler extends MessageHandlerAbstract implements InitializingBean {
+
+ private final String messageType = "Control";
+
+ @Autowired
+ private MessageRequestProcessor messageRequestProcessor;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ messageRequestProcessor.addHandler(messageType, this);
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/NotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/NotifyMessageHandler.java
new file mode 100644
index 0000000..56c020b
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/NotifyMessageHandler.java
@@ -0,0 +1,16 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify;
+
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.MessageHandlerAbstract;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.stereotype.Component;
+
+@Component
+public class NotifyMessageHandler extends MessageHandlerAbstract implements InitializingBean {
+
+ private final String messageType = "Notify";
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ messageRequestProcessor.addHandler(messageType, this);
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmMessageHandler.java
new file mode 100644
index 0000000..b59c040
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmMessageHandler.java
@@ -0,0 +1,112 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.cmd;
+
+import com.genersoft.iot.vmp.conf.UserSetup;
+import com.genersoft.iot.vmp.gb28181.bean.*;
+import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;
+import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.NotifyMessageHandler;
+import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;
+import com.genersoft.iot.vmp.service.IDeviceAlarmService;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.utils.GpsUtil;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+
+import javax.sip.RequestEvent;
+
+import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
+
+public class AlarmMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(AlarmMessageHandler.class);
+ private final String cmdType = "Alarm";
+
+ @Autowired
+ private NotifyMessageHandler notifyMessageHandler;
+
+ @Autowired
+ private EventPublisher publisher;
+
+ @Autowired
+ private UserSetup userSetup;
+
+ @Autowired
+ private IVideoManagerStorager storager;
+
+ @Autowired
+ private IDeviceAlarmService deviceAlarmService;
+
+ @Autowired
+ private DeviceOffLineDetector offLineDetector;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ notifyMessageHandler.addHandler(cmdType, this);
+ }
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element rootElement) {
+ Element deviceIdElement = rootElement.element("DeviceID");
+ String channelId = deviceIdElement.getText().toString();
+ DeviceAlarm deviceAlarm = new DeviceAlarm();
+ deviceAlarm.setDeviceId(device.getDeviceId());
+ deviceAlarm.setChannelId(channelId);
+ deviceAlarm.setAlarmPriority(getText(rootElement, "AlarmPriority"));
+ deviceAlarm.setAlarmMethod(getText(rootElement, "AlarmMethod"));
+ deviceAlarm.setAlarmTime(getText(rootElement, "AlarmTime"));
+ if (getText(rootElement, "AlarmDescription") == null) {
+ deviceAlarm.setAlarmDescription("");
+ } else {
+ deviceAlarm.setAlarmDescription(getText(rootElement, "AlarmDescription"));
+ }
+ if (NumericUtil.isDouble(getText(rootElement, "Longitude"))) {
+ deviceAlarm.setLongitude(Double.parseDouble(getText(rootElement, "Longitude")));
+ } else {
+ deviceAlarm.setLongitude(0.00);
+ }
+ if (NumericUtil.isDouble(getText(rootElement, "Latitude"))) {
+ deviceAlarm.setLatitude(Double.parseDouble(getText(rootElement, "Latitude")));
+ } else {
+ deviceAlarm.setLatitude(0.00);
+ }
+
+ if (!StringUtils.isEmpty(deviceAlarm.getAlarmMethod())) {
+ if ( deviceAlarm.getAlarmMethod().equals("4")) {
+ MobilePosition mobilePosition = new MobilePosition();
+ mobilePosition.setDeviceId(deviceAlarm.getDeviceId());
+ mobilePosition.setTime(deviceAlarm.getAlarmTime());
+ mobilePosition.setLongitude(deviceAlarm.getLongitude());
+ mobilePosition.setLatitude(deviceAlarm.getLatitude());
+ mobilePosition.setReportSource("GPS Alarm");
+ BaiduPoint bp = new BaiduPoint();
+ bp = GpsUtil.Wgs84ToBd09(String.valueOf(mobilePosition.getLongitude()), String.valueOf(mobilePosition.getLatitude()));
+ logger.info("鐧惧害鍧愭爣锛�" + bp.getBdLng() + ", " + bp.getBdLat());
+ mobilePosition.setGeodeticSystem("BD-09");
+ mobilePosition.setCnLng(bp.getBdLng());
+ mobilePosition.setCnLat(bp.getBdLat());
+ if (!userSetup.getSavePositionHistory()) {
+ storager.clearMobilePositionsByDeviceId(device.getDeviceId());
+ }
+ storager.insertMobilePosition(mobilePosition);
+ }
+ }
+ logger.debug("瀛樺偍鎶ヨ淇℃伅銆佹姤璀﹀垎绫�");
+ // 瀛樺偍鎶ヨ淇℃伅銆佹姤璀﹀垎绫�
+ deviceAlarmService.add(deviceAlarm);
+
+ if (offLineDetector.isOnline(device.getDeviceId())) {
+ publisher.deviceAlarmEventPublish(deviceAlarm);
+ }
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element element) {
+
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveMessageHandler.java
new file mode 100644
index 0000000..a2f6ec5
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveMessageHandler.java
@@ -0,0 +1,61 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.cmd;
+
+import com.genersoft.iot.vmp.common.VideoManagerConstants;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.NotifyMessageHandler;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.sip.InvalidArgumentException;
+import javax.sip.RequestEvent;
+import javax.sip.SipException;
+import javax.sip.message.Response;
+import java.text.ParseException;
+
+public class KeepaliveMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(KeepaliveMessageHandler.class);
+ private final String cmdType = "Keepalive";
+
+ @Autowired
+ private NotifyMessageHandler notifyMessageHandler;
+
+ @Autowired
+ private EventPublisher publisher;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ notifyMessageHandler.addHandler(cmdType, this);
+ }
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element element) {
+ // 妫�鏌ヨ澶囨槸鍚﹀瓨鍦ㄥ苟鍦ㄧ嚎锛� 涓嶅湪绾垮垯璁剧疆涓哄湪绾�
+ try {
+ if (device != null ) {
+ // 鍥炲200 OK
+ responseAck(evt, Response.OK);
+ publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
+ }
+ } catch (SipException e) {
+ e.printStackTrace();
+ } catch (InvalidArgumentException e) {
+ e.printStackTrace();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element element) {
+ // 涓嶄細鏀跺埌涓婄骇骞冲彴鐨勫績璺充俊鎭�
+
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusMessageHandler.java
new file mode 100644
index 0000000..b2e6ea5
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusMessageHandler.java
@@ -0,0 +1,73 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.cmd;
+
+import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.NotifyMessageHandler;
+import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.sip.InvalidArgumentException;
+import javax.sip.RequestEvent;
+import javax.sip.SipException;
+import javax.sip.message.Response;
+
+import java.text.ParseException;
+
+import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
+
+public class MediaStatusMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(MediaStatusMessageHandler.class);
+ private final String cmdType = "MediaStatus";
+
+ @Autowired
+ private NotifyMessageHandler notifyMessageHandler;
+
+ @Autowired
+ private SIPCommander cmder;
+
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ notifyMessageHandler.addHandler(cmdType, this);
+ }
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element rootElement) {
+
+ // 鍥炲200 OK
+ try {
+ responseAck(evt, Response.OK);
+ } catch (SipException e) {
+ e.printStackTrace();
+ } catch (InvalidArgumentException e) {
+ e.printStackTrace();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ String NotifyType =getText(rootElement, "NotifyType");
+ if (NotifyType.equals("121")){
+ logger.info("濯掍綋鎾斁瀹屾瘯锛岄�氱煡鍏虫祦");
+ StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(device.getDeviceId(), "*");
+ if (streamInfo != null) {
+ redisCatchStorage.stopPlayback(streamInfo);
+ cmder.streamByeCmd(streamInfo.getDeviceID(), streamInfo.getChannelId());
+ }
+ }
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element element) {
+
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MobilePositionMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MobilePositionMessageHandler.java
new file mode 100644
index 0000000..bbc4df8
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MobilePositionMessageHandler.java
@@ -0,0 +1,101 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.cmd;
+
+import com.genersoft.iot.vmp.conf.UserSetup;
+import com.genersoft.iot.vmp.gb28181.bean.BaiduPoint;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.NotifyMessageHandler;
+import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.utils.GpsUtil;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+
+import javax.sip.InvalidArgumentException;
+import javax.sip.RequestEvent;
+import javax.sip.SipException;
+import javax.sip.message.Response;
+import java.text.ParseException;
+
+import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
+
+public class MobilePositionMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(MobilePositionMessageHandler.class);
+ private final String cmdType = "MobilePosition";
+
+ @Autowired
+ private NotifyMessageHandler notifyMessageHandler;
+
+ @Autowired
+ private UserSetup userSetup;
+
+ @Autowired
+ private IVideoManagerStorager storager;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ notifyMessageHandler.addHandler(cmdType, this);
+ }
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element rootElement) {
+
+ try {
+ rootElement = getRootElement(evt, device.getCharset());
+
+ MobilePosition mobilePosition = new MobilePosition();
+ if (!StringUtils.isEmpty(device.getName())) {
+ mobilePosition.setDeviceName(device.getName());
+ }
+ mobilePosition.setDeviceId(device.getDeviceId());
+ mobilePosition.setChannelId(getText(rootElement, "DeviceID"));
+ mobilePosition.setTime(getText(rootElement, "Time"));
+ mobilePosition.setLongitude(Double.parseDouble(getText(rootElement, "Longitude")));
+ mobilePosition.setLatitude(Double.parseDouble(getText(rootElement, "Latitude")));
+ if (NumericUtil.isDouble(getText(rootElement, "Speed"))) {
+ mobilePosition.setSpeed(Double.parseDouble(getText(rootElement, "Speed")));
+ } else {
+ mobilePosition.setSpeed(0.0);
+ }
+ if (NumericUtil.isDouble(getText(rootElement, "Direction"))) {
+ mobilePosition.setDirection(Double.parseDouble(getText(rootElement, "Direction")));
+ } else {
+ mobilePosition.setDirection(0.0);
+ }
+ if (NumericUtil.isDouble(getText(rootElement, "Altitude"))) {
+ mobilePosition.setAltitude(Double.parseDouble(getText(rootElement, "Altitude")));
+ } else {
+ mobilePosition.setAltitude(0.0);
+ }
+ mobilePosition.setReportSource("Mobile Position");
+ BaiduPoint bp = new BaiduPoint();
+ bp = GpsUtil.Wgs84ToBd09(String.valueOf(mobilePosition.getLongitude()), String.valueOf(mobilePosition.getLatitude()));
+ logger.info("鐧惧害鍧愭爣锛�" + bp.getBdLng() + ", " + bp.getBdLat());
+ mobilePosition.setGeodeticSystem("BD-09");
+ mobilePosition.setCnLng(bp.getBdLng());
+ mobilePosition.setCnLat(bp.getBdLat());
+ if (!userSetup.getSavePositionHistory()) {
+ storager.clearMobilePositionsByDeviceId(device.getDeviceId());
+ }
+ storager.insertMobilePosition(mobilePosition);
+ //鍥炲 200 OK
+ responseAck(evt, Response.OK);
+ } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element element) {
+
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/QueryMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/QueryMessageHandler.java
new file mode 100644
index 0000000..ab111b5
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/QueryMessageHandler.java
@@ -0,0 +1,21 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.query;
+
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.MessageHandlerAbstract;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.MessageRequestProcessor;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class QueryMessageHandler extends MessageHandlerAbstract implements InitializingBean {
+
+ private final String messageType = "Query";
+
+ @Autowired
+ private MessageRequestProcessor messageRequestProcessor;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ messageRequestProcessor.addHandler(messageType, this);
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogMessageHandler.java
new file mode 100644
index 0000000..e4b1e19
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogMessageHandler.java
@@ -0,0 +1,118 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.query.cmd;
+
+import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.query.QueryMessageHandler;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.sip.InvalidArgumentException;
+import javax.sip.RequestEvent;
+import javax.sip.SipException;
+import javax.sip.header.FromHeader;
+import javax.sip.message.Response;
+import java.text.ParseException;
+import java.util.List;
+
+public class CatalogMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(CatalogMessageHandler.class);
+ private final String cmdType = "Catalog";
+
+ @Autowired
+ private QueryMessageHandler queryMessageHandler;
+
+ @Autowired
+ private IVideoManagerStorager storager;
+
+ @Autowired
+ private SIPCommanderFroPlatform cmderFroPlatform;
+
+ @Autowired
+ private SipConfig config;
+
+ @Autowired
+ private EventPublisher publisher;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ queryMessageHandler.addHandler(cmdType, this);
+ }
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element element) {
+
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element rootElement) {
+
+ String key = DeferredResultHolder.CALLBACK_CMD_CATALOG + parentPlatform.getServerGBId();
+ FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
+ try {
+ // 鍥炲200 OK
+ responseAck(evt, Response.OK);
+ Element snElement = rootElement.element("SN");
+ String sn = snElement.getText();
+ // 鍑嗗鍥炲閫氶亾淇℃伅
+ List<ChannelReduce> channelReduces = storager.queryChannelListInParentPlatform(parentPlatform.getServerGBId());
+ // 鏌ヨ鍏宠仈鐨勭洿鎾�氶亾
+ List<GbStream> gbStreams = storager.queryGbStreamListInPlatform(parentPlatform.getServerGBId());
+ int size = channelReduces.size() + gbStreams.size();
+ // 鍥炲绾ц仈鐨勯�氶亾
+ if (channelReduces.size() > 0) {
+ for (ChannelReduce channelReduce : channelReduces) {
+ DeviceChannel deviceChannel = storager.queryChannel(channelReduce.getDeviceId(), channelReduce.getChannelId());
+ cmderFroPlatform.catalogQuery(deviceChannel, parentPlatform, sn, fromHeader.getTag(), size);
+ }
+ }
+ // 鍥炲鐩存挱鐨勯�氶亾
+ if (gbStreams.size() > 0) {
+ for (GbStream gbStream : gbStreams) {
+ DeviceChannel deviceChannel = new DeviceChannel();
+ deviceChannel.setChannelId(gbStream.getGbId());
+ deviceChannel.setName(gbStream.getName());
+ deviceChannel.setLongitude(gbStream.getLongitude());
+ deviceChannel.setLatitude(gbStream.getLatitude());
+ deviceChannel.setDeviceId(parentPlatform.getDeviceGBId());
+ deviceChannel.setManufacture("wvp-pro");
+ deviceChannel.setStatus(gbStream.isStatus()?1:0);
+ // deviceChannel.setParentId(parentPlatform.getDeviceGBId());
+ deviceChannel.setRegisterWay(1);
+ deviceChannel.setCivilCode(config.getDomain());
+ deviceChannel.setModel("live");
+ deviceChannel.setOwner("wvp-pro");
+ deviceChannel.setParental(0);
+ deviceChannel.setSecrecy("0");
+ deviceChannel.setSecrecy("0");
+
+ cmderFroPlatform.catalogQuery(deviceChannel, parentPlatform, sn, fromHeader.getTag(), size);
+ }
+ }
+ if (size == 0) {
+ // 鍥炲鏃犻�氶亾
+ cmderFroPlatform.catalogQuery(null, parentPlatform, sn, fromHeader.getTag(), size);
+ }
+ } catch (SipException e) {
+ e.printStackTrace();
+ } catch (InvalidArgumentException e) {
+ e.printStackTrace();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/DeviceControlMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/DeviceControlMessageHandler.java
new file mode 100644
index 0000000..da8832a
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/DeviceControlMessageHandler.java
@@ -0,0 +1,109 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.query.cmd;
+
+import com.genersoft.iot.vmp.VManageBootstrap;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.query.QueryMessageHandler;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.utils.SpringBeanFactory;
+import gov.nist.javax.sip.SipStackImpl;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+
+import javax.sip.ListeningPoint;
+import javax.sip.ObjectInUseException;
+import javax.sip.RequestEvent;
+import javax.sip.SipProvider;
+import javax.sip.address.SipURI;
+import javax.sip.header.HeaderAddress;
+import javax.sip.header.ToHeader;
+import java.util.Iterator;
+
+import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
+
+public class DeviceControlMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(DeviceControlMessageHandler.class);
+ private final String cmdType = "DeviceControl";
+
+ @Autowired
+ private QueryMessageHandler queryMessageHandler;
+
+ @Autowired
+ private IVideoManagerStorager storager;
+
+ @Autowired
+ private SIPCommander cmder;
+
+ @Autowired
+ private SIPCommanderFroPlatform cmderFroPlatform;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ queryMessageHandler.addHandler(cmdType, this);
+ }
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element element) {
+
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element rootElement) {
+
+ // 姝ゅ鏄笂绾у彂鍑虹殑DeviceControl鎸囦护
+ String targetGBId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();
+ String channelId = getText(rootElement, "DeviceID");
+ // 杩滅▼鍚姩鍔熻兘
+ if (!StringUtils.isEmpty(getText(rootElement, "TeleBoot"))) {
+ if (parentPlatform.getServerGBId().equals(targetGBId)) {
+ // 杩滅▼鍚姩鏈钩鍙帮細闇�瑕佸湪閲嶆柊鍚姩绋嬪簭鍚庡厛瀵筍ipStack瑙ｇ粦
+ logger.info("鎵ц杩滅▼鍚姩鏈钩鍙板懡浠�");
+ cmderFroPlatform.unregister(parentPlatform, null, null);
+
+ Thread restartThread = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(3000);
+ SipProvider up = (SipProvider) SpringBeanFactory.getBean("udpSipProvider");
+ SipStackImpl stack = (SipStackImpl)up.getSipStack();
+ stack.stop();
+ Iterator listener = stack.getListeningPoints();
+ while (listener.hasNext()) {
+ stack.deleteListeningPoint((ListeningPoint) listener.next());
+ }
+ Iterator providers = stack.getSipProviders();
+ while (providers.hasNext()) {
+ stack.deleteSipProvider((SipProvider) providers.next());
+ }
+ VManageBootstrap.restart();
+ } catch (InterruptedException ignored) {
+ } catch (ObjectInUseException e) {
+ e.printStackTrace();
+ }
+ }
+ });
+
+ restartThread.setDaemon(false);
+ restartThread.start();
+ } else {
+ // 杩滅▼鍚姩鎸囧畾璁惧
+ }
+ }
+ // 浜戝彴/鍓嶇鎺у埗鍛戒护
+ if (!StringUtils.isEmpty(getText(rootElement,"PTZCmd")) && !parentPlatform.getServerGBId().equals(targetGBId)) {
+ String cmdString = getText(rootElement,"PTZCmd");
+ Device deviceForPlatform = storager.queryVideoDeviceByPlatformIdAndChannelId(parentPlatform.getServerGBId(), channelId);
+ cmder.fronEndCmd(deviceForPlatform, channelId, cmdString);
+ }
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/DeviceInfoMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/DeviceInfoMessageHandler.java
new file mode 100644
index 0000000..bbd7f4d
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/DeviceInfoMessageHandler.java
@@ -0,0 +1,60 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.query.cmd;
+
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.query.QueryMessageHandler;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.sip.InvalidArgumentException;
+import javax.sip.RequestEvent;
+import javax.sip.SipException;
+import javax.sip.header.FromHeader;
+import javax.sip.message.Response;
+import java.text.ParseException;
+
+public class DeviceInfoMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(DeviceInfoMessageHandler.class);
+ private final String cmdType = "DeviceInfo";
+
+ @Autowired
+ private QueryMessageHandler queryMessageHandler;
+
+ @Autowired
+ private SIPCommanderFroPlatform cmderFroPlatform;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ queryMessageHandler.addHandler(cmdType, this);
+ }
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element rootElement) {
+
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element rootElement) {
+ logger.info("鎺ユ敹鍒癉eviceInfo鏌ヨ娑堟伅");
+ FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
+ try {
+ // 鍥炲200 OK
+ responseAck(evt, Response.OK);
+ } catch (SipException e) {
+ e.printStackTrace();
+ } catch (InvalidArgumentException e) {
+ e.printStackTrace();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ String sn = rootElement.element("SN").getText();
+ cmderFroPlatform.deviceInfoResponse(parentPlatform, sn, fromHeader.getTag());
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/DeviceStatusMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/DeviceStatusMessageHandler.java
new file mode 100644
index 0000000..e4d973f
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/DeviceStatusMessageHandler.java
@@ -0,0 +1,73 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.query.cmd;
+
+import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.query.QueryMessageHandler;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.sip.InvalidArgumentException;
+import javax.sip.RequestEvent;
+import javax.sip.SipException;
+import javax.sip.header.FromHeader;
+import javax.sip.message.Response;
+import java.text.ParseException;
+
+public class DeviceStatusMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(DeviceStatusMessageHandler.class);
+ private final String cmdType = "DeviceStatus";
+
+ @Autowired
+ private QueryMessageHandler queryMessageHandler;
+
+ @Autowired
+ private IVideoManagerStorager storager;
+
+ @Autowired
+ private SIPCommanderFroPlatform cmderFroPlatform;
+
+ @Autowired
+ private SipConfig config;
+
+ @Autowired
+ private EventPublisher publisher;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ queryMessageHandler.addHandler(cmdType, this);
+ }
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element element) {
+
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element rootElement) {
+
+ logger.info("鎺ユ敹鍒癉eviceStatus鏌ヨ娑堟伅");
+ FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
+ // 鍥炲200 OK
+ try {
+ responseAck(evt, Response.OK);
+ } catch (SipException e) {
+ e.printStackTrace();
+ } catch (InvalidArgumentException e) {
+ e.printStackTrace();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ String sn = rootElement.element("SN").getText();
+ cmderFroPlatform.deviceStatusResponse(parentPlatform, sn, fromHeader.getTag());
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/ResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/ResponseMessageHandler.java
new file mode 100644
index 0000000..13c8ac7
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/ResponseMessageHandler.java
@@ -0,0 +1,21 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response;
+
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.MessageHandlerAbstract;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.MessageRequestProcessor;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ResponseMessageHandler extends MessageHandlerAbstract implements InitializingBean {
+
+ private final String messageType = "Response";
+
+ @Autowired
+ private MessageRequestProcessor messageRequestProcessor;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ messageRequestProcessor.addHandler(messageType, this);
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/AlarmMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/AlarmMessageHandler.java
new file mode 100644
index 0000000..55c6dc9
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/AlarmMessageHandler.java
@@ -0,0 +1,58 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
+
+import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.ResponseMessageHandler;
+import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.sip.RequestEvent;
+
+@Component
+public class AlarmMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(AlarmMessageHandler.class);
+ private final String cmdType = "Alarm";
+
+ @Autowired
+ private ResponseMessageHandler responseMessageHandler;
+
+ @Autowired
+ private DeferredResultHolder deferredResultHolder;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ responseMessageHandler.addHandler(cmdType, this);
+ }
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element rootElement) {
+ Element deviceIdElement = rootElement.element("DeviceID");
+ String channelId = deviceIdElement.getText().toString();
+ String key = DeferredResultHolder.CALLBACK_CMD_ALARM + device.getDeviceId() + channelId;
+ JSONObject json = new JSONObject();
+ XmlUtil.node2Json(rootElement, json);
+ if (logger.isDebugEnabled()) {
+ logger.debug(json.toJSONString());
+ }
+ RequestMessage msg = new RequestMessage();
+ msg.setKey(key);
+ msg.setData(json);
+ deferredResultHolder.invokeAllResult(msg);
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element element) {
+
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastMessageHandler.java
new file mode 100644
index 0000000..35157c4
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastMessageHandler.java
@@ -0,0 +1,72 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
+
+import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.ResponseMessageHandler;
+import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.sip.InvalidArgumentException;
+import javax.sip.RequestEvent;
+import javax.sip.SipException;
+import javax.sip.message.Response;
+import java.text.ParseException;
+
+import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
+
+@Component
+public class BroadcastMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(BroadcastMessageHandler.class);
+ private final String cmdType = "Broadcast";
+
+ @Autowired
+ private ResponseMessageHandler responseMessageHandler;
+
+ @Autowired
+ private DeferredResultHolder deferredResultHolder;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ responseMessageHandler.addHandler(cmdType, this);
+ }
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element rootElement) {
+ try {
+ String channelId = getText(rootElement, "DeviceID");
+ String key = DeferredResultHolder.CALLBACK_CMD_BROADCAST + device.getDeviceId() + channelId;
+ // 鍥炲200 OK
+ responseAck(evt, Response.OK);
+ // 姝ゅ鏄鏈钩鍙板彂鍑築roadcast鎸囦护鐨勫簲绛�
+ JSONObject json = new JSONObject();
+ XmlUtil.node2Json(rootElement, json);
+ if (logger.isDebugEnabled()) {
+ logger.debug(json.toJSONString());
+ }
+ RequestMessage msg = new RequestMessage();
+ msg.setKey(key);
+ msg.setData(json);
+ deferredResultHolder.invokeAllResult(msg);
+
+
+ } catch (ParseException | SipException | InvalidArgumentException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element element) {
+
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogMessageHandler.java
new file mode 100644
index 0000000..5c027aa
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogMessageHandler.java
@@ -0,0 +1,182 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
+
+import com.genersoft.iot.vmp.common.VideoManagerConstants;
+import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;
+import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.ResponseMessageHandler;
+import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.sip.InvalidArgumentException;
+import javax.sip.RequestEvent;
+import javax.sip.SipException;
+import javax.sip.message.Response;
+import java.text.ParseException;
+import java.util.Iterator;
+
+import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
+
+@Component
+public class CatalogMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(CatalogMessageHandler.class);
+ private final String cmdType = "Catalog";
+
+ @Autowired
+ private ResponseMessageHandler responseMessageHandler;
+
+ @Autowired
+ private IVideoManagerStorager storager;
+
+ @Autowired
+ private DeferredResultHolder deferredResultHolder;
+
+ @Autowired
+ private DeviceOffLineDetector offLineDetector;
+
+ @Autowired
+ private SipConfig config;
+
+ @Autowired
+ private EventPublisher publisher;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ responseMessageHandler.addHandler(cmdType, this);
+ }
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element element) {
+ String key = DeferredResultHolder.CALLBACK_CMD_CATALOG + device.getDeviceId();
+ Element rootElement = null;
+ try {
+ rootElement = getRootElement(evt, device.getCharset());
+ Element deviceListElement = rootElement.element("DeviceList");
+ Iterator<Element> deviceListIterator = deviceListElement.elementIterator();
+ if (deviceListIterator != null) {
+
+ // 閬嶅巻DeviceList
+ while (deviceListIterator.hasNext()) {
+ Element itemDevice = deviceListIterator.next();
+ Element channelDeviceElement = itemDevice.element("DeviceID");
+ if (channelDeviceElement == null) {
+ continue;
+ }
+ String channelDeviceId = channelDeviceElement.getText();
+ Element channdelNameElement = itemDevice.element("Name");
+ String channelName = channdelNameElement != null ? channdelNameElement.getTextTrim().toString() : "";
+ Element statusElement = itemDevice.element("Status");
+ String status = statusElement != null ? statusElement.getText().toString() : "ON";
+ DeviceChannel deviceChannel = new DeviceChannel();
+ deviceChannel.setName(channelName);
+ deviceChannel.setChannelId(channelDeviceId);
+ // ONLINE OFFLINE HIKVISION DS-7716N-E4 NVR鐨勫吋瀹规�у鐞�
+ if (status.equals("ON") || status.equals("On") || status.equals("ONLINE")) {
+ deviceChannel.setStatus(1);
+ }
+ if (status.equals("OFF") || status.equals("Off") || status.equals("OFFLINE")) {
+ deviceChannel.setStatus(0);
+ }
+
+ deviceChannel.setManufacture(getText(itemDevice, "Manufacturer"));
+ deviceChannel.setModel(getText(itemDevice, "Model"));
+ deviceChannel.setOwner(getText(itemDevice, "Owner"));
+ deviceChannel.setCivilCode(getText(itemDevice, "CivilCode"));
+ deviceChannel.setBlock(getText(itemDevice, "Block"));
+ deviceChannel.setAddress(getText(itemDevice, "Address"));
+ if (getText(itemDevice, "Parental") == null || getText(itemDevice, "Parental") == "") {
+ deviceChannel.setParental(0);
+ } else {
+ deviceChannel.setParental(Integer.parseInt(getText(itemDevice, "Parental")));
+ }
+ deviceChannel.setParentId(getText(itemDevice, "ParentID"));
+ if (getText(itemDevice, "SafetyWay") == null || getText(itemDevice, "SafetyWay") == "") {
+ deviceChannel.setSafetyWay(0);
+ } else {
+ deviceChannel.setSafetyWay(Integer.parseInt(getText(itemDevice, "SafetyWay")));
+ }
+ if (getText(itemDevice, "RegisterWay") == null || getText(itemDevice, "RegisterWay") == "") {
+ deviceChannel.setRegisterWay(1);
+ } else {
+ deviceChannel.setRegisterWay(Integer.parseInt(getText(itemDevice, "RegisterWay")));
+ }
+ deviceChannel.setCertNum(getText(itemDevice, "CertNum"));
+ if (getText(itemDevice, "Certifiable") == null || getText(itemDevice, "Certifiable") == "") {
+ deviceChannel.setCertifiable(0);
+ } else {
+ deviceChannel.setCertifiable(Integer.parseInt(getText(itemDevice, "Certifiable")));
+ }
+ if (getText(itemDevice, "ErrCode") == null || getText(itemDevice, "ErrCode") == "") {
+ deviceChannel.setErrCode(0);
+ } else {
+ deviceChannel.setErrCode(Integer.parseInt(getText(itemDevice, "ErrCode")));
+ }
+ deviceChannel.setEndTime(getText(itemDevice, "EndTime"));
+ deviceChannel.setSecrecy(getText(itemDevice, "Secrecy"));
+ deviceChannel.setIpAddress(getText(itemDevice, "IPAddress"));
+ if (getText(itemDevice, "Port") == null || getText(itemDevice, "Port") == "") {
+ deviceChannel.setPort(0);
+ } else {
+ deviceChannel.setPort(Integer.parseInt(getText(itemDevice, "Port")));
+ }
+ deviceChannel.setPassword(getText(itemDevice, "Password"));
+ if (NumericUtil.isDouble(getText(itemDevice, "Longitude"))) {
+ deviceChannel.setLongitude(Double.parseDouble(getText(itemDevice, "Longitude")));
+ } else {
+ deviceChannel.setLongitude(0.00);
+ }
+ if (NumericUtil.isDouble(getText(itemDevice, "Latitude"))) {
+ deviceChannel.setLatitude(Double.parseDouble(getText(itemDevice, "Latitude")));
+ } else {
+ deviceChannel.setLatitude(0.00);
+ }
+ if (getText(itemDevice, "PTZType") == null || getText(itemDevice, "PTZType") == "") {
+ deviceChannel.setPTZType(0);
+ } else {
+ deviceChannel.setPTZType(Integer.parseInt(getText(itemDevice, "PTZType")));
+ }
+ deviceChannel.setHasAudio(true); // 榛樿鍚湁闊抽锛屾挱鏀炬椂鍐嶆鏌ユ槸鍚︽湁闊抽鍙婃槸鍚AC
+ storager.updateChannel(device.getDeviceId(), deviceChannel);
+ }
+
+ RequestMessage msg = new RequestMessage();
+ msg.setKey(key);
+ msg.setData(device);
+ deferredResultHolder.invokeAllResult(msg);
+ // 鍥炲200 OK
+ responseAck(evt, Response.OK);
+ if (offLineDetector.isOnline(device.getDeviceId())) {
+ publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_MESSAGE);
+ }
+ }
+ } catch (DocumentException e) {
+ e.printStackTrace();
+ } catch (InvalidArgumentException e) {
+ e.printStackTrace();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ } catch (SipException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element rootElement) {
+
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/ConfigDownloadMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/ConfigDownloadMessageHandler.java
new file mode 100644
index 0000000..62ce1f6
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/ConfigDownloadMessageHandler.java
@@ -0,0 +1,81 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
+
+import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.ResponseMessageHandler;
+import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.sip.InvalidArgumentException;
+import javax.sip.RequestEvent;
+import javax.sip.SipException;
+import javax.sip.message.Response;
+import java.text.ParseException;
+
+import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
+
+@Component
+public class ConfigDownloadMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(ConfigDownloadMessageHandler.class);
+ private final String cmdType = "ConfigDownload";
+
+ @Autowired
+ private ResponseMessageHandler responseMessageHandler;
+
+ @Autowired
+ private EventPublisher publisher;
+
+ @Autowired
+ private DeferredResultHolder deferredResultHolder;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ responseMessageHandler.addHandler(cmdType, this);
+ }
+
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element element) {
+ String channelId = getText(element, "DeviceID");
+ String key = DeferredResultHolder.CALLBACK_CMD_CONFIGDOWNLOAD + device.getDeviceId() + channelId;
+ try {
+ // 鍥炲200 OK
+ responseAck(evt, Response.OK);
+ // 姝ゅ鏄鏈钩鍙板彂鍑篋eviceControl鎸囦护鐨勫簲绛�
+ JSONObject json = new JSONObject();
+ XmlUtil.node2Json(element, json);
+ if (logger.isDebugEnabled()) {
+ logger.debug(json.toJSONString());
+ }
+ RequestMessage msg = new RequestMessage();
+ msg.setKey(key);
+ msg.setData(json);
+ deferredResultHolder.invokeAllResult(msg);
+ } catch (SipException e) {
+ e.printStackTrace();
+ } catch (InvalidArgumentException e) {
+ e.printStackTrace();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element element) {
+ // 涓嶄細鏀跺埌涓婄骇骞冲彴鐨勫績璺充俊鎭�
+
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceConfigMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceConfigMessageHandler.java
new file mode 100644
index 0000000..ac90893
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceConfigMessageHandler.java
@@ -0,0 +1,58 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
+
+import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.ResponseMessageHandler;
+import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.sip.RequestEvent;
+
+import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
+
+@Component
+public class DeviceConfigMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(DeviceConfigMessageHandler.class);
+ private final String cmdType = "DeviceConfig";
+
+ @Autowired
+ private ResponseMessageHandler responseMessageHandler;
+
+ @Autowired
+ private DeferredResultHolder deferredResultHolder;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ responseMessageHandler.addHandler(cmdType, this);
+ }
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element element) {
+ JSONObject json = new JSONObject();
+ XmlUtil.node2Json(element, json);
+ String channelId = getText(element, "DeviceID");
+ if (logger.isDebugEnabled()) {
+ logger.debug(json.toJSONString());
+ }
+ String key = DeferredResultHolder.CALLBACK_CMD_DEVICECONFIG + device.getDeviceId() + channelId;
+ RequestMessage msg = new RequestMessage();
+ msg.setKey(key);
+ msg.setData(json);
+ deferredResultHolder.invokeAllResult(msg);
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element rootElement) {
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceControlMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceControlMessageHandler.java
new file mode 100644
index 0000000..c94f1dc
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceControlMessageHandler.java
@@ -0,0 +1,59 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
+
+import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.ResponseMessageHandler;
+import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.sip.RequestEvent;
+
+import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
+
+@Component
+public class DeviceControlMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(DeviceControlMessageHandler.class);
+ private final String cmdType = "DeviceControl";
+
+ @Autowired
+ private ResponseMessageHandler responseMessageHandler;
+
+ @Autowired
+ private DeferredResultHolder deferredResultHolder;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ responseMessageHandler.addHandler(cmdType, this);
+ }
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element element) {
+ // 姝ゅ鏄鏈钩鍙板彂鍑篋eviceControl鎸囦护鐨勫簲绛�
+ JSONObject json = new JSONObject();
+ String channelId = getText(element, "DeviceID");
+ XmlUtil.node2Json(element, json);
+ if (logger.isDebugEnabled()) {
+ logger.debug(json.toJSONString());
+ }
+ RequestMessage msg = new RequestMessage();
+ String key = DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + device.getDeviceId() + channelId;
+ msg.setKey(key);
+ msg.setData(json);
+ deferredResultHolder.invokeAllResult(msg);
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element rootElement) {
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceInfoMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceInfoMessageHandler.java
new file mode 100644
index 0000000..cdc4db0
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceInfoMessageHandler.java
@@ -0,0 +1,103 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
+
+import com.genersoft.iot.vmp.common.VideoManagerConstants;
+import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;
+import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.ResponseMessageHandler;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import javax.sip.InvalidArgumentException;
+import javax.sip.RequestEvent;
+import javax.sip.SipException;
+import javax.sip.message.Response;
+import java.text.ParseException;
+
+import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
+
+@Component
+public class DeviceInfoMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(DeviceInfoMessageHandler.class);
+ private final String cmdType = "DeviceInfo";
+
+ @Autowired
+ private ResponseMessageHandler responseMessageHandler;
+
+ @Autowired
+ private IVideoManagerStorager storager;
+
+ @Autowired
+ private DeferredResultHolder deferredResultHolder;
+
+ @Autowired
+ private DeviceOffLineDetector offLineDetector;
+
+ @Autowired
+ private SipConfig config;
+
+ @Autowired
+ private EventPublisher publisher;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ responseMessageHandler.addHandler(cmdType, this);
+ }
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element rootElement) {
+ logger.debug("鎺ユ敹鍒癉eviceInfo搴旂瓟娑堟伅");
+ try {
+ rootElement = getRootElement(evt, device.getCharset());
+ Element deviceIdElement = rootElement.element("DeviceID");
+ String channelId = deviceIdElement.getTextTrim();
+ String key = DeferredResultHolder.CALLBACK_CMD_DEVICEINFO + device.getDeviceId() + channelId;
+ device.setName(getText(rootElement, "DeviceName"));
+
+ device.setManufacturer(getText(rootElement, "Manufacturer"));
+ device.setModel(getText(rootElement, "Model"));
+ device.setFirmware(getText(rootElement, "Firmware"));
+ if (StringUtils.isEmpty(device.getStreamMode())) {
+ device.setStreamMode("UDP");
+ }
+ storager.updateDevice(device);
+
+ RequestMessage msg = new RequestMessage();
+ msg.setKey(key);
+ msg.setData(device);
+ deferredResultHolder.invokeAllResult(msg);
+ // 鍥炲200 OK
+ responseAck(evt, Response.OK);
+ if (offLineDetector.isOnline(device.getDeviceId())) {
+ publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_MESSAGE);
+ }
+ } catch (DocumentException e) {
+ e.printStackTrace();
+ } catch (InvalidArgumentException e) {
+ e.printStackTrace();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ } catch (SipException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element rootElement) {
+
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceStatusMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceStatusMessageHandler.java
new file mode 100644
index 0000000..0be4873
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceStatusMessageHandler.java
@@ -0,0 +1,89 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
+
+import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.common.VideoManagerConstants;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;
+import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.ResponseMessageHandler;
+import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.sip.InvalidArgumentException;
+import javax.sip.RequestEvent;
+import javax.sip.SipException;
+import javax.sip.message.Response;
+import java.text.ParseException;
+
+@Component
+public class DeviceStatusMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(DeviceStatusMessageHandler.class);
+ private final String cmdType = "DeviceStatus";
+
+ @Autowired
+ private ResponseMessageHandler responseMessageHandler;
+
+ @Autowired
+ private DeviceOffLineDetector offLineDetector;
+
+ @Autowired
+ private DeferredResultHolder deferredResultHolder;
+
+ @Autowired
+ private EventPublisher publisher;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ responseMessageHandler.addHandler(cmdType, this);
+ }
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element element) {
+ logger.info("鎺ユ敹鍒癉eviceStatus搴旂瓟娑堟伅");
+ // 妫�鏌ヨ澶囨槸鍚﹀瓨鍦紝 涓嶅瓨鍦ㄥ垯涓嶅洖澶�
+ // 鍥炲200 OK
+ try {
+ responseAck(evt, Response.OK);
+ } catch (SipException e) {
+ e.printStackTrace();
+ } catch (InvalidArgumentException e) {
+ e.printStackTrace();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ Element deviceIdElement = element.element("DeviceID");
+ String channelId = deviceIdElement.getText();
+ JSONObject json = new JSONObject();
+ XmlUtil.node2Json(element, json);
+ if (logger.isDebugEnabled()) {
+ logger.debug(json.toJSONString());
+ }
+ RequestMessage msg = new RequestMessage();
+ msg.setKey(DeferredResultHolder.CALLBACK_CMD_DEVICESTATUS + device.getDeviceId() + channelId);
+ msg.setData(json);
+ deferredResultHolder.invokeAllResult(msg);
+
+ if (offLineDetector.isOnline(device.getDeviceId())) {
+ publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_MESSAGE);
+ } else {
+
+ }
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element rootElement) {
+
+
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/MobilePositionMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/MobilePositionMessageHandler.java
new file mode 100644
index 0000000..6d67291
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/MobilePositionMessageHandler.java
@@ -0,0 +1,103 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
+
+import com.genersoft.iot.vmp.conf.UserSetup;
+import com.genersoft.iot.vmp.gb28181.bean.BaiduPoint;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.ResponseMessageHandler;
+import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.utils.GpsUtil;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import javax.sip.InvalidArgumentException;
+import javax.sip.RequestEvent;
+import javax.sip.SipException;
+import javax.sip.message.Response;
+import java.text.ParseException;
+
+import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
+
+@Component
+public class MobilePositionMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(MobilePositionMessageHandler.class);
+ private final String cmdType = "MobilePosition";
+
+ @Autowired
+ private ResponseMessageHandler responseMessageHandler;
+
+ @Autowired
+ private UserSetup userSetup;
+
+ @Autowired
+ private IVideoManagerStorager storager;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ responseMessageHandler.addHandler(cmdType, this);
+ }
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element rootElement) {
+
+ try {
+ rootElement = getRootElement(evt, device.getCharset());
+
+ MobilePosition mobilePosition = new MobilePosition();
+ if (!StringUtils.isEmpty(device.getName())) {
+ mobilePosition.setDeviceName(device.getName());
+ }
+ mobilePosition.setDeviceId(device.getDeviceId());
+ mobilePosition.setChannelId(getText(rootElement, "DeviceID"));
+ mobilePosition.setTime(getText(rootElement, "Time"));
+ mobilePosition.setLongitude(Double.parseDouble(getText(rootElement, "Longitude")));
+ mobilePosition.setLatitude(Double.parseDouble(getText(rootElement, "Latitude")));
+ if (NumericUtil.isDouble(getText(rootElement, "Speed"))) {
+ mobilePosition.setSpeed(Double.parseDouble(getText(rootElement, "Speed")));
+ } else {
+ mobilePosition.setSpeed(0.0);
+ }
+ if (NumericUtil.isDouble(getText(rootElement, "Direction"))) {
+ mobilePosition.setDirection(Double.parseDouble(getText(rootElement, "Direction")));
+ } else {
+ mobilePosition.setDirection(0.0);
+ }
+ if (NumericUtil.isDouble(getText(rootElement, "Altitude"))) {
+ mobilePosition.setAltitude(Double.parseDouble(getText(rootElement, "Altitude")));
+ } else {
+ mobilePosition.setAltitude(0.0);
+ }
+ mobilePosition.setReportSource("Mobile Position");
+ BaiduPoint bp = new BaiduPoint();
+ bp = GpsUtil.Wgs84ToBd09(String.valueOf(mobilePosition.getLongitude()), String.valueOf(mobilePosition.getLatitude()));
+ logger.info("鐧惧害鍧愭爣锛�" + bp.getBdLng() + ", " + bp.getBdLat());
+ mobilePosition.setGeodeticSystem("BD-09");
+ mobilePosition.setCnLng(bp.getBdLng());
+ mobilePosition.setCnLat(bp.getBdLat());
+ if (!userSetup.getSavePositionHistory()) {
+ storager.clearMobilePositionsByDeviceId(device.getDeviceId());
+ }
+ storager.insertMobilePosition(mobilePosition);
+ //鍥炲 200 OK
+ responseAck(evt, Response.OK);
+ } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element element) {
+
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoMessageHandler.java
new file mode 100644
index 0000000..837c016
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoMessageHandler.java
@@ -0,0 +1,153 @@
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
+
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.bean.RecordInfo;
+import com.genersoft.iot.vmp.gb28181.bean.RecordItem;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.CheckForAllRecordsThread;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.ResponseMessageHandler;
+import com.genersoft.iot.vmp.gb28181.utils.DateUtil;
+import com.genersoft.iot.vmp.utils.redis.RedisUtil;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.sip.InvalidArgumentException;
+import javax.sip.RequestEvent;
+import javax.sip.SipException;
+import javax.sip.message.Response;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.UUID;
+
+import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
+
+@Component
+public class RecordInfoMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(RecordInfoMessageHandler.class);
+ public static volatile List<String> threadNameList = new ArrayList();
+ private final String cmdType = "RecordInfo";
+ private final static String CACHE_RECORDINFO_KEY = "CACHE_RECORDINFO_";
+
+ @Autowired
+ private ResponseMessageHandler responseMessageHandler;
+
+ @Autowired
+ private RedisUtil redis;
+
+ @Autowired
+ private DeferredResultHolder deferredResultHolder;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ responseMessageHandler.addHandler(cmdType, this);
+ }
+
+ @Override
+ public void handForDevice(RequestEvent evt, Device device, Element rootElement) {
+
+ // 鍥炲200 OK
+ try {
+ responseAck(evt, Response.OK);
+
+ rootElement = getRootElement(evt, device.getCharset());
+ String uuid = UUID.randomUUID().toString().replace("-", "");
+ RecordInfo recordInfo = new RecordInfo();
+ Element deviceIdElement = rootElement.element("DeviceID");
+ String channelId = deviceIdElement.getText();
+ String key = DeferredResultHolder.CALLBACK_CMD_RECORDINFO + device.getDeviceId() + channelId;
+ recordInfo.setDeviceId(device.getDeviceId());
+ recordInfo.setChannelId(channelId);
+ recordInfo.setName(getText(rootElement, "Name"));
+ if (getText(rootElement, "SumNum") == null || getText(rootElement, "SumNum") == "") {
+ recordInfo.setSumNum(0);
+ } else {
+ recordInfo.setSumNum(Integer.parseInt(getText(rootElement, "SumNum")));
+ }
+ String sn = getText(rootElement, "SN");
+ Element recordListElement = rootElement.element("RecordList");
+ if (recordListElement == null || recordInfo.getSumNum() == 0) {
+ logger.info("鏃犲綍鍍忔暟鎹�");
+ RequestMessage msg = new RequestMessage();
+ msg.setKey(key);
+ msg.setData(recordInfo);
+ deferredResultHolder.invokeAllResult(msg);
+ } else {
+ Iterator<Element> recordListIterator = recordListElement.elementIterator();
+ List<RecordItem> recordList = new ArrayList<RecordItem>();
+ if (recordListIterator != null) {
+ RecordItem record = new RecordItem();
+ logger.info("澶勭悊褰曞儚鍒楄〃鏁版嵁...");
+ // 閬嶅巻DeviceList
+ while (recordListIterator.hasNext()) {
+ Element itemRecord = recordListIterator.next();
+ Element recordElement = itemRecord.element("DeviceID");
+ if (recordElement == null) {
+ logger.info("璁板綍涓虹┖锛屼笅涓�涓�...");
+ continue;
+ }
+ record = new RecordItem();
+ record.setDeviceId(getText(itemRecord, "DeviceID"));
+ record.setName(getText(itemRecord, "Name"));
+ record.setFilePath(getText(itemRecord, "FilePath"));
+ record.setAddress(getText(itemRecord, "Address"));
+ record.setStartTime(
+ DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(getText(itemRecord, "StartTime")));
+ record.setEndTime(
+ DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(getText(itemRecord, "EndTime")));
+ record.setSecrecy(itemRecord.element("Secrecy") == null ? 0
+ : Integer.parseInt(getText(itemRecord, "Secrecy")));
+ record.setType(getText(itemRecord, "Type"));
+ record.setRecorderId(getText(itemRecord, "RecorderID"));
+ recordList.add(record);
+ }
+ recordInfo.setRecordList(recordList);
+ }
+
+ // 鏀圭敤鍗曠嫭绾跨▼缁熻宸茶幏鍙栧綍鍍忔枃浠舵暟閲忥紝閬垮厤澶氬寘骞惰鍒嗗埆缁熻涓嶅畬鏁寸殑闂
+ String cacheKey = CACHE_RECORDINFO_KEY + device.getDeviceId() + sn;
+ redis.set(cacheKey + "_" + uuid, recordList, 90);
+ if (!threadNameList.contains(cacheKey)) {
+ threadNameList.add(cacheKey);
+ CheckForAllRecordsThread chk = new CheckForAllRecordsThread(cacheKey, recordInfo);
+ chk.setName(cacheKey);
+ chk.setDeferredResultHolder(deferredResultHolder);
+ chk.setRedis(redis);
+ chk.setLogger(logger);
+ chk.start();
+ if (logger.isDebugEnabled()) {
+ logger.debug("Start Thread " + cacheKey + ".");
+ }
+ } else {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Thread " + cacheKey + " already started.");
+ }
+ }
+ }
+ } catch (SipException e) {
+ e.printStackTrace();
+ } catch (InvalidArgumentException e) {
+ e.printStackTrace();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ } catch (DocumentException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element element) {
+
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
index 28a52a3..dc6a9c0 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
@@ -1,13 +1,13 @@
package com.genersoft.iot.vmp.storager;
-import java.util.List;
-
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import com.github.pagehelper.PageInfo;
+
+import java.util.List;
/**
* @description:瑙嗛璁惧鏁版嵁瀛樺偍鎺ュ彛
@@ -373,7 +373,18 @@
*/
void updateMediaServer(MediaServerItem mediaServerItem);
+ /**
+ * 鏍规嵁濯掍綋ID鑾峰彇鍚敤/涓嶅惎鐢ㄧ殑浠ｇ悊鍒楄〃
+ * @param id 濯掍綋ID
+ * @param b 鍚敤/涓嶅惎鐢�
+ * @return
+ */
List<StreamProxyItem> getStreamProxyListForEnableInMediaServer(String id, boolean b);
- Device queryVideoDeviceByChannelId(String platformGbId);
+ /**
+ * 鏍规嵁閫氶亾ID鑾峰彇鍏舵墍鍦ㄨ澶�
+ * @param channelId 閫氶亾ID
+ * @return
+ */
+ Device queryVideoDeviceByChannelId(String channelId);
}
--
Gitblit v1.8.0