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

支持临时目录配置

Browse Source 
录像查询超时 处理
This commit is contained in:
shikong 2024-03-13 22:02:18 +08:00
parent 79fc31dd6e
commit e1d0e355a0
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/config/FfmpegConfig.java
View File

@ -31,5 +31,6 @@ public class FfmpegConfig {
private Boolean output = false; private Boolean output = false;
} }
public Boolean useTmpFile = true; private Boolean useTmpFile = true;
private String tmpDir = System.getProperty("java.io.tmpdir");
} }

1
gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/gb28181/Gb28181DownloadService.java
View File

@ -205,6 +205,7 @@ public class Gb28181DownloadService {
retryer.call(()->{ retryer.call(()->{
CompletableFuture<JsonResponse<List<RecordInfoItemVO>>> future = new CompletableFuture<>(); CompletableFuture<JsonResponse<List<RecordInfoItemVO>>> future = new CompletableFuture<>();
future.completeOnTimeout(JsonResponse.error("录像查询超时"),1,TimeUnit.MINUTES);
// 发起设备录像查询 // 发起设备录像查询
DeferredResult<JsonResponse<List<RecordInfoItemVO>>> requestedRecordInfo = DeferredResult<JsonResponse<List<RecordInfoItemVO>>> requestedRecordInfo =
recordInfoService.requestRecordInfo(new RecordInfoDTO(deviceCode, startTime, endTime, "", 0, "all")); recordInfoService.requestRecordInfo(new RecordInfoDTO(deviceCode, startTime, endTime, "", 0, "all"));

2
gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/video/VideoService.java
View File

@ -233,7 +233,7 @@ public class VideoService {
@SneakyThrows @SneakyThrows
public void ffmpegRecord(ServletResponse response, String url, long time, WvpProxyDevice device,String callId){ public void ffmpegRecord(ServletResponse response, String url, long time, WvpProxyDevice device,String callId){
OutputStream outputStream; OutputStream outputStream;
String tmpDir = System.getProperty("java.io.tmpdir"); String tmpDir = ffmpegConfig.getTmpDir();
String fileName = callId + ".mp4"; String fileName = callId + ".mp4";
File file = new File(tmpDir, fileName); File file = new File(tmpDir, fileName);
Executor executor; Executor executor;