Shikong/gb28181-docking-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

历史媒体记录查询 添加排序

Browse Source
This commit is contained in:
shikong 2023-08-23 10:32:49 +08:00
parent 81e20fee9a
commit fd8aa3dbc9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gb28181-service/src/main/java/cn/skcks/docking/gb28181/service/record/RecordService.java
View File

@ -28,6 +28,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.*; import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
@Slf4j @Slf4j
@Service @Service
@ -113,7 +114,7 @@ public class RecordService {
public void onComplete() { public void onComplete() {
schedule[0].cancel(true); schedule[0].cancel(true);
subscribe.getRecordInfoSubscribe().delPublisher(key); subscribe.getRecordInfoSubscribe().delPublisher(key);
result.setResult(JsonResponse.success(list)); result.setResult(JsonResponse.success(sortedRecordList(list)));
log.debug("订阅结束 => {}", key); log.debug("订阅结束 => {}", key);
} }
}; };
@ -121,10 +122,14 @@ public class RecordService {
subscribe.getRecordInfoSubscribe().addSubscribe(key, subscriber); subscribe.getRecordInfoSubscribe().addSubscribe(key, subscriber);
result.onTimeout(()->{ result.onTimeout(()->{
result.setResult(JsonResponse.success(list,"查询超时, 结果可能不完整")); result.setResult(JsonResponse.success(sortedRecordList(list),"查询超时, 结果可能不完整"));
subscribe.getRecordInfoSubscribe().delPublisher(key); subscribe.getRecordInfoSubscribe().delPublisher(key);
}); });
return result; return result;
} }
private List<RecordInfoItemDTO> sortedRecordList(List<RecordInfoItemDTO> list){
return list.stream().sorted((a,b)-> DateUtil.compare(a.getStartTime(),b.getStartTime())).collect(Collectors.toList());
}
} }