fix typo and broken url

Dectinc Chen

2021-04-16 681351d74040d64024c924a6d7da4e17b96d6a38

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java

@@ -4,46 +4,67 @@
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.header.FromHeader;

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.vmanager.platform.bean.ChannelReduce;

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;

import org.dom4j.Element;

import org.dom4j.io.SAXReader;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;



import com.genersoft.iot.vmp.common.VideoManagerConstants;

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;

import com.genersoft.iot.vmp.common.StreamInfo;



/**

 * @Description:MESSAGE请求处理器

 * @author: swwheihei

 * @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);



@@ -72,10 +93,13 @@
   private static final String MESSAGE_ALARM = "Alarm";

   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_MOBILE_POSITION = "MobilePosition";

   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请求

@@ -94,12 +118,22 @@
            processMessageKeepAlive(evt);

         } else if (MESSAGE_CONFIG_DOWNLOAD.equals(cmd)) {

            logger.info("接收到ConfigDownload消息");

            processMessageConfigDownload(evt);

         } else if (MESSAGE_CATALOG.equals(cmd)) {

            logger.info("接收到Catalog消息");

            processMessageCatalogList(evt);

         } else if (MESSAGE_DEVICE_INFO.equals(cmd)) {

            logger.info("接收到DeviceInfo消息");

            // DeviceInfo消息处理

            processMessageDeviceInfo(evt);

         } else if (MESSAGE_DEVICE_STATUS.equals(cmd)) {

            // DeviceStatus消息处理

            processMessageDeviceStatus(evt);

         } else if (MESSAGE_DEVICE_CONTROL.equals(cmd)) {

            logger.info("接收到DeviceControl消息");

            processMessageDeviceControl(evt);

         } else if (MESSAGE_DEVICE_CONFIG.equals(cmd)) {

            logger.info("接收到DeviceConfig消息");

            processMessageDeviceConfig(evt);

         } else if (MESSAGE_ALARM.equals(cmd)) {

            logger.info("接收到Alarm消息");

            processMessageAlarm(evt);

@@ -109,47 +143,354 @@
         }else if (MESSAGE_MEDIA_STATUS.equals(cmd)) {

            logger.info("接收到MediaStatus消息");

            processMessageMediaStatus(evt);

         } else if (MESSAGE_MOBILE_POSITION.equals(cmd)) {

            logger.info("接收到MobilePosition消息");

            processMessageMobilePosition(evt);

         } else if (MESSAGE_PRESET_QUERY.equals(cmd)) {

            logger.info("接收到PresetQuery消息");

            processMessagePresetQuery(evt);

         } else if (MESSAGE_BROADCAST.equals(cmd)) {

            // Broadcast消息处理

            processMessageBroadcast(evt);

         } else {

            logger.info("接收到消息：" + 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设备状态Message

    * 
    * @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")) { // 区分是Response——查询响应，还是Query——查询请求

            logger.info("接收到DeviceStatus查询消息");

            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("接收到DeviceStatus应答消息");

            // 检查设备是否存在， 不存在则不回复

            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设备状态Message

    * 
    * @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)) {

            // 此处是对本平台发出DeviceControl指令的应答

            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)) {

                  // 远程启动本平台：需要在重新启动程序后先对SipStack解绑

                  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设备状态Message

    * 
    * @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")) {

               // 此处是对本平台发出DeviceControl指令的应答

            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设备状态Message

    * 
    * @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")) {

               // 此处是对本平台发出DeviceControl指令的应答

            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预置位列表Message

    * 
    * @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)) {

            // 此处是对本平台发出DeviceControl指令的应答

            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);

         // 回复200 OK

         responseAck(evt);

         if (offLineDetector.isOnline(deviceId)) {

            publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);

         String deviceId = deviceIdElement.getTextTrim().toString();

         if (requestName.equals("Query")) {

            logger.info("接收到DeviceInfo查询消息");

            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.info("接收到DeviceInfo应答消息");

            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);

            // 回复200 OK

            responseAck(evt);

            if (offLineDetector.isOnline(deviceId)) {

               publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);

            }

         }

      } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {

         e.printStackTrace();

@@ -175,12 +516,12 @@
         String platformId = uri.getUser();

         // if (deviceListElement == null) { // 存在DeviceList则为响应 catalog， 不存在DeviceList则为查询请求

         if (name.equalsIgnoreCase("Query")) { // 区分是Response——查询响应，还是Query——查询请求

               // TODO 后续将代码拆分

            ParentPlatform parentPlatform = storager.queryParentPlatById(platformId);

            // TODO 后续将代码拆分

            ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);

            if (parentPlatform == null) {

               response404Ack(evt);

               return;

            }else {

            } else {

               // 回复200 OK

               responseAck(evt);



@@ -188,17 +529,48 @@
               String sn = snElement.getText();

               // 准备回复通道信息

               List<ChannelReduce> channelReduces = storager.queryChannelListInParentPlatform(parentPlatform.getServerGBId());

               if (channelReduces.size() >0 ) {

               // 查询关联的直播通道

               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(), channelReduces.size());

                     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 {

         } else {

            Iterator<Element> deviceListIterator = deviceListElement.elementIterator();

            if (deviceListIterator != null) {

               Device device = storager.queryVideoDevice(deviceId);

@@ -240,12 +612,12 @@
                     deviceChannel.setParental(Integer.parseInt(XmlUtil.getText(itemDevice, "Parental")));

                  }

                  deviceChannel.setParentId(XmlUtil.getText(itemDevice, "ParentID"));

                  if (XmlUtil.getText(itemDevice, "SafetyWay") == null || XmlUtil.getText(itemDevice, "SafetyWay")== "") {

                  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") =="") {

                  if (XmlUtil.getText(itemDevice, "RegisterWay") == null || XmlUtil.getText(itemDevice, "RegisterWay") == "") {

                     deviceChannel.setRegisterWay(1);

                  } else {

                     deviceChannel.setRegisterWay(Integer.parseInt(XmlUtil.getText(itemDevice, "RegisterWay")));

@@ -264,21 +636,21 @@
                  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") =="") {

                  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 (XmlUtil.getText(itemDevice, "Longitude") == null || XmlUtil.getText(itemDevice, "Longitude") == "") {

                     deviceChannel.setLongitude(0.00);

                  } else {

                  if (NumericUtil.isDouble(XmlUtil.getText(itemDevice, "Longitude"))) {

                     deviceChannel.setLongitude(Double.parseDouble(XmlUtil.getText(itemDevice, "Longitude")));

                  }

                  if (XmlUtil.getText(itemDevice, "Latitude") == null || XmlUtil.getText(itemDevice, "Latitude") =="") {

                     deviceChannel.setLatitude(0.00);

                  } 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);

@@ -301,7 +673,6 @@
               }

            }

         }



      } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {

         e.printStackTrace();

      }

@@ -317,48 +688,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) {

            // TODO 也可能是通道

            // storager.queryChannel(deviceId)

            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 (XmlUtil.getText(rootElement, "Longitude") == null || XmlUtil.getText(rootElement, "Longitude") == "") {

            deviceAlarm.setLongitude(0.00);

         } else {

            deviceAlarm.setLongitude(Double.parseDouble(XmlUtil.getText(rootElement, "Longitude")));

         }

         if (XmlUtil.getText(rootElement, "Latitude") == null || XmlUtil.getText(rootElement, "Latitude") =="") {

            deviceAlarm.setLatitude(0.00);

         } else {

            deviceAlarm.setLatitude(Double.parseDouble(XmlUtil.getText(rootElement, "Latitude")));

         }



         // 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);

         //cmder.catalogQuery(device, null);

         // 回复200 OK

         responseAck(evt);

         if (offLineDetector.isOnline(deviceId)) {

            publisher.deviceAlarmEventPublish(deviceAlarm);

         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);

         }

      } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {

         // } catch (DocumentException e) {

@@ -384,14 +779,13 @@
            } else {

            }

         }



      } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {

         e.printStackTrace();

      }

   }



   /***

    * 收到catalog设备目录列表请求 处理 TODO 过期时间暂时写死180秒，后续与DeferredResult超时时间保持一致

    * 处理RecordInfo设备录像列表Message请求 TODO 过期时间暂时写死180秒，后续与DeferredResult超时时间保持一致

    * 

    * @param evt

    */

@@ -415,8 +809,11 @@
         Element recordListElement = rootElement.element("RecordList");

         if (recordListElement == null || recordInfo.getSumNum() == 0) {

            logger.info("无录像数据");

            // responseAck(evt);

            // return;

            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>();

@@ -446,53 +843,73 @@
                  record.setRecorderId(XmlUtil.getText(itemRecord, "RecorderID"));

                  recordList.add(record);

               }

               // 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;



               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()));

            // 改用单独线程统计已获取录像文件数量，避免多包并行分别统计不完整的问题

            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 + ".");

               }

               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());

            } else {

               if (logger.isDebugEnabled()) {

                  logger.debug("Thread " + cacheKey + " already started.");

               }

            }

            // 自然顺序排序, 元素进行升序排列

            recordInfo.getRecordList().sort(Comparator.naturalOrder());



            // 存在录像且如果当前录像明细个数小于总条数，说明拆包返回，需要组装，暂不返回

            // 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、没有录像信息,第一次收到recordinfo的消息即返回响应数据，无redis操作

         // 2、有录像数据，且第一次即收到完整数据，返回响应数据，无redis操作

         // 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("处理完成，返回结果");

         // 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

@@ -513,6 +930,37 @@
      }

   }



   /**

    * 处理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")) {

               // 此处是对本平台发出Broadcast指令的应答

            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