From e2ce28347aaa35bce29c2683158f8882c62d3a32 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 18 十一月 2021 11:50:56 +0800
Subject: [PATCH] 优化注释
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/ResponseMessageHandler.java | 4 +
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/SubscribeRequestProcessor.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/notify/cmd/CatalogNotifyMessageHandler.java | 3 -
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java | 6 -
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/query/QueryMessageHandler.java | 4 +
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java | 4 -
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/ControlMessageHandler.java | 6 ++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/AlarmQueryMessageHandler.java | 77 +++++++++++++++++++++++++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/NotifyMessageHandler.java | 4 +
13 files changed, 108 insertions(+), 30 deletions(-)
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 8363d6f..127ef29 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
@@ -25,10 +25,8 @@
import java.util.HashMap;
import java.util.Map;
-/**
- * @description:ACK璇锋眰澶勭悊鍣�
- * @author: swwheihei
- * @date: 2020骞�5鏈�3鏃� 涓嬪崍5:31:45
+/**
+ * SIP鍛戒护绫诲瀷锛� ACK璇锋眰
*/
@Component
public class AckRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
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 64812b6..feb44c5 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
@@ -28,10 +28,8 @@
import java.util.HashMap;
import java.util.Map;
-/**
- * @description: BYE璇锋眰澶勭悊鍣�
- * @author: lawrencehj
- * @date: 2021骞�3鏈�9鏃�
+/**
+ * SIP鍛戒护绫诲瀷锛� BYE璇锋眰
*/
@Component
public class ByeRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
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 2e98e33..0a818ee 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
@@ -9,10 +9,8 @@
import javax.sip.RequestEvent;
-/**
- * @description:CANCEL璇锋眰澶勭悊鍣�
- * @author: swwheihei
- * @date: 2020骞�5鏈�3鏃� 涓嬪崍5:32:23
+/**
+ * SIP鍛戒护绫诲瀷锛� CANCEL璇锋眰
*/
@Component
public class CancelRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
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 5eda75d..a9e9b45 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
@@ -33,10 +33,8 @@
import java.text.ParseException;
import java.util.Vector;
-/**
- * @description:澶勭悊INVITE璇锋眰
- * @author: panll
- * @date: 2021骞�1鏈�14鏃�
+/**
+ * SIP鍛戒护绫诲瀷锛� INVITE璇锋眰
*/
@SuppressWarnings("rawtypes")
@Component
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 95e0af2..faa3924 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
@@ -35,9 +35,7 @@
import java.util.Iterator;
/**
- * @description: Notify璇锋眰澶勭悊鍣�
- * @author: lawrencehj
- * @date: 2021骞�1鏈�27鏃�
+ * SIP鍛戒护绫诲瀷锛� NOTIFY璇锋眰
*/
@Component
public class NotifyRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
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 10e99cb..3f14e23 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
@@ -35,10 +35,8 @@
import java.util.Calendar;
import java.util.Locale;
-/**
- * @description:鏀跺埌娉ㄥ唽璇锋眰 澶勭悊
- * @author: swwheihei
- * @date: 2020骞�5鏈�3鏃� 涓嬪崍4:47:25
+/**
+ * SIP鍛戒护绫诲瀷锛� REGISTER璇锋眰
*/
@Component
public class RegisterRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
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 ba835db..be4b2ce 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
@@ -18,10 +18,8 @@
import javax.sip.message.Response;
import java.text.ParseException;
-/**
- * @description:SUBSCRIBE璇锋眰澶勭悊鍣�
- * @author: swwheihei
- * @date: 2020骞�5鏈�3鏃� 涓嬪崍5:31:20
+/**
+ * SIP鍛戒护绫诲瀷锛� SUBSCRIBE璇锋眰
*/
@Component
public class SubscribeRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
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
index b533082..235a477 100644
--- 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
@@ -6,6 +6,12 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+/**
+ * 鍛戒护绫诲瀷锛� 鎺у埗鍛戒护
+ * 鍛戒护绫诲瀷锛� 璁惧鎺у埗锛� 杩滅▼鍚姩, 褰曞儚鎺у埗锛圱ODO锛�, 鎶ヨ甯冮槻/鎾ら槻鍛戒护锛圱ODO锛�, 鎶ヨ澶嶄綅鍛戒护锛圱ODO锛�,
+ * 寮哄埗鍏抽敭甯у懡浠わ紙TODO锛�, 鎷夋鏀惧ぇ/缂╁皬鎺у埗鍛戒护锛圱ODO锛�, 鐪嬪畧浣嶆帶鍒讹紙TODO锛�, 鎶ヨ澶嶄綅锛圱ODO锛�
+ * 鍛戒护绫诲瀷锛� 璁惧閰嶇疆锛� SVAC缂栫爜閰嶇疆锛圱ODO锛�, 闊抽鍙傛暟锛圱ODO锛�, SVAC瑙ｇ爜閰嶇疆锛圱ODO锛�
+ */
@Component
public class ControlMessageHandler extends MessageHandlerAbstract implements InitializingBean {
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
index 6965a1c..c546057 100644
--- 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
@@ -6,6 +6,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+/**
+ * 鍛戒护绫诲瀷锛� 閫氱煡鍛戒护
+ * 鍛戒护绫诲瀷锛� 鐘舵�佷俊鎭�(蹇冭烦)鎶ラ��, 鎶ヨ閫氱煡, 濯掍綋閫氱煡, 绉诲姩璁惧浣嶇疆鏁版嵁锛岃闊冲箍鎾�氱煡(TODO), 璁惧棰勭疆浣�(TODO)
+ */
@Component
public class NotifyMessageHandler extends MessageHandlerAbstract implements InitializingBean {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java
index 497f421..c6c1ab9 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java
@@ -46,9 +46,6 @@
@Autowired
private SipConfig config;
- @Autowired
- private EventPublisher publisher;
-
@Override
public void afterPropertiesSet() throws Exception {
notifyMessageHandler.addHandler(cmdType, this);
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
index ab111b5..9a29955 100644
--- 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
@@ -6,6 +6,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+/**
+ * 鍛戒护绫诲瀷锛� 鏌ヨ鎸囦护
+ * 鍛戒护绫诲瀷锛� 璁惧鐘舵��, 璁惧鐩綍淇℃伅, 璁惧淇℃伅, 鏂囦欢鐩綍妫�绱�(TODO), 鎶ヨ(TODO), 璁惧閰嶇疆(TODO), 璁惧棰勭疆浣�(TODO), 绉诲姩璁惧浣嶇疆鏁版嵁(TODO)
+ */
@Component
public class QueryMessageHandler extends MessageHandlerAbstract implements InitializingBean {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/AlarmQueryMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/AlarmQueryMessageHandler.java
new file mode 100644
index 0000000..60cf4d0
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/AlarmQueryMessageHandler.java
@@ -0,0 +1,77 @@
+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 org.springframework.stereotype.Component;
+
+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;
+
+@Component
+public class AlarmQueryMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
+
+ private Logger logger = LoggerFactory.getLogger(AlarmQueryMessageHandler.class);
+ private final String cmdType = "Alarm";
+
+ @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("涓嶆敮鎸乤larm鏌ヨ");
+ try {
+ responseAck(evt, Response.NOT_FOUND, "not support alarm query");
+ } 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/response/ResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/ResponseMessageHandler.java
index 13c8ac7..18da9cd 100644
--- 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
@@ -6,6 +6,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+/**
+ * 鍛戒护绫诲瀷锛� 璇锋眰鍔ㄤ綔鐨勫簲绛�
+ * 鍛戒护绫诲瀷锛� 璁惧鎺у埗, 鎶ヨ閫氱煡, 璁惧鐩綍淇℃伅鏌ヨ, 鐩綍淇℃伅鏌ヨ, 鐩綍鏀跺埌, 璁惧淇℃伅鏌ヨ, 璁惧鐘舵�佷俊鎭煡璇� ......
+ */
@Component
public class ResponseMessageHandler extends MessageHandlerAbstract implements InitializingBean {
--
Gitblit v1.8.0