648540858
2020-11-09 2e9b4b4e5e86c84088c45563cd61d18d8c7e5fea
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
@@ -310,12 +310,11 @@
         recordInfo.setSumNum(Integer.parseInt(XmlUtil.getText(rootElement, "SumNum")));
         String sn = XmlUtil.getText(rootElement, "SN");
         Element recordListElement = rootElement.element("RecordList");
         if (recordListElement == null) {
         if (recordListElement == null || recordInfo.getSumNum() == 0) {
            logger.info("无录像数据");
            // responseAck(evt);
            return;
         }
            // return;
         } else {
         Iterator<Element> recordListIterator = recordListElement.elementIterator();
         List<RecordItem> recordList = new ArrayList<RecordItem>();
         if (recordListIterator != null) {
@@ -336,7 +335,8 @@
               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.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"));
@@ -371,12 +371,15 @@
            } else {
               // 本分支有两种可能:1、录像列表被拆包,且是第一个包,直接保存缓存返回,等待下个包再处理
               // 2、之前有包,但超时清空了,那么这次sn批次的响应数据已经不完整,等待过期时间后redis自动清空数据
                  logger.info("已获取" + recordList.size() + "项录像数据,共" + recordInfo.getSumNum() + "项");
               logger.info("等待后续的包...");
               redis.set(cacheKey, recordList, 90);
               return;
            }
            }
            // 自然顺序排序, 元素进行升序排列
            recordInfo.getRecordList().sort(Comparator.naturalOrder());
         }
         // 走到这里,有以下可能:1、没有录像信息,第一次收到recordinfo的消息即返回响应数据,无redis操作
         // 2、有录像数据,且第一次即收到完整数据,返回响应数据,无redis操作
@@ -386,8 +389,8 @@
         RequestMessage msg = new RequestMessage();
         msg.setDeviceId(deviceId);
         msg.setType(DeferredResultHolder.CALLBACK_CMD_RECORDINFO);
         // 自然顺序排序, 元素进行升序排列
         recordInfo.getRecordList().sort(Comparator.naturalOrder());
         // // 自然顺序排序, 元素进行升序排列
         // recordInfo.getRecordList().sort(Comparator.naturalOrder());
         msg.setData(recordInfo);
         deferredResultHolder.invokeResult(msg);
         logger.info("处理完成,返回结果");