From b445128fb5bdc24f6703e7a40e9fd9f40919baf2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 03 十一月 2021 10:30:42 +0800
Subject: [PATCH] 修复订阅清理请示任务的执行时长
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java | 349 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 248 insertions(+), 101 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 6341fb2..285ccd3 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
@@ -4,17 +4,14 @@
import java.text.ParseException;
import java.util.*;
+import javax.sip.*;
+import javax.sip.address.Address;
import javax.sip.address.SipURI;
import javax.sip.header.FromHeader;
+import javax.sip.header.Header;
import javax.sip.header.HeaderAddress;
import javax.sip.header.ToHeader;
-import javax.sip.InvalidArgumentException;
-import javax.sip.ListeningPoint;
-import javax.sip.ObjectInUseException;
-import javax.sip.RequestEvent;
-import javax.sip.SipException;
-import javax.sip.SipProvider;
import javax.sip.message.Request;
import javax.sip.message.Response;
@@ -35,9 +32,11 @@
import com.genersoft.iot.vmp.gb28181.utils.DateUtil;
import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;
import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
+import com.genersoft.iot.vmp.service.IDeviceAlarmService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.utils.GpsUtil;
+import com.genersoft.iot.vmp.utils.SipUtils;
import com.genersoft.iot.vmp.utils.SpringBeanFactory;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
@@ -84,6 +83,8 @@
private DeviceOffLineDetector offLineDetector;
+ private IDeviceAlarmService deviceAlarmService;
+
private final static String CACHE_RECORDINFO_KEY = "CACHE_RECORDINFO_";
private static final String MESSAGE_KEEP_ALIVE = "Keepalive";
@@ -114,13 +115,13 @@
String cmd = XmlUtil.getText(rootElement, "CmdType");
if (MESSAGE_KEEP_ALIVE.equals(cmd)) {
- logger.info("鎺ユ敹鍒癒eepAlive娑堟伅");
+ logger.debug("鎺ユ敹鍒癒eepAlive娑堟伅");
processMessageKeepAlive(evt);
} else if (MESSAGE_CONFIG_DOWNLOAD.equals(cmd)) {
- logger.info("鎺ユ敹鍒癈onfigDownload娑堟伅");
+ logger.debug("鎺ユ敹鍒癈onfigDownload娑堟伅");
processMessageConfigDownload(evt);
} else if (MESSAGE_CATALOG.equals(cmd)) {
- logger.info("鎺ユ敹鍒癈atalog娑堟伅");
+ logger.debug("鎺ユ敹鍒癈atalog娑堟伅");
processMessageCatalogList(evt);
} else if (MESSAGE_DEVICE_INFO.equals(cmd)) {
// DeviceInfo娑堟伅澶勭悊
@@ -129,31 +130,31 @@
// DeviceStatus娑堟伅澶勭悊
processMessageDeviceStatus(evt);
} else if (MESSAGE_DEVICE_CONTROL.equals(cmd)) {
- logger.info("鎺ユ敹鍒癉eviceControl娑堟伅");
+ logger.debug("鎺ユ敹鍒癉eviceControl娑堟伅");
processMessageDeviceControl(evt);
} else if (MESSAGE_DEVICE_CONFIG.equals(cmd)) {
logger.info("鎺ユ敹鍒癉eviceConfig娑堟伅");
processMessageDeviceConfig(evt);
} else if (MESSAGE_ALARM.equals(cmd)) {
- logger.info("鎺ユ敹鍒癆larm娑堟伅");
+ logger.debug("鎺ユ敹鍒癆larm娑堟伅");
processMessageAlarm(evt);
} else if (MESSAGE_RECORD_INFO.equals(cmd)) {
- logger.info("鎺ユ敹鍒癛ecordInfo娑堟伅");
+ logger.debug("鎺ユ敹鍒癛ecordInfo娑堟伅");
processMessageRecordInfo(evt);
}else if (MESSAGE_MEDIA_STATUS.equals(cmd)) {
- logger.info("鎺ユ敹鍒癕ediaStatus娑堟伅");
+ logger.debug("鎺ユ敹鍒癕ediaStatus娑堟伅");
processMessageMediaStatus(evt);
} else if (MESSAGE_MOBILE_POSITION.equals(cmd)) {
- logger.info("鎺ユ敹鍒癕obilePosition娑堟伅");
+ logger.debug("鎺ユ敹鍒癕obilePosition娑堟伅");
processMessageMobilePosition(evt);
} else if (MESSAGE_PRESET_QUERY.equals(cmd)) {
- logger.info("鎺ユ敹鍒癙resetQuery娑堟伅");
+ logger.debug("鎺ユ敹鍒癙resetQuery娑堟伅");
processMessagePresetQuery(evt);
} else if (MESSAGE_BROADCAST.equals(cmd)) {
// Broadcast娑堟伅澶勭悊
processMessageBroadcast(evt);
} else {
- logger.info("鎺ユ敹鍒版秷鎭細" + cmd);
+ logger.debug("鎺ユ敹鍒版秷鎭細" + cmd);
responseAck(evt);
}
} catch (DocumentException | SipException |InvalidArgumentException | ParseException e) {
@@ -168,17 +169,21 @@
*/
private void processMessageMobilePosition(RequestEvent evt) {
try {
- Element rootElement = getRootElement(evt);
- MobilePosition mobilePosition = new MobilePosition();
- Element deviceIdElement = rootElement.element("DeviceID");
- String deviceId = deviceIdElement.getTextTrim().toString();
+ String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
Device device = storager.queryVideoDevice(deviceId);
- if (device != null) {
- if (!StringUtils.isEmpty(device.getName())) {
- mobilePosition.setDeviceName(device.getName());
- }
+ if (device == null) {
+ logger.warn("澶勭悊MobilePosition绉诲姩浣嶇疆娑堟伅鏃舵湭鎵惧埌璁惧淇℃伅");
+ response404Ack(evt);
+ return;
}
- mobilePosition.setDeviceId(XmlUtil.getText(rootElement, "DeviceID"));
+ Element rootElement = getRootElement(evt, device.getCharset());
+
+ MobilePosition mobilePosition = new MobilePosition();
+ if (!StringUtils.isEmpty(device.getName())) {
+ mobilePosition.setDeviceName(device.getName());
+ }
+ mobilePosition.setDeviceId(deviceId);
+ mobilePosition.setChannelId(XmlUtil.getText(rootElement, "DeviceID"));
mobilePosition.setTime(XmlUtil.getText(rootElement, "Time"));
mobilePosition.setLongitude(Double.parseDouble(XmlUtil.getText(rootElement, "Longitude")));
mobilePosition.setLatitude(Double.parseDouble(XmlUtil.getText(rootElement, "Latitude")));
@@ -222,11 +227,17 @@
*/
private void processMessageDeviceStatus(RequestEvent evt) {
try {
+ String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ logger.warn("澶勭悊DeviceStatus璁惧鐘舵�丮essage鏃舵湭鎵惧埌璁惧淇℃伅");
+ response404Ack(evt);
+ return;
+ }
Element rootElement = getRootElement(evt);
String name = rootElement.getName();
Element deviceIdElement = rootElement.element("DeviceID");
- String deviceId = deviceIdElement.getText();
-
+ String channelId = deviceIdElement.getText();
if (name.equalsIgnoreCase("Query")) { // 鍖哄垎鏄疪esponse鈥斺�旀煡璇㈠搷搴旓紝杩樻槸Query鈥斺�旀煡璇㈣姹�
logger.info("鎺ユ敹鍒癉eviceStatus鏌ヨ娑堟伅");
FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
@@ -253,13 +264,12 @@
logger.debug(json.toJSONString());
}
RequestMessage msg = new RequestMessage();
- msg.setDeviceId(deviceId);
- msg.setType(DeferredResultHolder.CALLBACK_CMD_DEVICESTATUS);
+ msg.setKey(DeferredResultHolder.CALLBACK_CMD_DEVICESTATUS + deviceId + channelId);
msg.setData(json);
- deferredResultHolder.invokeResult(msg);
+ deferredResultHolder.invokeAllResult(msg);
if (offLineDetector.isOnline(deviceId)) {
- publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
+ publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_MESSAGE);
} else {
}
}
@@ -277,12 +287,19 @@
*/
private void processMessageDeviceControl(RequestEvent evt) {
try {
+ String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ logger.warn("澶勭悊DeviceControl璁惧鐘舵�丮essage鏈壘鍒拌澶囦俊鎭�");
+ response404Ack(evt);
+ return;
+ }
Element rootElement = getRootElement(evt);
- String deviceId = XmlUtil.getText(rootElement, "DeviceID");
+ String channelId = XmlUtil.getText(rootElement, "DeviceID");
//String result = XmlUtil.getText(rootElement, "Result");
// 鍥炲200 OK
responseAck(evt);
- if (rootElement.getName().equals("Response")) {//} !XmlUtil.isEmpty(result)) {
+ if (rootElement.getName().equals("Response")) {//} !StringUtils.isEmpty(result)) {
// 姝ゅ鏄鏈钩鍙板彂鍑篋eviceControl鎸囦护鐨勫簲绛�
JSONObject json = new JSONObject();
XmlUtil.node2Json(rootElement, json);
@@ -290,16 +307,16 @@
logger.debug(json.toJSONString());
}
RequestMessage msg = new RequestMessage();
- msg.setDeviceId(deviceId);
- msg.setType(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL);
+ String key = DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId + channelId;
+ msg.setKey(key);
msg.setData(json);
- deferredResultHolder.invokeResult(msg);
+ deferredResultHolder.invokeAllResult(msg);
} else {
// 姝ゅ鏄笂绾у彂鍑虹殑DeviceControl鎸囦护
String platformId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(FromHeader.NAME)).getAddress().getURI()).getUser();
String targetGBId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();
// 杩滅▼鍚姩鍔熻兘
- if (!XmlUtil.isEmpty(XmlUtil.getText(rootElement, "TeleBoot"))) {
+ if (!StringUtils.isEmpty(XmlUtil.getText(rootElement, "TeleBoot"))) {
if (deviceId.equals(targetGBId)) {
// 杩滅▼鍚姩鏈钩鍙帮細闇�瑕佸湪閲嶆柊鍚姩绋嬪簭鍚庡厛瀵筍ipStack瑙ｇ粦
logger.info("鎵ц杩滅▼鍚姩鏈钩鍙板懡浠�");
@@ -337,10 +354,10 @@
}
}
// 浜戝彴/鍓嶇鎺у埗鍛戒护
- if (!XmlUtil.isEmpty(XmlUtil.getText(rootElement,"PTZCmd")) && !deviceId.equals(targetGBId)) {
+ if (!StringUtils.isEmpty(XmlUtil.getText(rootElement,"PTZCmd")) && !deviceId.equals(targetGBId)) {
String cmdString = XmlUtil.getText(rootElement,"PTZCmd");
- Device device = storager.queryVideoDeviceByPlatformIdAndChannelId(platformId, deviceId);
- cmder.fronEndCmd(device, deviceId, cmdString);
+ Device deviceForPlatform = storager.queryVideoDeviceByPlatformIdAndChannelId(platformId, deviceId);
+ cmder.fronEndCmd(deviceForPlatform, deviceId, cmdString);
}
}
} catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
@@ -355,8 +372,16 @@
*/
private void processMessageDeviceConfig(RequestEvent evt) {
try {
+ String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
+ // 鏌ヨ璁惧鏄惁瀛樺湪
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ logger.warn("澶勭悊DeviceConfig璁惧鐘舵�丮essage娑堟伅鏃舵湭鎵惧埌璁惧淇℃伅");
+ response404Ack(evt);
+ return;
+ }
Element rootElement = getRootElement(evt);
- String deviceId = XmlUtil.getText(rootElement, "DeviceID");
+ String channelId = XmlUtil.getText(rootElement, "DeviceID");
// 鍥炲200 OK
responseAck(evt);
if (rootElement.getName().equals("Response")) {
@@ -366,11 +391,11 @@
if (logger.isDebugEnabled()) {
logger.debug(json.toJSONString());
}
+ String key = DeferredResultHolder.CALLBACK_CMD_DEVICECONFIG + deviceId + channelId;
RequestMessage msg = new RequestMessage();
- msg.setDeviceId(deviceId);
- msg.setType(DeferredResultHolder.CALLBACK_CMD_DEVICECONFIG);
+ msg.setKey(key);
msg.setData(json);
- deferredResultHolder.invokeResult(msg);
+ deferredResultHolder.invokeAllResult(msg);
} else {
// 姝ゅ鏄笂绾у彂鍑虹殑DeviceConfig鎸囦护
}
@@ -386,8 +411,17 @@
*/
private void processMessageConfigDownload(RequestEvent evt) {
try {
+ String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
+ // 鏌ヨ璁惧鏄惁瀛樺湪
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ logger.warn("澶勭悊ConfigDownload璁惧鐘舵�丮essage鏃舵湭鎵惧埌璁惧淇℃伅");
+ response404Ack(evt);
+ return;
+ }
Element rootElement = getRootElement(evt);
- String deviceId = XmlUtil.getText(rootElement, "DeviceID");
+ String channelId = XmlUtil.getText(rootElement, "DeviceID");
+ String key = DeferredResultHolder.CALLBACK_CMD_CONFIGDOWNLOAD + deviceId + channelId;
// 鍥炲200 OK
responseAck(evt);
if (rootElement.getName().equals("Response")) {
@@ -398,10 +432,9 @@
logger.debug(json.toJSONString());
}
RequestMessage msg = new RequestMessage();
- msg.setDeviceId(deviceId);
- msg.setType(DeferredResultHolder.CALLBACK_CMD_CONFIGDOWNLOAD);
+ msg.setKey(key);
msg.setData(json);
- deferredResultHolder.invokeResult(msg);
+ deferredResultHolder.invokeAllResult(msg);
} else {
// 姝ゅ鏄笂绾у彂鍑虹殑DeviceConfig鎸囦护
}
@@ -417,11 +450,20 @@
*/
private void processMessagePresetQuery(RequestEvent evt) {
try {
+ String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
+ // 鏌ヨ璁惧鏄惁瀛樺湪
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ logger.warn("澶勭悊PresetQuery棰勭疆浣嶅垪琛∕essage鏃舵湭鎵惧埌璁惧淇℃伅");
+ response404Ack(evt);
+ return;
+ }
Element rootElement = getRootElement(evt);
- String deviceId = XmlUtil.getText(rootElement, "DeviceID");
+ String channelId = XmlUtil.getText(rootElement, "DeviceID");
+ String key = DeferredResultHolder.CALLBACK_CMD_PRESETQUERY + deviceId + channelId;
// 鍥炲200 OK
responseAck(evt);
- if (rootElement.getName().equals("Response")) {// !XmlUtil.isEmpty(result)) {
+ if (rootElement.getName().equals("Response")) {// !StringUtils.isEmpty(result)) {
// 姝ゅ鏄鏈钩鍙板彂鍑篋eviceControl鎸囦护鐨勫簲绛�
JSONObject json = new JSONObject();
XmlUtil.node2Json(rootElement, json);
@@ -429,10 +471,9 @@
logger.debug(json.toJSONString());
}
RequestMessage msg = new RequestMessage();
- msg.setDeviceId(deviceId);
- msg.setType(DeferredResultHolder.CALLBACK_CMD_PRESETQUERY);
+ msg.setKey(key);
msg.setData(json);
- deferredResultHolder.invokeResult(msg);
+ deferredResultHolder.invokeAllResult(msg);
} else {
// 姝ゅ鏄笂绾у彂鍑虹殑DeviceControl鎸囦护
}
@@ -448,10 +489,22 @@
*/
private void processMessageDeviceInfo(RequestEvent evt) {
try {
+ String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
+ // 鏌ヨ璁惧鏄惁瀛樺湪
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ logger.warn("澶勭悊DeviceInfo璁惧淇℃伅Message鏃舵湭鎵惧埌璁惧淇℃伅");
+ response404Ack(evt);
+ return;
+ }
Element rootElement = getRootElement(evt);
String requestName = rootElement.getName();
Element deviceIdElement = rootElement.element("DeviceID");
- String deviceId = deviceIdElement.getTextTrim().toString();
+ String channelId = deviceIdElement.getTextTrim();
+ String key = DeferredResultHolder.CALLBACK_CMD_DEVICEINFO + deviceId + channelId;
+ if (device != null ) {
+ rootElement = getRootElement(evt, device.getCharset());
+ }
if (requestName.equals("Query")) {
logger.info("鎺ユ敹鍒癉eviceInfo鏌ヨ娑堟伅");
FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
@@ -467,12 +520,13 @@
cmderFroPlatform.deviceInfoResponse(parentPlatform, sn, fromHeader.getTag());
}
} else {
- logger.info("鎺ユ敹鍒癉eviceInfo搴旂瓟娑堟伅");
- Device device = storager.queryVideoDevice(deviceId);
+ logger.debug("鎺ユ敹鍒癉eviceInfo搴旂瓟娑堟伅");
if (device == null) {
return;
}
+
device.setName(XmlUtil.getText(rootElement, "DeviceName"));
+
device.setManufacturer(XmlUtil.getText(rootElement, "Manufacturer"));
device.setModel(XmlUtil.getText(rootElement, "Model"));
device.setFirmware(XmlUtil.getText(rootElement, "Firmware"));
@@ -482,14 +536,13 @@
storager.updateDevice(device);
RequestMessage msg = new RequestMessage();
- msg.setDeviceId(deviceId);
- msg.setType(DeferredResultHolder.CALLBACK_CMD_DEVICEINFO);
+ msg.setKey(key);
msg.setData(device);
- deferredResultHolder.invokeResult(msg);
+ deferredResultHolder.invokeAllResult(msg);
// 鍥炲200 OK
responseAck(evt);
if (offLineDetector.isOnline(deviceId)) {
- publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
+ publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_MESSAGE);
}
}
} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
@@ -504,12 +557,22 @@
*/
private void processMessageCatalogList(RequestEvent evt) {
try {
+
+ String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
+ // 鏌ヨ璁惧鏄惁瀛樺湪
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ logger.warn("澶勭悊DeviceInfo璁惧淇℃伅Message鏃舵湭鎵惧埌璁惧淇℃伅");
+ response404Ack(evt);
+ return;
+ }
+
Element rootElement = getRootElement(evt);
String name = rootElement.getName();
Element deviceIdElement = rootElement.element("DeviceID");
- String deviceId = deviceIdElement.getText();
+ String channelId = deviceIdElement.getText();
Element deviceListElement = rootElement.element("DeviceList");
-
+ String key = DeferredResultHolder.CALLBACK_CMD_CATALOG + deviceId;
FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
AddressImpl address = (AddressImpl) fromHeader.getAddress();
SipUri uri = (SipUri) address.getURI();
@@ -552,7 +615,7 @@
deviceChannel.setStatus(gbStream.isStatus()?1:0);
// deviceChannel.setParentId(parentPlatform.getDeviceGBId());
deviceChannel.setRegisterWay(1);
- deviceChannel.setCivilCode(cmder.getSipConfig().getSipDomain());
+ deviceChannel.setCivilCode(cmder.getSipConfig().getDomain());
deviceChannel.setModel("live");
deviceChannel.setOwner("wvp-pro");
// deviceChannel.setAddress("test");
@@ -571,12 +634,10 @@
} else {
+ deviceListElement = getRootElement(evt, device.getCharset()).element("DeviceList");
Iterator<Element> deviceListIterator = deviceListElement.elementIterator();
if (deviceListIterator != null) {
- Device device = storager.queryVideoDevice(deviceId);
- if (device == null) {
- return;
- }
+
// 閬嶅巻DeviceList
while (deviceListIterator.hasNext()) {
Element itemDevice = deviceListIterator.next();
@@ -662,14 +723,13 @@
}
RequestMessage msg = new RequestMessage();
- msg.setDeviceId(deviceId);
- msg.setType(DeferredResultHolder.CALLBACK_CMD_CATALOG);
+ msg.setKey(key);
msg.setData(device);
- deferredResultHolder.invokeResult(msg);
+ deferredResultHolder.invokeAllResult(msg);
// 鍥炲200 OK
responseAck(evt);
if (offLineDetector.isOnline(deviceId)) {
- publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
+ publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_MESSAGE);
}
}
}
@@ -685,20 +745,28 @@
*/
private void processMessageAlarm(RequestEvent evt) {
try {
- Element rootElement = getRootElement(evt);
+ String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ logger.warn("澶勭悊alarm璁惧鎶ヨ淇℃伅鏈壘鍒拌澶囦俊鎭�");
+ response404Ack(evt);
+ return;
+ }
+ Element rootElement = getRootElement(evt, device.getCharset());
Element deviceIdElement = rootElement.element("DeviceID");
- String deviceId = deviceIdElement.getText().toString();
+ String channelId = deviceIdElement.getText().toString();
+ String key = DeferredResultHolder.CALLBACK_CMD_ALARM + deviceId + channelId;
// 鍥炲200 OK
responseAck(evt);
- Device device = storager.queryVideoDevice(deviceId);
- if (device == null) {
- return;
+ if (device.getCharset() != null) {
+ rootElement = getRootElement(evt, device.getCharset());
}
if (rootElement.getName().equals("Notify")) { // 澶勭悊鎶ヨ閫氱煡
DeviceAlarm deviceAlarm = new DeviceAlarm();
deviceAlarm.setDeviceId(deviceId);
+ deviceAlarm.setChannelId(channelId);
deviceAlarm.setAlarmPriority(XmlUtil.getText(rootElement, "AlarmPriority"));
deviceAlarm.setAlarmMethod(XmlUtil.getText(rootElement, "AlarmMethod"));
deviceAlarm.setAlarmTime(XmlUtil.getText(rootElement, "AlarmTime"));
@@ -718,7 +786,7 @@
deviceAlarm.setLatitude(0.00);
}
- if (!XmlUtil.isEmpty(deviceAlarm.getAlarmMethod())) {
+ if (!StringUtils.isEmpty(deviceAlarm.getAlarmMethod())) {
if ( deviceAlarm.getAlarmMethod().equals("4")) {
MobilePosition mobilePosition = new MobilePosition();
mobilePosition.setDeviceId(deviceAlarm.getDeviceId());
@@ -738,7 +806,9 @@
storager.insertMobilePosition(mobilePosition);
}
}
- // TODO: 闇�瑕佸疄鐜板瓨鍌ㄦ姤璀︿俊鎭�佹姤璀﹀垎绫�
+ logger.debug("瀛樺偍鎶ヨ淇℃伅銆佹姤璀﹀垎绫�");
+ // 瀛樺偍鎶ヨ淇℃伅銆佹姤璀﹀垎绫�
+ deviceAlarmService.add(deviceAlarm);
if (offLineDetector.isOnline(deviceId)) {
publisher.deviceAlarmEventPublish(deviceAlarm);
@@ -750,13 +820,11 @@
logger.debug(json.toJSONString());
}
RequestMessage msg = new RequestMessage();
- msg.setDeviceId(deviceId);
- msg.setType(DeferredResultHolder.CALLBACK_CMD_ALARM);
+ msg.setKey(key);
msg.setData(json);
- deferredResultHolder.invokeResult(msg);
+ deferredResultHolder.invokeAllResult(msg);
}
} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
- // } catch (DocumentException e) {
e.printStackTrace();
}
}
@@ -768,17 +836,42 @@
*/
private void processMessageKeepAlive(RequestEvent evt) {
try {
+
+ String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
+ // 鏌ヨ璁惧鏄惁瀛樺湪
+ Device device = storager.queryVideoDevice(deviceId);
+
Element rootElement = getRootElement(evt);
- String deviceId = XmlUtil.getText(rootElement, "DeviceID");
- // 妫�鏌ヨ澶囨槸鍚﹀瓨鍦紝 涓嶅瓨鍦ㄥ垯涓嶅洖澶�
- if (storager.exists(deviceId)) {
+ String channelId = XmlUtil.getText(rootElement, "DeviceID");
+
+ // 妫�鏌ヨ澶囨槸鍚﹀瓨鍦ㄥ苟鍦ㄧ嚎锛� 涓嶅湪绾垮垯璁剧疆涓哄湪绾�
+ if (device != null ) {
// 鍥炲200 OK
responseAck(evt);
- if (offLineDetector.isOnline(deviceId)) {
- publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
- } else {
+ publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
+ }else{
+ logger.warn("鏀跺埌[ "+deviceId+" ]蹇冭烦淇℃伅, 浣嗘槸璁惧涓嶅瓨鍦�, 鍥炲404");
+ Response response = getMessageFactory().createResponse(Response.NOT_FOUND, evt.getRequest());
+ ServerTransaction serverTransaction = getServerTransaction(evt);
+ serverTransaction.sendResponse(response);
+ if (serverTransaction.getDialog() != null) {
+ serverTransaction.getDialog().delete();
}
}
+
+// if (device != null && device.getOnline() == 1) {
+//
+// if (offLineDetector.isOnline(deviceId)) {
+// publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
+// } else {
+// }
+// }else {
+//// logger.warn("鏀跺埌[ "+deviceId+" ]蹇冭烦淇℃伅, 浣嗘槸璁惧" + (device == null? "涓嶅瓨鍦�":"绂荤嚎") + ", 鍥炲401");
+//// Response response = getMessageFactory().createResponse(Response.UNAUTHORIZED, evt.getRequest());
+//// getServerTransaction(evt).sendResponse(response);
+// publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
+//
+// }
} catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
e.printStackTrace();
}
@@ -791,14 +884,29 @@
*/
private void processMessageRecordInfo(RequestEvent evt) {
try {
+
+ String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
+ // 鏌ヨ璁惧鏄惁瀛樺湪
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ logger.warn("澶勭悊DeviceInfo璁惧淇℃伅Message鏃舵湭鎵惧埌璁惧淇℃伅");
+ response404Ack(evt);
+ return;
+ }
+
// 鍥炲200 OK
responseAck(evt);
String uuid = UUID.randomUUID().toString().replace("-", "");
RecordInfo recordInfo = new RecordInfo();
Element rootElement = getRootElement(evt);
Element deviceIdElement = rootElement.element("DeviceID");
- String deviceId = deviceIdElement.getText().toString();
+ String channelId = deviceIdElement.getText().toString();
+ String key = DeferredResultHolder.CALLBACK_CMD_RECORDINFO + deviceId + channelId;
+ if (device != null ) {
+ rootElement = getRootElement(evt, device.getCharset());
+ }
recordInfo.setDeviceId(deviceId);
+ recordInfo.setChannelId(channelId);
recordInfo.setName(XmlUtil.getText(rootElement, "Name"));
if (XmlUtil.getText(rootElement, "SumNum")== null || XmlUtil.getText(rootElement, "SumNum") =="") {
recordInfo.setSumNum(0);
@@ -810,10 +918,9 @@
if (recordListElement == null || recordInfo.getSumNum() == 0) {
logger.info("鏃犲綍鍍忔暟鎹�");
RequestMessage msg = new RequestMessage();
- msg.setDeviceId(deviceId);
- msg.setType(DeferredResultHolder.CALLBACK_CMD_RECORDINFO);
+ msg.setKey(key);
msg.setData(recordInfo);
- deferredResultHolder.invokeResult(msg);
+ deferredResultHolder.invokeAllResult(msg);
} else {
Iterator<Element> recordListIterator = recordListElement.elementIterator();
List<RecordItem> recordList = new ArrayList<RecordItem>();
@@ -912,17 +1019,27 @@
*/
private void processMessageMediaStatus(RequestEvent evt){
try {
+
+ String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
+ // 鏌ヨ璁惧鏄惁瀛樺湪
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ logger.warn("澶勭悊DeviceInfo璁惧淇℃伅Message鏃舵湭鎵惧埌璁惧淇℃伅");
+ response404Ack(evt);
+ return;
+ }
+
// 鍥炲200 OK
responseAck(evt);
Element rootElement = getRootElement(evt);
- String deviceId = XmlUtil.getText(rootElement, "DeviceID");
+ String channelId = XmlUtil.getText(rootElement, "DeviceID");
String NotifyType =XmlUtil.getText(rootElement, "NotifyType");
if (NotifyType.equals("121")){
logger.info("濯掍綋鎾斁瀹屾瘯锛岄�氱煡鍏虫祦");
StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, "*");
if (streamInfo != null) {
redisCatchStorage.stopPlayback(streamInfo);
- cmder.streamByeCmd(streamInfo.getStreamId());
+ cmder.streamByeCmd(streamInfo.getDeviceID(), streamInfo.getChannelId());
}
}
} catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
@@ -937,8 +1054,19 @@
*/
private void processMessageBroadcast(RequestEvent evt) {
try {
+
+ String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
+ // 鏌ヨ璁惧鏄惁瀛樺湪
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ logger.warn("澶勭悊DeviceInfo璁惧淇℃伅Message鏃舵湭鎵惧埌璁惧淇℃伅");
+ response404Ack(evt);
+ return;
+ }
+
Element rootElement = getRootElement(evt);
- String deviceId = XmlUtil.getText(rootElement, "DeviceID");
+ String channelId = XmlUtil.getText(rootElement, "DeviceID");
+ String key = DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId + channelId;
// 鍥炲200 OK
responseAck(evt);
if (rootElement.getName().equals("Response")) {
@@ -949,10 +1077,9 @@
logger.debug(json.toJSONString());
}
RequestMessage msg = new RequestMessage();
- msg.setDeviceId(deviceId);
- msg.setType(DeferredResultHolder.CALLBACK_CMD_BROADCAST);
+ msg.setKey(key);
msg.setData(json);
- deferredResultHolder.invokeResult(msg);
+ deferredResultHolder.invokeAllResult(msg);
} else {
// 姝ゅ鏄笂绾у彂鍑虹殑Broadcast鎸囦护
}
@@ -971,7 +1098,11 @@
*/
private void responseAck(RequestEvent evt) throws SipException, InvalidArgumentException, ParseException {
Response response = getMessageFactory().createResponse(Response.OK, evt.getRequest());
- getServerTransaction(evt).sendResponse(response);
+ ServerTransaction serverTransaction = getServerTransaction(evt);
+ serverTransaction.sendResponse(response);
+ if (serverTransaction.getDialog() != null) {
+ serverTransaction.getDialog().delete();
+ }
}
/***
@@ -983,13 +1114,25 @@
*/
private void response404Ack(RequestEvent evt) throws SipException, InvalidArgumentException, ParseException {
Response response = getMessageFactory().createResponse(Response.NOT_FOUND, evt.getRequest());
- getServerTransaction(evt).sendResponse(response);
+ ServerTransaction serverTransaction = getServerTransaction(evt);
+ serverTransaction.sendResponse(response);
+ if (serverTransaction.getDialog() != null) {
+ serverTransaction.getDialog().delete();
+ }
}
private Element getRootElement(RequestEvent evt) throws DocumentException {
+
+ return getRootElement(evt, "gb2312");
+ }
+
+ private Element getRootElement(RequestEvent evt, String charset) throws DocumentException {
+ if (charset == null) {
+ charset = "gb2312";
+ }
Request request = evt.getRequest();
SAXReader reader = new SAXReader();
- reader.setEncoding("gbk");
+ reader.setEncoding(charset);
Document xml = reader.read(new ByteArrayInputStream(request.getRawContent()));
return xml.getRootElement();
}
@@ -1033,4 +1176,8 @@
public void setCmderFroPlatform(SIPCommanderFroPlatform cmderFroPlatform) {
this.cmderFroPlatform = cmderFroPlatform;
}
+
+ public void setDeviceAlarmService(IDeviceAlarmService deviceAlarmService) {
+ this.deviceAlarmService = deviceAlarmService;
+ }
}
--
Gitblit v1.8.0