From e48fa711a3664bece9b3e58840a75fe7c05bc47c Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期六, 08 五月 2021 17:14:05 +0800
Subject: [PATCH] 添加截图(快照)功能

---
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java | 1097 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 869 insertions(+), 228 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 ec19cd5..114ffd4 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,11 +4,47 @@
 import java.text.ParseException;
 import java.util.*;
 
+import javax.sip.address.SipURI;
+
+import javax.sip.header.FromHeader;
+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;
+
+import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.VManageBootstrap;
+import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.common.VideoManagerConstants;
+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.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.cmd.impl.SIPCommander;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.request.SIPRequestAbstractProcessor;
+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.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.utils.GpsUtil;
+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;
+
+import gov.nist.javax.sip.SipStackImpl;
+import gov.nist.javax.sip.address.AddressImpl;
+import gov.nist.javax.sip.address.SipUri;
 
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
@@ -16,213 +52,635 @@
 import org.dom4j.io.SAXReader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.genersoft.iot.vmp.common.VideoManagerConstants;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-import com.genersoft.iot.vmp.gb28181.bean.RecordInfo;
-import com.genersoft.iot.vmp.gb28181.bean.RecordItem;
-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.cmd.impl.SIPCommander;
-import com.genersoft.iot.vmp.gb28181.transmit.request.SIPRequestAbstractProcessor;
-import com.genersoft.iot.vmp.gb28181.utils.DateUtil;
-import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import com.genersoft.iot.vmp.utils.redis.RedisUtil;
 import org.springframework.util.StringUtils;
 
-/**    
+/**
  * @Description:MESSAGE璇锋眰澶勭悊鍣�
  * @author: swwheihei
- * @date:   2020骞�5鏈�3鏃� 涓嬪崍5:32:41     
+ * @date: 2020骞�5鏈�3鏃� 涓嬪崍5:32:41
  */
+@SuppressWarnings(value={"unchecked", "rawtypes"})
 public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
-	
+
+	public static volatile List<String> threadNameList = new ArrayList();
+
+	private UserSetup userSetup = (UserSetup) SpringBeanFactory.getBean("userSetup");
+
 	private final static Logger logger = LoggerFactory.getLogger(MessageRequestProcessor.class);
-	
+
 	private SIPCommander cmder;
-	
+
+	private SIPCommanderFroPlatform cmderFroPlatform;
+
 	private IVideoManagerStorager storager;
-	
+
+	private IRedisCatchStorage redisCatchStorage;
+
 	private EventPublisher publisher;
-	
+
 	private RedisUtil redis;
-	
+
 	private DeferredResultHolder deferredResultHolder;
-	
+
 	private DeviceOffLineDetector offLineDetector;
-	
+
 	private final static String CACHE_RECORDINFO_KEY = "CACHE_RECORDINFO_";
-	
+
 	private static final String MESSAGE_KEEP_ALIVE = "Keepalive";
 	private static final String MESSAGE_CONFIG_DOWNLOAD = "ConfigDownload";
 	private static final String MESSAGE_CATALOG = "Catalog";
 	private static final String MESSAGE_DEVICE_INFO = "DeviceInfo";
 	private static final String MESSAGE_ALARM = "Alarm";
 	private static final String MESSAGE_RECORD_INFO = "RecordInfo";
-//	private static final String MESSAGE_BROADCAST = "Broadcast";
-//	private static final String MESSAGE_DEVICE_STATUS = "DeviceStatus";
-//	private static final String MESSAGE_MOBILE_POSITION = "MobilePosition";
-//	private static final String MESSAGE_MOBILE_POSITION_INTERVAL = "Interval";
-	
-	/**   
+	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_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璇锋眰
-	 *  
+	 * 
 	 * @param evt
-	 */  
+	 */
 	@Override
 	public void process(RequestEvent evt) {
 
 		try {
 			Element rootElement = getRootElement(evt);
-			String cmd = XmlUtil.getText(rootElement,"CmdType");
+			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)) {
-				logger.info("鎺ユ敹鍒癉eviceInfo娑堟伅");
+				// DeviceInfo娑堟伅澶勭悊
 				processMessageDeviceInfo(evt);
+			} else if (MESSAGE_DEVICE_STATUS.equals(cmd)) {
+				// DeviceStatus娑堟伅澶勭悊
+				processMessageDeviceStatus(evt);
+			} else if (MESSAGE_DEVICE_CONTROL.equals(cmd)) {
+				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.debug("鎺ユ敹鍒癕ediaStatus娑堟伅");
+				processMessageMediaStatus(evt);
+			} else if (MESSAGE_MOBILE_POSITION.equals(cmd)) {
+				logger.debug("鎺ユ敹鍒癕obilePosition娑堟伅");
+				processMessageMobilePosition(evt);
+			} else if (MESSAGE_PRESET_QUERY.equals(cmd)) {
+				logger.debug("鎺ユ敹鍒癙resetQuery娑堟伅");
+				processMessagePresetQuery(evt);
+			} else if (MESSAGE_BROADCAST.equals(cmd)) {
+				// Broadcast娑堟伅澶勭悊
+				processMessageBroadcast(evt);
+			} else {
+				logger.debug("鎺ユ敹鍒版秷鎭細" + cmd);
+				responseAck(evt);
 			}
-		} catch (DocumentException e) {
+		} catch (DocumentException | SipException |InvalidArgumentException | ParseException e) {
 			e.printStackTrace();
 		}
 	}
-	
+
 	/**
-	 * 鏀跺埌deviceInfo璁惧淇℃伅璇锋眰 澶勭悊
+	 * 澶勭悊MobilePosition绉诲姩浣嶇疆娑堟伅
+	 * 
+	 * @param evt
+	 */
+	private void processMessageMobilePosition(RequestEvent evt) {
+		try {
+			Element rootElement = getRootElement(evt);
+			MobilePosition mobilePosition = new MobilePosition();
+			Element deviceIdElement = rootElement.element("DeviceID");
+			String deviceId = deviceIdElement.getTextTrim().toString();
+			Device device = storager.queryVideoDevice(deviceId);
+			if (device != null) {
+				if (!StringUtils.isEmpty(device.getName())) {
+					mobilePosition.setDeviceName(device.getName());
+				}
+			}
+			mobilePosition.setDeviceId(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")));
+            if (NumericUtil.isDouble(XmlUtil.getText(rootElement, "Speed"))) {
+				mobilePosition.setSpeed(Double.parseDouble(XmlUtil.getText(rootElement, "Speed")));
+			} else {
+				mobilePosition.setSpeed(0.0);
+			}
+			if (NumericUtil.isDouble(XmlUtil.getText(rootElement, "Direction"))) {
+				mobilePosition.setDirection(Double.parseDouble(XmlUtil.getText(rootElement, "Direction")));
+			} else {
+				mobilePosition.setDirection(0.0);
+			}
+			if (NumericUtil.isDouble(XmlUtil.getText(rootElement, "Altitude"))) {
+				mobilePosition.setAltitude(Double.parseDouble(XmlUtil.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(deviceId);
+			}
+			storager.insertMobilePosition(mobilePosition);
+			//鍥炲 200 OK
+			responseAck(evt);
+		} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 澶勭悊DeviceStatus璁惧鐘舵�丮essage
+	 * 
+	 * @param evt
+	 */
+	private void processMessageDeviceStatus(RequestEvent evt) {
+		try {
+			Element rootElement = getRootElement(evt);
+			String name = rootElement.getName();
+			Element deviceIdElement = rootElement.element("DeviceID");
+			String deviceId = deviceIdElement.getText();
+
+			if (name.equalsIgnoreCase("Query")) { // 鍖哄垎鏄疪esponse鈥斺�旀煡璇㈠搷搴旓紝杩樻槸Query鈥斺�旀煡璇㈣姹�
+				logger.info("鎺ユ敹鍒癉eviceStatus鏌ヨ娑堟伅");
+				FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
+				String platformId = ((SipUri) fromHeader.getAddress().getURI()).getUser();
+					if (platformId == null) {
+					response404Ack(evt);
+					return;
+				} else {
+					// 鍥炲200 OK
+					responseAck(evt);
+					String sn = rootElement.element("SN").getText();
+					ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
+					cmderFroPlatform.deviceStatusResponse(parentPlatform, sn, fromHeader.getTag());
+				}
+			} else {
+				logger.info("鎺ユ敹鍒癉eviceStatus搴旂瓟娑堟伅");
+				// 妫�鏌ヨ澶囨槸鍚﹀瓨鍦紝 涓嶅瓨鍦ㄥ垯涓嶅洖澶�
+				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 (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_DEVICECONTROL);
+				msg.setData(json);
+				deferredResultHolder.invokeResult(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 (deviceId.equals(targetGBId)) {
+						// 杩滅▼鍚姩鏈钩鍙帮細闇�瑕佸湪閲嶆柊鍚姩绋嬪簭鍚庡厛瀵筍ipStack瑙g粦
+						logger.info("鎵ц杩滅▼鍚姩鏈钩鍙板懡浠�");
+						ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
+						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 (!XmlUtil.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);
+				}
+			}
+		} 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");
+			// 鍥炲200 OK
+			responseAck(evt);
+			if (rootElement.getName().equals("Response")) {
+					// 姝ゅ鏄鏈钩鍙板彂鍑篋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");
+			// 鍥炲200 OK
+			responseAck(evt);
+			if (rootElement.getName().equals("Response")) {
+					// 姝ゅ鏄鏈钩鍙板彂鍑篋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");
+			// 鍥炲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
 	 */
 	private void processMessageDeviceInfo(RequestEvent evt) {
 		try {
 			Element rootElement = getRootElement(evt);
+			String requestName = rootElement.getName();
 			Element deviceIdElement = rootElement.element("DeviceID");
-			String deviceId = deviceIdElement.getText().toString();
-			
-			Device device = storager.queryVideoDevice(deviceId);
-			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"));
-			if (StringUtils.isEmpty(device.getStreamMode())){
-				device.setStreamMode("UDP");
-			}
-			storager.updateDevice(device);
-			
-			RequestMessage msg = new RequestMessage();
-			msg.setDeviceId(deviceId);
-			msg.setType(DeferredResultHolder.CALLBACK_CMD_DEVICEINFO);
-			msg.setData(device);
-			deferredResultHolder.invokeResult(msg);
-		} catch (DocumentException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	/***
-	 * 鏀跺埌catalog璁惧鐩綍鍒楄〃璇锋眰 澶勭悊
-	 * @param evt
-	 */
-	private void processMessageCatalogList(RequestEvent evt) {
-		try {
-			Element rootElement = getRootElement(evt);
-			Element deviceIdElement = rootElement.element("DeviceID");
-			String deviceId = deviceIdElement.getText();
-			Element deviceListElement = rootElement.element("DeviceList");
-			if (deviceListElement == null) {
-				return;
-			}
-			Iterator<Element> deviceListIterator = deviceListElement.elementIterator();
-			if (deviceListIterator != null) {
+			String deviceId = deviceIdElement.getTextTrim().toString();
+			if (requestName.equals("Query")) {
+				logger.info("鎺ユ敹鍒癉eviceInfo鏌ヨ娑堟伅");
+				FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
+				String platformId = ((SipUri) fromHeader.getAddress().getURI()).getUser();
+					if (platformId == null) {
+					response404Ack(evt);
+					return;
+				} else {
+					// 鍥炲200 OK
+					responseAck(evt);
+					String sn = rootElement.element("SN").getText();
+					ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
+					cmderFroPlatform.deviceInfoResponse(parentPlatform, sn, fromHeader.getTag());
+				}
+			} else {
+				logger.debug("鎺ユ敹鍒癉eviceInfo搴旂瓟娑堟伅");
 				Device device = storager.queryVideoDevice(deviceId);
 				if (device == null) {
 					return;
 				}
-				// 閬嶅巻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);
-					if(status.equals("ON") || status.equals("On")) {
-						deviceChannel.setStatus(1);
-					}
-					if(status.equals("OFF") || status.equals("Off")) {
-						deviceChannel.setStatus(0);
-					}
-
-					deviceChannel.setManufacture(XmlUtil.getText(itemDevice,"Manufacturer"));
-					deviceChannel.setModel(XmlUtil.getText(itemDevice,"Model"));
-					deviceChannel.setOwner(XmlUtil.getText(itemDevice,"Owner"));
-					deviceChannel.setCivilCode(XmlUtil.getText(itemDevice,"CivilCode"));
-					deviceChannel.setBlock(XmlUtil.getText(itemDevice,"Block"));
-					deviceChannel.setAddress(XmlUtil.getText(itemDevice,"Address"));
-					deviceChannel.setParental(itemDevice.element("Parental") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"Parental")));
-					deviceChannel.setParentId(XmlUtil.getText(itemDevice,"ParentID"));
-					deviceChannel.setSafetyWay(itemDevice.element("SafetyWay") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"SafetyWay")));
-					deviceChannel.setRegisterWay(itemDevice.element("RegisterWay") == null? 1:Integer.parseInt(XmlUtil.getText(itemDevice,"RegisterWay")));
-					deviceChannel.setCertNum(XmlUtil.getText(itemDevice,"CertNum"));
-					deviceChannel.setCertifiable(itemDevice.element("Certifiable") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"Certifiable")));
-					deviceChannel.setErrCode(itemDevice.element("ErrCode") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"ErrCode")));
-					deviceChannel.setEndTime(XmlUtil.getText(itemDevice,"EndTime"));
-					deviceChannel.setSecrecy(XmlUtil.getText(itemDevice,"Secrecy"));
-					deviceChannel.setIpAddress(XmlUtil.getText(itemDevice,"IPAddress"));
-					deviceChannel.setPort(itemDevice.element("Port") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"Port")));
-					deviceChannel.setPassword(XmlUtil.getText(itemDevice,"Password"));
-					deviceChannel.setLongitude(itemDevice.element("Longitude") == null? 0.00:Double.parseDouble(XmlUtil.getText(itemDevice,"Longitude")));
-					deviceChannel.setLatitude(itemDevice.element("Latitude") == null? 0.00:Double.parseDouble(XmlUtil.getText(itemDevice,"Latitude")));
-					deviceChannel.setPTZType(itemDevice.element("PTZType") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"PTZType")));
-					deviceChannel.setHasAudio(true); // 榛樿鍚湁闊抽锛屾挱鏀炬椂鍐嶆鏌ユ槸鍚︽湁闊抽鍙婃槸鍚AC
-					storager.updateChannel(device.getDeviceId(), deviceChannel);
+				device.setName(XmlUtil.getText(rootElement, "DeviceName"));
+				device.setManufacturer(XmlUtil.getText(rootElement, "Manufacturer"));
+				device.setModel(XmlUtil.getText(rootElement, "Model"));
+				device.setFirmware(XmlUtil.getText(rootElement, "Firmware"));
+				if (StringUtils.isEmpty(device.getStreamMode())) {
+					device.setStreamMode("UDP");
 				}
-
+				storager.updateDevice(device);
+	
 				RequestMessage msg = new RequestMessage();
 				msg.setDeviceId(deviceId);
-				msg.setType(DeferredResultHolder.CALLBACK_CMD_CATALOG);
+				msg.setType(DeferredResultHolder.CALLBACK_CMD_DEVICEINFO);
 				msg.setData(device);
 				deferredResultHolder.invokeResult(msg);
-
-				// 鍥炲200
+				// 鍥炲200 OK
+				responseAck(evt);
 				if (offLineDetector.isOnline(deviceId)) {
-					responseAck(evt);
 					publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
 				}
-
 			}
 		} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
 			e.printStackTrace();
 		}
 	}
-	
+
+	/***
+	 * 鏀跺埌catalog璁惧鐩綍鍒楄〃璇锋眰 澶勭悊
+	 * 
+	 * @param evt
+	 */
+	private void processMessageCatalogList(RequestEvent evt) {
+		try {
+			Element rootElement = getRootElement(evt);
+			String name = rootElement.getName();
+			Element deviceIdElement = rootElement.element("DeviceID");
+			String deviceId = deviceIdElement.getText();
+			Element deviceListElement = rootElement.element("DeviceList");
+
+			FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
+			AddressImpl address = (AddressImpl) fromHeader.getAddress();
+			SipUri uri = (SipUri) address.getURI();
+			String platformId = uri.getUser();
+			// if (deviceListElement == null) { // 瀛樺湪DeviceList鍒欎负鍝嶅簲 catalog锛� 涓嶅瓨鍦―eviceList鍒欎负鏌ヨ璇锋眰
+			if (name.equalsIgnoreCase("Query")) { // 鍖哄垎鏄疪esponse鈥斺�旀煡璇㈠搷搴旓紝杩樻槸Query鈥斺�旀煡璇㈣姹�
+				// TODO 鍚庣画灏嗕唬鐮佹媶鍒�
+				ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
+				if (parentPlatform == null) {
+					response404Ack(evt);
+					return;
+				} else {
+					// 鍥炲200 OK
+					responseAck(evt);
+
+					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(cmder.getSipConfig().getSipDomain());
+							deviceChannel.setModel("live");
+							deviceChannel.setOwner("wvp-pro");
+//							deviceChannel.setAddress("test");
+							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);
+					}
+				}
+
+
+			} else {
+				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();
+						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(XmlUtil.getText(itemDevice, "Manufacturer"));
+						deviceChannel.setModel(XmlUtil.getText(itemDevice, "Model"));
+						deviceChannel.setOwner(XmlUtil.getText(itemDevice, "Owner"));
+						deviceChannel.setCivilCode(XmlUtil.getText(itemDevice, "CivilCode"));
+						deviceChannel.setBlock(XmlUtil.getText(itemDevice, "Block"));
+						deviceChannel.setAddress(XmlUtil.getText(itemDevice, "Address"));
+						if (XmlUtil.getText(itemDevice, "Parental") == null || XmlUtil.getText(itemDevice, "Parental") == "") {
+							deviceChannel.setParental(0);
+						} else {
+							deviceChannel.setParental(Integer.parseInt(XmlUtil.getText(itemDevice, "Parental")));
+						}
+						deviceChannel.setParentId(XmlUtil.getText(itemDevice, "ParentID"));
+						if (XmlUtil.getText(itemDevice, "SafetyWay") == null || XmlUtil.getText(itemDevice, "SafetyWay") == "") {
+							deviceChannel.setSafetyWay(0);
+						} else {
+							deviceChannel.setSafetyWay(Integer.parseInt(XmlUtil.getText(itemDevice, "SafetyWay")));
+						}
+						if (XmlUtil.getText(itemDevice, "RegisterWay") == null || XmlUtil.getText(itemDevice, "RegisterWay") == "") {
+							deviceChannel.setRegisterWay(1);
+						} else {
+							deviceChannel.setRegisterWay(Integer.parseInt(XmlUtil.getText(itemDevice, "RegisterWay")));
+						}
+						deviceChannel.setCertNum(XmlUtil.getText(itemDevice, "CertNum"));
+						if (XmlUtil.getText(itemDevice, "Certifiable") == null || XmlUtil.getText(itemDevice, "Certifiable") == "") {
+							deviceChannel.setCertifiable(0);
+						} else {
+							deviceChannel.setCertifiable(Integer.parseInt(XmlUtil.getText(itemDevice, "Certifiable")));
+						}
+						if (XmlUtil.getText(itemDevice, "ErrCode") == null || XmlUtil.getText(itemDevice, "ErrCode") == "") {
+							deviceChannel.setErrCode(0);
+						} else {
+							deviceChannel.setErrCode(Integer.parseInt(XmlUtil.getText(itemDevice, "ErrCode")));
+						}
+						deviceChannel.setEndTime(XmlUtil.getText(itemDevice, "EndTime"));
+						deviceChannel.setSecrecy(XmlUtil.getText(itemDevice, "Secrecy"));
+						deviceChannel.setIpAddress(XmlUtil.getText(itemDevice, "IPAddress"));
+						if (XmlUtil.getText(itemDevice, "Port") == null || XmlUtil.getText(itemDevice, "Port") == "") {
+							deviceChannel.setPort(0);
+						} else {
+							deviceChannel.setPort(Integer.parseInt(XmlUtil.getText(itemDevice, "Port")));
+						}
+						deviceChannel.setPassword(XmlUtil.getText(itemDevice, "Password"));
+						if (NumericUtil.isDouble(XmlUtil.getText(itemDevice, "Longitude"))) {
+							deviceChannel.setLongitude(Double.parseDouble(XmlUtil.getText(itemDevice, "Longitude")));
+						} else {
+							deviceChannel.setLongitude(0.00);
+						}
+						if (NumericUtil.isDouble(XmlUtil.getText(itemDevice, "Latitude"))) {
+							deviceChannel.setLatitude(Double.parseDouble(XmlUtil.getText(itemDevice, "Latitude")));
+						} else {
+							deviceChannel.setLatitude(0.00);
+						}
+						if (XmlUtil.getText(itemDevice, "PTZType") == null || XmlUtil.getText(itemDevice, "PTZType") == "") {
+							deviceChannel.setPTZType(0);
+						} else {
+							deviceChannel.setPTZType(Integer.parseInt(XmlUtil.getText(itemDevice, "PTZType")));
+						}
+						deviceChannel.setHasAudio(true); // 榛樿鍚湁闊抽锛屾挱鏀炬椂鍐嶆鏌ユ槸鍚︽湁闊抽鍙婃槸鍚AC
+						storager.updateChannel(device.getDeviceId(), deviceChannel);
+					}
+
+					RequestMessage msg = new RequestMessage();
+					msg.setDeviceId(deviceId);
+					msg.setType(DeferredResultHolder.CALLBACK_CMD_CATALOG);
+					msg.setData(device);
+					deferredResultHolder.invokeResult(msg);
+					// 鍥炲200 OK
+					responseAck(evt);
+					if (offLineDetector.isOnline(deviceId)) {
+						publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
+					}
+				}
+			}
+		} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
+			e.printStackTrace();
+		}
+	}
+
 	/***
 	 * 鏀跺埌alarm璁惧鎶ヨ淇℃伅 澶勭悊
+	 * 
 	 * @param evt
 	 */
 	private void processMessageAlarm(RequestEvent evt) {
@@ -230,141 +688,309 @@
 			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) {
-				// TODO 涔熷彲鑳芥槸閫氶亾
-//				storager.queryChannel(deviceId)
 				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"));
-			if (StringUtils.isEmpty(device.getStreamMode())){
-				device.setStreamMode("UDP");
+
+			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"));
+				}
+				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);
 			}
-			storager.updateDevice(device);
-			cmder.catalogQuery(device);
-		} catch (DocumentException e) {
+		} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
+			// } catch (DocumentException e) {
 			e.printStackTrace();
 		}
 	}
-	
+
 	/***
 	 * 鏀跺埌keepalive璇锋眰 澶勭悊
+	 * 
 	 * @param evt
 	 */
-	private void processMessageKeepAlive(RequestEvent evt){
+	private void processMessageKeepAlive(RequestEvent evt) {
 		try {
 			Element rootElement = getRootElement(evt);
-			String deviceId = XmlUtil.getText(rootElement,"DeviceID");
-			if (offLineDetector.isOnline(deviceId)) {
+			String deviceId = XmlUtil.getText(rootElement, "DeviceID");
+			Device device = storager.queryVideoDevice(deviceId);
+			// 妫�鏌ヨ澶囨槸鍚﹀瓨鍦ㄥ苟鍦ㄧ嚎锛� 涓嶅瓨鍦ㄥ垯涓嶅洖澶�
+			if (device != null && device.getOnline() == 1) {
+				// 鍥炲200 OK
 				responseAck(evt);
-				publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
-			} else {
+				if (offLineDetector.isOnline(deviceId)) {
+					publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
+				} else {
+				}
+			}else {
+				logger.warn("鏀跺埌[ "+deviceId+" ]蹇冭烦淇℃伅, 浣嗘槸璁惧" + (device == null? "涓嶅瓨鍦�":"绂荤嚎") + ", 鍥炲401");
+				Response response = getMessageFactory().createResponse(Response.UNAUTHORIZED, evt.getRequest());
+				getServerTransaction(evt).sendResponse(response);
 			}
 		} catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
 			e.printStackTrace();
 		}
 	}
-	
+
 	/***
-	 * 鏀跺埌catalog璁惧鐩綍鍒楄〃璇锋眰 澶勭悊
-	 * TODO 杩囨湡鏃堕棿鏆傛椂鍐欐180绉掞紝鍚庣画涓嶥eferredResult瓒呮椂鏃堕棿淇濇寔涓�鑷�
+	 * 澶勭悊RecordInfo璁惧褰曞儚鍒楄〃Message璇锋眰 TODO 杩囨湡鏃堕棿鏆傛椂鍐欐180绉掞紝鍚庣画涓嶥eferredResult瓒呮椂鏃堕棿淇濇寔涓�鑷�
+	 * 
 	 * @param evt
 	 */
 	private void processMessageRecordInfo(RequestEvent evt) {
 		try {
+			// 鍥炲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();
 			recordInfo.setDeviceId(deviceId);
-			recordInfo.setName(XmlUtil.getText(rootElement,"Name"));
-			recordInfo.setSumNum(Integer.parseInt(XmlUtil.getText(rootElement,"SumNum")));
-			String sn = XmlUtil.getText(rootElement,"SN");
+			recordInfo.setName(XmlUtil.getText(rootElement, "Name"));
+			if (XmlUtil.getText(rootElement, "SumNum")== null || XmlUtil.getText(rootElement, "SumNum") =="") {
+				recordInfo.setSumNum(0);
+			} else {
+				recordInfo.setSumNum(Integer.parseInt(XmlUtil.getText(rootElement, "SumNum")));
+			}
+			String sn = XmlUtil.getText(rootElement, "SN");
 			Element recordListElement = rootElement.element("RecordList");
-			if (recordListElement == null) {
-				return;
-			}
-			
-			Iterator<Element> recordListIterator = recordListElement.elementIterator();
-			List<RecordItem> recordList = new ArrayList<RecordItem>();
-			if (recordListIterator != null) {
-				RecordItem record = new RecordItem();
-				// 閬嶅巻DeviceList
-				while (recordListIterator.hasNext()) {
-					Element itemRecord = recordListIterator.next();
-					Element recordElement = itemRecord.element("DeviceID");
-					if (recordElement == null) {
-						continue;
+			if (recordListElement == null || recordInfo.getSumNum() == 0) {
+				logger.info("鏃犲綍鍍忔暟鎹�");
+				RequestMessage msg = new RequestMessage();
+				msg.setDeviceId(deviceId);
+				msg.setType(DeferredResultHolder.CALLBACK_CMD_RECORDINFO);
+				msg.setData(recordInfo);
+				deferredResultHolder.invokeResult(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(XmlUtil.getText(itemRecord, "DeviceID"));
+						record.setName(XmlUtil.getText(itemRecord, "Name"));
+						record.setFilePath(XmlUtil.getText(itemRecord, "FilePath"));
+						record.setAddress(XmlUtil.getText(itemRecord, "Address"));
+						record.setStartTime(
+								DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(XmlUtil.getText(itemRecord, "StartTime")));
+						record.setEndTime(
+								DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(XmlUtil.getText(itemRecord, "EndTime")));
+						record.setSecrecy(itemRecord.element("Secrecy") == null ? 0
+								: Integer.parseInt(XmlUtil.getText(itemRecord, "Secrecy")));
+						record.setType(XmlUtil.getText(itemRecord, "Type"));
+						record.setRecorderId(XmlUtil.getText(itemRecord, "RecorderID"));
+						recordList.add(record);
 					}
-					record = new RecordItem();
-					record.setDeviceId(XmlUtil.getText(itemRecord,"DeviceID"));
-					record.setName(XmlUtil.getText(itemRecord,"Name"));
-					record.setFilePath(XmlUtil.getText(itemRecord,"FilePath"));
-					record.setAddress(XmlUtil.getText(itemRecord,"Address"));
-					record.setStartTime(DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(XmlUtil.getText(itemRecord,"StartTime")));
-					record.setEndTime(DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(XmlUtil.getText(itemRecord,"EndTime")));
-					record.setSecrecy(itemRecord.element("Secrecy") == null? 0:Integer.parseInt(XmlUtil.getText(itemRecord,"Secrecy")));
-					record.setType(XmlUtil.getText(itemRecord,"Type"));
-					record.setRecorderId(XmlUtil.getText(itemRecord,"RecorderID"));
-					recordList.add(record);
+					recordInfo.setRecordList(recordList);
 				}
-//				recordList.sort(Comparator.naturalOrder());
-				recordInfo.setRecordList(recordList);
-			}
-			
-			// 瀛樺湪褰曞儚涓斿鏋滃綋鍓嶅綍鍍忔槑缁嗕釜鏁板皬浜庢�绘潯鏁帮紝璇存槑鎷嗗寘杩斿洖锛岄渶瑕佺粍瑁咃紝鏆備笉杩斿洖
-			if (recordInfo.getSumNum() > 0 && recordList.size() > 0 && recordList.size() < recordInfo.getSumNum()) {
-				// 涓洪槻姝㈣繛缁姹傝璁惧鐨勫綍鍍忔暟鎹紝杩斿洖鏁版嵁閿欎贡锛岀壒澧炲姞sn杩涜鍖哄垎
-				String cacheKey = CACHE_RECORDINFO_KEY+deviceId+sn;
-				// TODO 鏆傛椂鐩存帴鎿嶄綔redis瀛樺偍锛屽悗缁皝瑁呬笓鐢ㄧ紦瀛樻帴鍙o紝鏀逛负鏈湴鍐呭瓨缂撳瓨
-				if (redis.hasKey(cacheKey)) {
-					List<RecordItem> previousList = (List<RecordItem>) redis.get(cacheKey);
-					if (previousList != null && previousList.size() > 0) {
-						recordList.addAll(previousList);
-					}
-					// 鏈垎鏀〃绀哄綍鍍忓垪琛ㄨ鎷嗗寘锛屼笖鍔犱笂涔嬪墠鐨勬暟鎹繕鏄笉澶�,淇濆瓨缂撳瓨杩斿洖锛岀瓑寰呬笅涓寘鍐嶅鐞�
-					if (recordList.size() < recordInfo.getSumNum()) {
-						redis.set(cacheKey, recordList, 180);
-						return;
-					} else {
-						// 鏈垎鏀〃绀哄綍鍍忚鎷嗗寘锛屼絾鍔犱笂涔嬪墠鐨勬暟鎹瓒冲锛岃繑鍥炲搷搴�
-						// 鍥犺澶囧績璺虫湁鐩戝惉redis杩囨湡鏈哄埗锛屼负鎻愰珮鎬ц兘锛屾澶勬墜鍔ㄥ垹闄�
-						redis.del(cacheKey);
+
+				// 鏀圭敤鍗曠嫭绾跨▼缁熻宸茶幏鍙栧綍鍍忔枃浠舵暟閲忥紝閬垮厤澶氬寘骞惰鍒嗗埆缁熻涓嶅畬鏁寸殑闂
+				String cacheKey = CACHE_RECORDINFO_KEY + deviceId + 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 {
-					// 鏈垎鏀湁涓ょ鍙兘锛�1銆佸綍鍍忓垪琛ㄨ鎷嗗寘锛屼笖鏄涓�涓寘,鐩存帴淇濆瓨缂撳瓨杩斿洖锛岀瓑寰呬笅涓寘鍐嶅鐞�
-					//             2銆佷箣鍓嶆湁鍖咃紝浣嗚秴鏃舵竻绌轰簡锛岄偅涔堣繖娆n鎵规鐨勫搷搴旀暟鎹凡缁忎笉瀹屾暣锛岀瓑寰呰繃鏈熸椂闂村悗redis鑷姩娓呯┖鏁版嵁
-					redis.set(cacheKey, recordList, 180);
-					return;
+					if (logger.isDebugEnabled()) {
+						logger.debug("Thread " + cacheKey + " already started.");
+					}
 				}
-				
+
+				// 瀛樺湪褰曞儚涓斿鏋滃綋鍓嶅綍鍍忔槑缁嗕釜鏁板皬浜庢�绘潯鏁帮紝璇存槑鎷嗗寘杩斿洖锛岄渶瑕佺粍瑁咃紝鏆備笉杩斿洖
+				// if (recordInfo.getSumNum() > 0 && recordList.size() > 0 && recordList.size() < recordInfo.getSumNum()) {
+				// 	// 涓洪槻姝㈣繛缁姹傝璁惧鐨勫綍鍍忔暟鎹紝杩斿洖鏁版嵁閿欎贡锛岀壒澧炲姞sn杩涜鍖哄垎
+				// 	String cacheKey = CACHE_RECORDINFO_KEY + deviceId + sn;
+
+				// 	redis.set(cacheKey + "_" + uuid, recordList, 90);
+				// 	List<Object> cacheKeys = redis.scan(cacheKey + "_*");
+				// 	List<RecordItem> totalRecordList = new ArrayList<RecordItem>();
+				// 	for (int i = 0; i < cacheKeys.size(); i++) {
+				// 		totalRecordList.addAll((List<RecordItem>) redis.get(cacheKeys.get(i).toString()));
+				// 	}
+				// 	if (totalRecordList.size() < recordInfo.getSumNum()) {
+				// 		logger.info("宸茶幏鍙�" + totalRecordList.size() + "椤瑰綍鍍忔暟鎹紝鍏�" + recordInfo.getSumNum() + "椤�");
+				// 		return;
+				// 	}
+				// 	logger.info("褰曞儚鏁版嵁宸插叏閮ㄨ幏鍙栵紝鍏�" + recordInfo.getSumNum() + "椤�");
+				// 	recordInfo.setRecordList(totalRecordList);
+				// 	for (int i = 0; i < cacheKeys.size(); i++) {
+				// 		redis.del(cacheKeys.get(i).toString());
+				// 	}
+				// }
+				// // 鑷劧椤哄簭鎺掑簭, 鍏冪礌杩涜鍗囧簭鎺掑垪
+				// recordInfo.getRecordList().sort(Comparator.naturalOrder());
 			}
 			// 璧板埌杩欓噷锛屾湁浠ヤ笅鍙兘锛�1銆佹病鏈夊綍鍍忎俊鎭�,绗竴娆℃敹鍒皉ecordinfo鐨勬秷鎭嵆杩斿洖鍝嶅簲鏁版嵁锛屾棤redis鎿嶄綔
-			//               2銆佹湁褰曞儚鏁版嵁锛屼笖绗竴娆″嵆鏀跺埌瀹屾暣鏁版嵁锛岃繑鍥炲搷搴旀暟鎹紝鏃爎edis鎿嶄綔
-			//	             3銆佹湁褰曞儚鏁版嵁锛屽湪瓒呮椂鏃堕棿鍐呮敹鍒板娆″寘缁勮鍚庢暟閲忚冻澶燂紝杩斿洖鏁版嵁
+			// 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);
-		} catch (DocumentException e) {
+			// RequestMessage msg = new RequestMessage();
+			// msg.setDeviceId(deviceId);
+			// msg.setType(DeferredResultHolder.CALLBACK_CMD_RECORDINFO);
+			// msg.setData(recordInfo);
+			// deferredResultHolder.invokeResult(msg);
+			// logger.info("澶勭悊瀹屾垚锛岃繑鍥炵粨鏋�");
+		} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
 			e.printStackTrace();
 		}
 	}
-	
+
+	/**
+	 * 鏀跺埌MediaStatus娑堟伅澶勭悊
+ 	 *  
+ 	 * @param evt
+ 	 */
+	private void processMessageMediaStatus(RequestEvent evt){
+		try {
+			// 鍥炲200 OK
+			responseAck(evt);
+			Element rootElement = getRootElement(evt);
+			String deviceId = 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.getDeviceID(), streamInfo.getChannelId());
+				}
+			}
+		} catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 澶勭悊AudioBroadcast璇煶骞挎挱Message
+	 * 
+	 * @param evt
+	 */
+	private void processMessageBroadcast(RequestEvent evt) {
+		try {
+			Element rootElement = getRootElement(evt);
+			String deviceId = XmlUtil.getText(rootElement, "DeviceID");
+			// 鍥炲200 OK
+			responseAck(evt);
+			if (rootElement.getName().equals("Response")) {
+					// 姝ゅ鏄鏈钩鍙板彂鍑築roadcast鎸囦护鐨勫簲绛�
+				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_BROADCAST);
+				msg.setData(json);
+				deferredResultHolder.invokeResult(msg);
+			} else {
+				// 姝ゅ鏄笂绾у彂鍑虹殑Broadcast鎸囦护
+			}
+		} catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
+			e.printStackTrace();
+		}
+	}
+
+
+	/***
+	 * 鍥炲200 OK
+	 * @param evt
+	 * @throws SipException
+	 * @throws InvalidArgumentException
+	 * @throws ParseException
+	 */
 	private void responseAck(RequestEvent evt) throws SipException, InvalidArgumentException, ParseException {
-		Response response = getMessageFactory().createResponse(Response.OK,evt.getRequest());
+		Response response = getMessageFactory().createResponse(Response.OK, evt.getRequest());
 		getServerTransaction(evt).sendResponse(response);
 	}
-	
+
+	/***
+	 * 鍥炲404
+	 * @param evt
+	 * @throws SipException
+	 * @throws InvalidArgumentException
+	 * @throws ParseException
+	 */
+	private void response404Ack(RequestEvent evt) throws SipException, InvalidArgumentException, ParseException {
+		Response response = getMessageFactory().createResponse(Response.NOT_FOUND, evt.getRequest());
+		getServerTransaction(evt).sendResponse(response);
+	}
+
 	private Element getRootElement(RequestEvent evt) throws DocumentException {
 		Request request = evt.getRequest();
 		SAXReader reader = new SAXReader();
@@ -397,4 +1023,19 @@
 		this.offLineDetector = offLineDetector;
 	}
 
+	public IRedisCatchStorage getRedisCatchStorage() {
+		return redisCatchStorage;
+	}
+
+	public void setRedisCatchStorage(IRedisCatchStorage redisCatchStorage) {
+		this.redisCatchStorage = redisCatchStorage;
+	}
+
+	public SIPCommanderFroPlatform getCmderFroPlatform() {
+		return cmderFroPlatform;
+	}
+
+	public void setCmderFroPlatform(SIPCommanderFroPlatform cmderFroPlatform) {
+		this.cmderFroPlatform = cmderFroPlatform;
+	}
 }

--
Gitblit v1.8.0