From 18c3b5931872fe1399440a89e1c17562b16b997c Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期三, 03 二月 2021 11:00:24 +0800
Subject: [PATCH] 增加多种信令的支持
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java | 298 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 242 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
index 1c7c775..c865ad3 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
@@ -10,6 +10,7 @@
import javax.sip.message.Request;
import javax.sip.message.Response;
+import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.UserSetup;
@@ -78,9 +79,12 @@
private static final String MESSAGE_RECORD_INFO = "RecordInfo";
private static final String MESSAGE_MEDIA_STATUS = "MediaStatus";
// private static final String MESSAGE_BROADCAST = "Broadcast";
- // private static final String MESSAGE_DEVICE_STATUS = "DeviceStatus";
+ private static final String MESSAGE_DEVICE_STATUS = "DeviceStatus";
+ private static final String MESSAGE_DEVICE_CONTROL = "DeviceControl";
+ private static final String MESSAGE_DEVICE_CONFIG = "DeviceConfig";
private static final String MESSAGE_MOBILE_POSITION = "MobilePosition";
// private static final String MESSAGE_MOBILE_POSITION_INTERVAL = "Interval";
+ private static final String MESSAGE_PRESET_QUERY = "PresetQuery";
/**
* 澶勭悊MESSAGE璇锋眰
@@ -99,12 +103,22 @@
processMessageKeepAlive(evt);
} else if (MESSAGE_CONFIG_DOWNLOAD.equals(cmd)) {
logger.info("鎺ユ敹鍒癈onfigDownload娑堟伅");
+ processMessageConfigDownload(evt);
} else if (MESSAGE_CATALOG.equals(cmd)) {
logger.info("鎺ユ敹鍒癈atalog娑堟伅");
processMessageCatalogList(evt);
} else if (MESSAGE_DEVICE_INFO.equals(cmd)) {
logger.info("鎺ユ敹鍒癉eviceInfo娑堟伅");
processMessageDeviceInfo(evt);
+ } else if (MESSAGE_DEVICE_STATUS.equals(cmd)) {
+ logger.info("鎺ユ敹鍒癉eviceStatus娑堟伅");
+ processMessageDeviceStatus(evt);
+ } else if (MESSAGE_DEVICE_CONTROL.equals(cmd)) {
+ logger.info("鎺ユ敹鍒癉eviceControl娑堟伅");
+ processMessageDeviceControl(evt);
+ } else if (MESSAGE_DEVICE_CONFIG.equals(cmd)) {
+ logger.info("鎺ユ敹鍒癉eviceConfig娑堟伅");
+ processMessageDeviceConfig(evt);
} else if (MESSAGE_ALARM.equals(cmd)) {
logger.info("鎺ユ敹鍒癆larm娑堟伅");
processMessageAlarm(evt);
@@ -117,6 +131,9 @@
} else if (MESSAGE_MOBILE_POSITION.equals(cmd)) {
logger.info("鎺ユ敹鍒癕obilePosition娑堟伅");
processMessageMobilePosition(evt);
+ } else if (MESSAGE_PRESET_QUERY.equals(cmd)) {
+ logger.info("鎺ユ敹鍒癙resetQuery娑堟伅");
+ processMessagePresetQuery(evt);
} else {
logger.info("鎺ユ敹鍒版秷鎭細" + cmd);
responseAck(evt);
@@ -133,7 +150,6 @@
*/
private void processMessageMobilePosition(RequestEvent evt) {
try {
- //鍥炲 200 OK
Element rootElement = getRootElement(evt);
MobilePosition mobilePosition = new MobilePosition();
Element deviceIdElement = rootElement.element("DeviceID");
@@ -174,12 +190,7 @@
storager.clearMobilePositionsByDeviceId(deviceId);
}
storager.insertMobilePosition(mobilePosition);
- // List<MobilePosition> all= storager.queryMobilePositions(deviceId, "2021-01-23T00:00:00", "2021-02-28T23:59:59");
- // all= storager.queryMobilePositions(deviceId, null, "2021-01-24T23:59:59");
- // all= storager.queryMobilePositions(deviceId, "2021-01-24T00:00:00", null);
- // //logger.debug(all.toString());
- // MobilePosition mp = storager.queryLatestPosition(deviceId);
- // logger.debug("鏈�鏂颁綅缃細" + mp.getLongitude() + ", " + mp.getLatitude());
+ //鍥炲 200 OK
responseAck(evt);
} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
e.printStackTrace();
@@ -187,7 +198,169 @@
}
/**
- * 鏀跺埌deviceInfo璁惧淇℃伅璇锋眰 澶勭悊
+ * 澶勭悊DeviceStatus璁惧鐘舵�丮essage
+ *
+ * @param evt
+ */
+ private void processMessageDeviceStatus(RequestEvent evt) {
+ try {
+ Element rootElement = getRootElement(evt);
+ String deviceId = XmlUtil.getText(rootElement, "DeviceID");
+ // 妫�鏌ヨ澶囨槸鍚﹀瓨鍦紝 涓嶅瓨鍦ㄥ垯涓嶅洖澶�
+ if (storager.exists(deviceId)) {
+ // 鍥炲200 OK
+ responseAck(evt);
+ JSONObject json = new JSONObject();
+ XmlUtil.node2Json(rootElement, json);
+ if (logger.isDebugEnabled()) {
+ logger.debug(json.toJSONString());
+ }
+ RequestMessage msg = new RequestMessage();
+ msg.setDeviceId(deviceId);
+ msg.setType(DeferredResultHolder.CALLBACK_CMD_DEVICESTATUS);
+ msg.setData(json);
+ deferredResultHolder.invokeResult(msg);
+
+ if (offLineDetector.isOnline(deviceId)) {
+ publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
+ } else {
+ }
+ }
+ } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 澶勭悊DeviceControl璁惧鐘舵�丮essage
+ *
+ * @param evt
+ */
+ private void processMessageDeviceControl(RequestEvent evt) {
+ try {
+ Element rootElement = getRootElement(evt);
+ String deviceId = XmlUtil.getText(rootElement, "DeviceID");
+ String result = XmlUtil.getText(rootElement, "Result");
+ // 鍥炲200 OK
+ responseAck(evt);
+ if (!XmlUtil.isEmpty(result)) {
+ // 姝ゅ鏄鏈钩鍙板彂鍑篋eviceControl鎸囦护鐨勫簲绛�
+ JSONObject json = new JSONObject();
+ XmlUtil.node2Json(rootElement, json);
+ if (logger.isDebugEnabled()) {
+ logger.debug(json.toJSONString());
+ }
+ RequestMessage msg = new RequestMessage();
+ msg.setDeviceId(deviceId);
+ msg.setType(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL);
+ msg.setData(json);
+ deferredResultHolder.invokeResult(msg);
+ } else {
+ // 姝ゅ鏄笂绾у彂鍑虹殑DeviceControl鎸囦护
+ }
+ } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 澶勭悊DeviceConfig璁惧鐘舵�丮essage
+ *
+ * @param evt
+ */
+ private void processMessageDeviceConfig(RequestEvent evt) {
+ try {
+ Element rootElement = getRootElement(evt);
+ String deviceId = XmlUtil.getText(rootElement, "DeviceID");
+ String result = XmlUtil.getText(rootElement, "Result");
+ // 鍥炲200 OK
+ responseAck(evt);
+ //if (!XmlUtil.isEmpty(result)) {
+ // 姝ゅ鏄鏈钩鍙板彂鍑篋eviceControl鎸囦护鐨勫簲绛�
+ JSONObject json = new JSONObject();
+ XmlUtil.node2Json(rootElement, json);
+ if (logger.isDebugEnabled()) {
+ logger.debug(json.toJSONString());
+ }
+ RequestMessage msg = new RequestMessage();
+ msg.setDeviceId(deviceId);
+ msg.setType(DeferredResultHolder.CALLBACK_CMD_DEVICECONFIG);
+ msg.setData(json);
+ deferredResultHolder.invokeResult(msg);
+ // } else {
+ // // 姝ゅ鏄笂绾у彂鍑虹殑DeviceConfig鎸囦护
+ //}
+ } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 澶勭悊ConfigDownload璁惧鐘舵�丮essage
+ *
+ * @param evt
+ */
+ private void processMessageConfigDownload(RequestEvent evt) {
+ try {
+ Element rootElement = getRootElement(evt);
+ String deviceId = XmlUtil.getText(rootElement, "DeviceID");
+ String result = XmlUtil.getText(rootElement, "Result");
+ // 鍥炲200 OK
+ responseAck(evt);
+ //if (!XmlUtil.isEmpty(result)) {
+ // 姝ゅ鏄鏈钩鍙板彂鍑篋eviceControl鎸囦护鐨勫簲绛�
+ JSONObject json = new JSONObject();
+ XmlUtil.node2Json(rootElement, json);
+ if (logger.isDebugEnabled()) {
+ logger.debug(json.toJSONString());
+ }
+ RequestMessage msg = new RequestMessage();
+ msg.setDeviceId(deviceId);
+ msg.setType(DeferredResultHolder.CALLBACK_CMD_CONFIGDOWNLOAD);
+ msg.setData(json);
+ deferredResultHolder.invokeResult(msg);
+ // } else {
+ // // 姝ゅ鏄笂绾у彂鍑虹殑DeviceConfig鎸囦护
+ //}
+ } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 澶勭悊PresetQuery棰勭疆浣嶅垪琛∕essage
+ *
+ * @param evt
+ */
+ private void processMessagePresetQuery(RequestEvent evt) {
+ try {
+ Element rootElement = getRootElement(evt);
+ String deviceId = XmlUtil.getText(rootElement, "DeviceID");
+ String result = XmlUtil.getText(rootElement, "Result");
+ // 鍥炲200 OK
+ responseAck(evt);
+ if (rootElement.getName().equals("Response")) {// !XmlUtil.isEmpty(result)) {
+ // 姝ゅ鏄鏈钩鍙板彂鍑篋eviceControl鎸囦护鐨勫簲绛�
+ JSONObject json = new JSONObject();
+ XmlUtil.node2Json(rootElement, json);
+ if (logger.isDebugEnabled()) {
+ logger.debug(json.toJSONString());
+ }
+ RequestMessage msg = new RequestMessage();
+ msg.setDeviceId(deviceId);
+ msg.setType(DeferredResultHolder.CALLBACK_CMD_PRESETQUERY);
+ msg.setData(json);
+ deferredResultHolder.invokeResult(msg);
+ } else {
+ // 姝ゅ鏄笂绾у彂鍑虹殑DeviceControl鎸囦护
+ }
+ } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 澶勭悊DeviceInfo璁惧淇℃伅Message
*
* @param evt
*/
@@ -354,56 +527,72 @@
Element rootElement = getRootElement(evt);
Element deviceIdElement = rootElement.element("DeviceID");
String deviceId = deviceIdElement.getText().toString();
+ // 鍥炲200 OK
+ responseAck(evt);
Device device = storager.queryVideoDevice(deviceId);
if (device == null) {
return;
}
- DeviceAlarm deviceAlarm = new DeviceAlarm();
- deviceAlarm.setDeviceId(deviceId);
- deviceAlarm.setAlarmPriority(XmlUtil.getText(rootElement, "AlarmPriority"));
- deviceAlarm.setAlarmMethod(XmlUtil.getText(rootElement, "AlarmMethod"));
- deviceAlarm.setAlarmTime(XmlUtil.getText(rootElement, "AlarmTime"));
- if (XmlUtil.getText(rootElement, "AlarmDescription") == null) {
- deviceAlarm.setAlarmDescription("");
- } else {
- deviceAlarm.setAlarmDescription(XmlUtil.getText(rootElement, "AlarmDescription"));
- }
- if (NumericUtil.isDouble(XmlUtil.getText(rootElement, "Longitude"))) {
- deviceAlarm.setLongitude(Double.parseDouble(XmlUtil.getText(rootElement, "Longitude")));
- } else {
- deviceAlarm.setLongitude(0.00);
- }
- if (NumericUtil.isDouble(XmlUtil.getText(rootElement, "Latitude"))) {
- deviceAlarm.setLatitude(Double.parseDouble(XmlUtil.getText(rootElement, "Latitude")));
- } else {
- deviceAlarm.setLatitude(0.00);
- }
- 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(deviceId);
+ if (rootElement.getName().equals("Notify")) { // 澶勭悊鎶ヨ閫氱煡
+ DeviceAlarm deviceAlarm = new DeviceAlarm();
+ deviceAlarm.setDeviceId(deviceId);
+ deviceAlarm.setAlarmPriority(XmlUtil.getText(rootElement, "AlarmPriority"));
+ deviceAlarm.setAlarmMethod(XmlUtil.getText(rootElement, "AlarmMethod"));
+ deviceAlarm.setAlarmTime(XmlUtil.getText(rootElement, "AlarmTime"));
+ if (XmlUtil.getText(rootElement, "AlarmDescription") == null) {
+ deviceAlarm.setAlarmDescription("");
+ } else {
+ deviceAlarm.setAlarmDescription(XmlUtil.getText(rootElement, "AlarmDescription"));
}
- storager.insertMobilePosition(mobilePosition);
- }
- // TODO: 闇�瑕佸疄鐜板瓨鍌ㄦ姤璀︿俊鎭�佹姤璀﹀垎绫�
-
- // 鍥炲200 OK
- responseAck(evt);
- if (offLineDetector.isOnline(deviceId)) {
- publisher.deviceAlarmEventPublish(deviceAlarm);
+ if (NumericUtil.isDouble(XmlUtil.getText(rootElement, "Longitude"))) {
+ deviceAlarm.setLongitude(Double.parseDouble(XmlUtil.getText(rootElement, "Longitude")));
+ } else {
+ deviceAlarm.setLongitude(0.00);
+ }
+ if (NumericUtil.isDouble(XmlUtil.getText(rootElement, "Latitude"))) {
+ deviceAlarm.setLatitude(Double.parseDouble(XmlUtil.getText(rootElement, "Latitude")));
+ } else {
+ deviceAlarm.setLatitude(0.00);
+ }
+
+ if (!XmlUtil.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(deviceId);
+ }
+ storager.insertMobilePosition(mobilePosition);
+ }
+ }
+ // TODO: 闇�瑕佸疄鐜板瓨鍌ㄦ姤璀︿俊鎭�佹姤璀﹀垎绫�
+
+ if (offLineDetector.isOnline(deviceId)) {
+ publisher.deviceAlarmEventPublish(deviceAlarm);
+ }
+ } else if (rootElement.getName().equals("Response")) { // 澶勭悊鎶ヨ鏌ヨ鍝嶅簲
+ JSONObject json = new JSONObject();
+ XmlUtil.node2Json(rootElement, json);
+ if (logger.isDebugEnabled()) {
+ logger.debug(json.toJSONString());
+ }
+ RequestMessage msg = new RequestMessage();
+ msg.setDeviceId(deviceId);
+ msg.setType(DeferredResultHolder.CALLBACK_CMD_ALARM);
+ msg.setData(json);
+ deferredResultHolder.invokeResult(msg);
}
} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
// } catch (DocumentException e) {
@@ -435,7 +624,7 @@
}
/***
- * 鏀跺埌catalog璁惧鐩綍鍒楄〃璇锋眰 澶勭悊 TODO 杩囨湡鏃堕棿鏆傛椂鍐欐180绉掞紝鍚庣画涓嶥eferredResult瓒呮椂鏃堕棿淇濇寔涓�鑷�
+ * 澶勭悊RecordInfo璁惧褰曞儚鍒楄〃Message璇锋眰 TODO 杩囨湡鏃堕棿鏆傛椂鍐欐180绉掞紝鍚庣画涓嶥eferredResult瓒呮椂鏃堕棿淇濇寔涓�鑷�
*
* @param evt
*/
@@ -522,12 +711,9 @@
// 2銆佹湁褰曞儚鏁版嵁锛屼笖绗竴娆″嵆鏀跺埌瀹屾暣鏁版嵁锛岃繑鍥炲搷搴旀暟鎹紝鏃爎edis鎿嶄綔
// 3銆佹湁褰曞儚鏁版嵁锛屽湪瓒呮椂鏃堕棿鍐呮敹鍒板娆″寘缁勮鍚庢暟閲忚冻澶燂紝杩斿洖鏁版嵁
- // 瀵硅褰曡繘琛屾帓搴�
RequestMessage msg = new RequestMessage();
msg.setDeviceId(deviceId);
msg.setType(DeferredResultHolder.CALLBACK_CMD_RECORDINFO);
- // // 鑷劧椤哄簭鎺掑簭, 鍏冪礌杩涜鍗囧簭鎺掑垪
- // recordInfo.getRecordList().sort(Comparator.naturalOrder());
msg.setData(recordInfo);
deferredResultHolder.invokeResult(msg);
logger.info("澶勭悊瀹屾垚锛岃繑鍥炵粨鏋�");
--
Gitblit v1.8.0