Merge pull request #6 from lawrencehj/master

648540858

2020-10-29 5749cdd16cd79890c659775de9b1cb7e7ffda5b1

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

@@ -106,6 +106,7 @@
   

   /**

    * 收到deviceInfo设备信息请求 处理

    * 
    * @param evt

    */

   private void processMessageDeviceInfo(RequestEvent evt) {

@@ -132,13 +133,19 @@
         msg.setType(DeferredResultHolder.CALLBACK_CMD_DEVICEINFO);

         msg.setData(device);

         deferredResultHolder.invokeResult(msg);

      } catch (DocumentException e) {

         // 回复200 OK

         responseAck(evt);

         if (offLineDetector.isOnline(deviceId)) {

            publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);

         }

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

         e.printStackTrace();

      }

   }

   

   /***

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

    * 
    * @param evt

    */

   private void processMessageCatalogList(RequestEvent evt) {

@@ -184,21 +191,30 @@
               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.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.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.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.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.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); // 默认含有音频，播放时再检查是否有音频及是否AAC

               storager.updateChannel(device.getDeviceId(), deviceChannel);

            }

@@ -208,13 +224,11 @@
            msg.setType(DeferredResultHolder.CALLBACK_CMD_CATALOG);

            msg.setData(device);

            deferredResultHolder.invokeResult(msg);



            // 回复200

            if (offLineDetector.isOnline(deviceId)) {

            // 回复200 OK

               responseAck(evt);

            if (offLineDetector.isOnline(deviceId)) {

               publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);

            }



         }

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

         e.printStackTrace();

@@ -223,6 +237,7 @@
   

   /***

    * 收到alarm设备报警信息 处理

    * 
    * @param evt

    */

   private void processMessageAlarm(RequestEvent evt) {

@@ -246,21 +261,29 @@
         }

         storager.updateDevice(device);

         cmder.catalogQuery(device);

      } catch (DocumentException e) {

         // 回复200 OK

         responseAck(evt);

         if (offLineDetector.isOnline(deviceId)) {

            publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);

         }

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

         // } catch (DocumentException e) {

         e.printStackTrace();

      }

   }

   

   /***

    * 收到keepalive请求 处理

    * 
    * @param evt

    */

   private void processMessageKeepAlive(RequestEvent evt){

      try {

         Element rootElement = getRootElement(evt);

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

         if (offLineDetector.isOnline(deviceId)) {

         // 回复200 OK

            responseAck(evt);

         if (offLineDetector.isOnline(deviceId)) {

            publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);

         } else {

         }

@@ -270,12 +293,14 @@
   }

   

   /***

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

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

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

    * 
    * @param evt

    */

   private void processMessageRecordInfo(RequestEvent evt) {

      try {

         // 回复200 OK

         responseAck(evt);

         RecordInfo recordInfo = new RecordInfo();

         Element rootElement = getRootElement(evt);

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

@@ -286,6 +311,8 @@
         String sn = XmlUtil.getText(rootElement,"SN");

         Element recordListElement = rootElement.element("RecordList");

         if (recordListElement == null) {

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

            // responseAck(evt);

            return;

         }

         

@@ -293,11 +320,13 @@
         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();

@@ -305,9 +334,11 @@
               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.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.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);

@@ -328,17 +359,21 @@
               }

               // 本分支表示录像列表被拆包，且加上之前的数据还是不够,保存缓存返回，等待下个包再处理

               if (recordList.size() < recordInfo.getSumNum()) {

                  redis.set(cacheKey, recordList, 180);

                  logger.info("已获取" + recordList.size() + "项录像数据，共" + recordInfo.getSumNum() + "项");

                  redis.set(cacheKey, recordList, 90);

                  return;

               } else {

                  // 本分支表示录像被拆包，但加上之前的数据够足够，返回响应

                  // 因设备心跳有监听redis过期机制，为提高性能，此处手动删除

                  logger.info("录像数据已全部获取");

                  redis.del(cacheKey);

               }

            } else {

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

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

               redis.set(cacheKey, recordList, 180);

               logger.info("等待后续的包...");



               redis.set(cacheKey, recordList, 90);

               return;

            }

            

@@ -355,7 +390,8 @@
         recordInfo.getRecordList().sort(Comparator.naturalOrder());

         msg.setData(recordInfo);

         deferredResultHolder.invokeResult(msg);

      } catch (DocumentException e) {

         logger.info("处理完成，返回结果");

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

         e.printStackTrace();

      }

   }