修改了代码
This commit is contained in:
parent
0ba76855f0
commit
0429afb3ad
|
|
@ -113,6 +113,20 @@ public class StreamRecordController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping({"infoList"})
|
||||||
|
public Response<List<StreamTask>> infoList(@RequestParam String streamUrl) {
|
||||||
|
logger.info("查看录制列表 :" + streamUrl);
|
||||||
|
streamUrl = this.streamSwitch(streamUrl);
|
||||||
|
logger.info("查看录制列表_ :" + streamUrl);
|
||||||
|
if (Objects.isNull(streamUrl)) {
|
||||||
|
return Response.fail(-1);
|
||||||
|
} else {
|
||||||
|
Response<List<StreamTask>> response = Response.success(this.taskService.getTaskList(streamUrl));
|
||||||
|
logger.info("查看录制列表返回 :" + JSON.toJSONString(response));
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@PostMapping({"search"})
|
@PostMapping({"search"})
|
||||||
public Response<PageInfo<Mp4Info>> streamView(@RequestBody PageStreamRequest request) {
|
public Response<PageInfo<Mp4Info>> streamView(@RequestBody PageStreamRequest request) {
|
||||||
logger.info("查看录制 search :" + JSON.toJSONString(request));
|
logger.info("查看录制 search :" + JSON.toJSONString(request));
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,8 @@ package com.tuoheng.steam.service;
|
||||||
|
|
||||||
import com.tuoheng.steam.dos.StreamTask;
|
import com.tuoheng.steam.dos.StreamTask;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 视频录制服务
|
* 视频录制服务
|
||||||
*/
|
*/
|
||||||
|
|
@ -15,5 +17,7 @@ public interface ITaskService {
|
||||||
|
|
||||||
public StreamTask getLastTask(String streamUrl);
|
public StreamTask getLastTask(String streamUrl);
|
||||||
|
|
||||||
|
public List<StreamTask> getTaskList(String streamUrl);
|
||||||
|
|
||||||
public void stopAllTask();
|
public void stopAllTask();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,13 +16,7 @@ import java.io.BufferedReader;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
import java.util.Calendar;
|
import java.util.*;
|
||||||
import java.util.Date;
|
|
||||||
import java.util.Deque;
|
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.UUID;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
import java.util.concurrent.Executors;
|
import java.util.concurrent.Executors;
|
||||||
|
|
@ -267,6 +261,21 @@ public class TaskService implements ITaskService {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<StreamTask> getTaskList(String streamUrl){
|
||||||
|
List<StreamTask> ret = new ArrayList<>();
|
||||||
|
StreamTask current = (StreamTask)this.runningTasks.get(streamUrl);
|
||||||
|
if(Objects.nonNull(current)){
|
||||||
|
ret.add(current);
|
||||||
|
}
|
||||||
|
if(this.historyTasks.containsKey(streamUrl)) {
|
||||||
|
List<StreamTask> historys = new ArrayList<>(this.historyTasks.get(streamUrl));
|
||||||
|
if(!historys.isEmpty()) {
|
||||||
|
ret.addAll(historys);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
public StreamTask getLastTask(String streamUrl) {
|
public StreamTask getLastTask(String streamUrl) {
|
||||||
StreamTask current = (StreamTask)this.runningTasks.get(streamUrl);
|
StreamTask current = (StreamTask)this.runningTasks.get(streamUrl);
|
||||||
if (Objects.nonNull(current)) {
|
if (Objects.nonNull(current)) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue