Commit a0cdc7c59d37aedc2538bfb6db8559286e4969b5
1 parent
9c349789
修复查询历史录像无记录时报错问题
Showing
1 changed file
with
7 additions
and
3 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java
| @@ -94,7 +94,8 @@ public class RecordInfoResponseMessageHandler extends SIPRequestProcessorParent | @@ -94,7 +94,8 @@ public class RecordInfoResponseMessageHandler extends SIPRequestProcessorParent | ||
| 94 | recordInfo.setCount(sumNum); | 94 | recordInfo.setCount(sumNum); |
| 95 | eventPublisher.recordEndEventPush(recordInfo); | 95 | eventPublisher.recordEndEventPush(recordInfo); |
| 96 | releaseRequest(device.getDeviceId(), sn,recordInfo); | 96 | releaseRequest(device.getDeviceId(), sn,recordInfo); |
| 97 | - } else { | 97 | + } else |
| 98 | + { | ||
| 98 | Iterator<Element> recordListIterator = recordListElement.elementIterator(); | 99 | Iterator<Element> recordListIterator = recordListElement.elementIterator(); |
| 99 | if (recordListIterator != null) { | 100 | if (recordListIterator != null) { |
| 100 | List<RecordItem> recordList = new ArrayList<>(); | 101 | List<RecordItem> recordList = new ArrayList<>(); |
| @@ -162,9 +163,12 @@ public class RecordInfoResponseMessageHandler extends SIPRequestProcessorParent | @@ -162,9 +163,12 @@ public class RecordInfoResponseMessageHandler extends SIPRequestProcessorParent | ||
| 162 | 163 | ||
| 163 | public void releaseRequest(String deviceId, String sn,RecordInfo recordInfo){ | 164 | public void releaseRequest(String deviceId, String sn,RecordInfo recordInfo){ |
| 164 | String key = DeferredResultHolder.CALLBACK_CMD_RECORDINFO + deviceId + sn; | 165 | String key = DeferredResultHolder.CALLBACK_CMD_RECORDINFO + deviceId + sn; |
| 166 | + if(null!=recordInfo.getRecordList()){ | ||
| 167 | + Collections.sort(recordInfo.getRecordList()); | ||
| 168 | + }else{ | ||
| 169 | + recordInfo.setRecordList(new ArrayList<>()); | ||
| 170 | + } | ||
| 165 | // 对数据进行排序 | 171 | // 对数据进行排序 |
| 166 | - Collections.sort(recordInfo.getRecordList()); | ||
| 167 | - | ||
| 168 | RequestMessage msg = new RequestMessage(); | 172 | RequestMessage msg = new RequestMessage(); |
| 169 | msg.setKey(key); | 173 | msg.setKey(key); |
| 170 | msg.setData(recordInfo); | 174 | msg.setData(recordInfo); |