尝试修复catalog获取失败。服务重启后设备未注册仍上报keeplive处理

songww

2020-05-13 ca5139929b8b5853229ca3d63e2bca1ce82fa0ab

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

@@ -19,6 +19,8 @@
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 org.springframework.stereotype.Component;



@@ -28,6 +30,7 @@
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;

@@ -36,6 +39,7 @@
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;



/**    

 * @Description:MESSAGE请求处理器

@@ -44,7 +48,9 @@
 */

@Component

public class MessageRequestProcessor implements ISIPRequestProcessor {



	
   private final static Logger logger = LoggerFactory.getLogger(MessageRequestProcessor.class);

	
   private ServerTransaction transaction;

   

   private SipLayer layer;

@@ -59,7 +65,25 @@
   private EventPublisher publisher;

   

   @Autowired

   private RedisUtil redis;

	
   @Autowired

   private DeferredResultHolder deferredResultHolder;

	
   @Autowired

   private DeviceOffLineDetector offLineDetector;

	
   private final static String CACHE_RECORDINFO_KEY = "CACHE_RECORDINFO_";

	
   private static final String MESSAGE_CATALOG = "Catalog";

   private static final String MESSAGE_DEVICE_INFO = "DeviceInfo";

   private static final String MESSAGE_KEEP_ALIVE = "Keepalive";

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

   

   /**   

    * 处理MESSAGE请求

@@ -75,17 +99,31 @@
      this.transaction = transaction;

      

      Request request = evt.getRequest();

		
      if (new String(request.getRawContent()).contains("<CmdType>Keepalive</CmdType>")) {

         processMessageKeepAlive(evt);

      } else if (new String(request.getRawContent()).contains("<CmdType>Catalog</CmdType>")) {

         processMessageCatalogList(evt);

      } else if (new String(request.getRawContent()).contains("<CmdType>DeviceInfo</CmdType>")) {

         processMessageDeviceInfo(evt);

      } else if (new String(request.getRawContent()).contains("<CmdType>Alarm</CmdType>")) {

         processMessageAlarm(evt);

      } else if (new String(request.getRawContent()).contains("<CmdType>recordInfo</CmdType>")) {

         processMessageRecordInfo(evt);

      SAXReader reader = new SAXReader();

      Document xml;

      try {

         xml = reader.read(new ByteArrayInputStream(request.getRawContent()));

         Element rootElement = xml.getRootElement();

         String cmd = rootElement.element("CmdType").getStringValue();

			
         if (MESSAGE_KEEP_ALIVE.equals(cmd)) {

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

            processMessageKeepAlive(evt);

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

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

            processMessageCatalogList(evt);

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

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

            processMessageDeviceInfo(evt);

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

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

            processMessageAlarm(evt);

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

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

            processMessageRecordInfo(evt);

         }

      } catch (DocumentException e) {

         e.printStackTrace();

      }

      

   }

@@ -232,12 +270,17 @@
    */

   private void processMessageKeepAlive(RequestEvent evt){

      try {

         Request request = evt.getRequest();

         Response response = layer.getMessageFactory().createResponse(Response.OK,request);

         Element rootElement = getRootElement(evt);

         Element deviceIdElement = rootElement.element("DeviceID");

         String deviceId = XmlUtil.getText(rootElement,"DeviceID");

         Request request = evt.getRequest();

         Response response = null;

         if (offLineDetector.isOnline(deviceId)) {

            response = layer.getMessageFactory().createResponse(Response.OK,request);

            publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);

         } else {

            response = layer.getMessageFactory().createResponse(Response.BAD_REQUEST,request);

         }

         transaction.sendResponse(response);

         publisher.onlineEventPublish(deviceIdElement.getText(), VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);

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

         e.printStackTrace();

      }

@@ -245,6 +288,7 @@
   

   /***

    * 收到catalog设备目录列表请求 处理

    * TODO 过期时间暂时写死180秒，后续与DeferredResult超时时间保持一致

    * @param evt

    */

   private void processMessageRecordInfo(RequestEvent evt) {

@@ -256,15 +300,15 @@
         recordInfo.setDeviceId(deviceId);

         recordInfo.setName(XmlUtil.getText(rootElement,"Name"));

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

				
            List<RecordItem> recordList = new ArrayList<RecordItem>();

            RecordItem record = new RecordItem();

            // 遍历DeviceList

            while (recordListIterator.hasNext()) {

@@ -273,6 +317,7 @@
               if (recordElement == null) {

                  continue;

               }

               record = new RecordItem();

               record.setDeviceId(XmlUtil.getText(itemRecord,"DeviceID"));

               record.setName(XmlUtil.getText(itemRecord,"Name"));

               record.setFilePath(XmlUtil.getText(itemRecord,"FilePath"));

@@ -281,13 +326,42 @@
               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.setRecordId(XmlUtil.getText(itemRecord,"RecordID"));

               record.setRecordId(XmlUtil.getText(itemRecord,"RecorderID"));

               recordList.add(record);

            }

            recordInfo.setRecordList(recordList);

         }

         

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

         if (recordInfo.getSumNum() > 0 && recordList.size() > 0 && recordList.size() < recordInfo.getSumNum()) {

            // 为防止连续请求该设备的录像数据，返回数据错乱，特增加sn进行区分

            String cacheKey = CACHE_RECORDINFO_KEY+deviceId+sn;

            // TODO 暂时直接操作redis存储，后续封装专用缓存接口，改为本地内存缓存

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

               }

            } else {

               // 本分支有两种可能：1、录像列表被拆包，且是第一个包,直接保存缓存返回，等待下个包再处理

               //             2、之前有包，但超时清空了，那么这次sn批次的响应数据已经不完整，等待过期时间后redis自动清空数据

               redis.set(cacheKey, recordList, 180);

               return;

            }

				
         }

         // 走到这里，有以下可能：1、没有录像信息,第一次收到recordinfo的消息即返回响应数据，无redis操作

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

         //                3、有录像数据，在超时时间内收到多次包组装后数量足够，返回数据

         RequestMessage msg = new RequestMessage();

         msg.setDeviceId(deviceId);

         msg.setType(DeferredResultHolder.CALLBACK_CMD_RECORDINFO);