648540858
2020-10-26 9361943e47a09ea46f76adf06fa0d24a07ac711d
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
@@ -2,11 +2,7 @@
import java.io.ByteArrayInputStream;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.*;
import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
@@ -203,7 +199,7 @@
               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(false); // 默认含有音频为false
               deviceChannel.setHasAudio(true); // 默认含有音频,播放时再检查是否有音频及是否AAC
               storager.updateChannel(device.getDeviceId(), deviceChannel);
            }
@@ -316,6 +312,7 @@
               record.setRecorderId(XmlUtil.getText(itemRecord,"RecorderID"));
               recordList.add(record);
            }
//            recordList.sort(Comparator.naturalOrder());
            recordInfo.setRecordList(recordList);
         }
         
@@ -349,9 +346,13 @@
         // 走到这里,有以下可能: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);
      } catch (DocumentException e) {