src/main/java/com/tuoheng/steam/controller/StreamRecordController.java

@@ -72,16 +72,12 @@ public class StreamRecordController {
         if(Objects.isNull(streamUrl)) {
             return Response.fail(-1);
         }
-        try {
+        Response<StreamTask> response = Response.success(taskService.stopTask(streamUrl));
-            Response<StreamTask> response = Response.success(taskService.stopTask(streamUrl));
+        if(Objects.isNull(response.getData().getOutFileName()) || response.getData().getOutFileName().isEmpty()){
-            if(Objects.isNull(response.getData()) || Objects.isNull(response.getData().getOutFileName()) || response.getData().getOutFileName().isEmpty()){
+            response.setCode(500);
-                response.setCode(500);
-            }
-            System.out.println("关闭录制返回 :"+ JSON.toJSONString(response));
-            return  response;
-        }catch (Exception e){
-            return Response.fail(-1);
         }
+        System.out.println("关闭录制返回 :"+ JSON.toJSONString(response));
+        return  response;
     }
 
     @GetMapping("info")

src/main/java/com/tuoheng/steam/service/IRecordService.java

@@ -5,15 +5,14 @@ import com.tuoheng.steam.service.dos.*;
 import java.util.Date;
 import java.util.List;
 
-/**
- * 视频回放服务
- */
 public interface IRecordService {
 
     public List<DayRecord> findDaysPath();
 
     public List<StreamRecord> findInDayRecord(DayRecord dayRecord);
 
+
+
     public void mergeMp4(FlvRecord flvRecord);
 
 }

src/main/java/com/tuoheng/steam/service/ITaskService.java

@@ -2,16 +2,13 @@ package com.tuoheng.steam.service;
 
 import com.tuoheng.steam.dos.StreamTask;
 
-/**
- * 视频录制服务
- */
 public interface ITaskService {
 
     public StreamTask startTask(String streamUrl);
 
     public String startPic(String streamUrl);
 
-    public StreamTask stopTask(String streamUrl) throws Exception;
+    public StreamTask stopTask(String streamUrl);
 
     public StreamTask getLastTask(String streamUrl);
 

src/main/java/com/tuoheng/steam/service/TaskService.java

@@ -30,8 +30,8 @@ public class TaskService implements ITaskService{
     @Value("${srs.targetPath}")
     private String targetPath;
 
-//    @Value("${ffmpeg}")
+    @Value("${ffmpeg}")
-    private String ffmpeg ="ffmpeg";
+    private String ffmpeg;
 
     ScheduledExecutorService executor = Executors.newScheduledThreadPool(4);
 
@@ -44,18 +44,16 @@ public class TaskService implements ITaskService{
             StreamTask streamTask = entry.getValue();
             if(streamTask.getStartTime().getTime() < new Date().getTime() -  30 * 60 * 1000 ) {
                 logger.info("清理废弃任务 {}", JSON.toJSONString(streamTask));
-                try {
+                StreamTask s = stopTask(entry.getKey());
-                    StreamTask s = stopTask(entry.getKey());
+                scheduler.schedule(() -> {
-                    scheduler.schedule(() -> {
+                    File file = new File(targetPath +"/"+ s.getOutFileName());
-                        File file = new File(targetPath +"/"+ s.getOutFileName());
+                    try {
-                        try {
+                        file.delete();
-                            logger.info("废弃文件删除成功 {}",file.delete());
+                        logger.info("废弃文件删除成功");
-                        }catch (Exception e) {
+                    }catch (Exception e) {
-                            logger.error(e.getMessage());
+                        logger.error(e.getMessage());
-                        }
+                    }
-                    }, 60, TimeUnit.SECONDS);
+                }, 60, TimeUnit.SECONDS);
-                }catch (Exception ignore) {}
-
             }
         }
     }
@@ -95,9 +93,7 @@ public class TaskService implements ITaskService{
                     Date twoHoursAgo = calendar.getTime();
                     if (value.getStartTime().before(twoHoursAgo)) {
                         logger.error("taskId {} 执行超时,手动关闭", key);
-                        try {
+                        stopTask(key);
-                            stopTask(key);
-                        }catch (Exception ignore) {}
                     }
                 });
 
@@ -174,9 +170,7 @@ public class TaskService implements ITaskService{
 
     }
 
-    public StreamTask stopTask(String streamUrl) throws Exception {
+    public StreamTask stopTask(String streamUrl) {
-
-        boolean recordSuccess = true;
         StreamTask currentStreamTask = runningTasks.remove(streamUrl);
 
         if (currentStreamTask!= null) {
@@ -184,20 +178,11 @@ public class TaskService implements ITaskService{
 
             if (!CollectionUtils.isEmpty(currentStreamTask.getStreamProcesses())) {
                 for (StreamProcess streamProcess : currentStreamTask.getStreamProcesses()) {
-                    if(!new File(streamProcess.getFileName()).exists()){
+                    logger.info("streamUrl {} taskId {} destroy Process {}", streamUrl,currentStreamTask.getTaskId() ,streamProcess.getInnerProcessId());
-                        recordSuccess = false;
-                        logger.error("流录制失败: streamUrl {} taskId {} destroy Process {}", streamUrl,currentStreamTask.getTaskId() ,streamProcess.getInnerProcessId());
-                    }else {
-                        logger.info("streamUrl {} taskId {} destroy Process {}", streamUrl,currentStreamTask.getTaskId() ,streamProcess.getInnerProcessId());
-                    }
                     streamProcess.destroy();
                 }
             }
 
-            if(!recordSuccess){
-                throw new Exception("");
-            }
-
             try {
                 String outFileName = UUID.randomUUID().toString() + ".mp4";
                 StreamProcess mergeProcess = processService.mergeStream(outFileName, currentStreamTask.getStreamProcesses());
@@ -240,10 +225,19 @@ public class TaskService implements ITaskService{
                 }
 
 
+//                if( historyTasks.containsKey(streamUrl)){
+//                    historyTasks.get(streamUrl).add(currentStreamTask);
+//                }else {
+//                    historyTasks.put(streamUrl, new LinkedList<>());
+//                    historyTasks.get(streamUrl).offerLast(currentStreamTask);
+//                }
+
                 if(Objects.nonNull(currentStreamTask.getMergeProcess())){
                     if(Objects.nonNull(currentStreamTask.getMergeProcess().getFileName()) &&
                             !currentStreamTask.getMergeProcess().getFileName().isEmpty()){
                         try {
+//
+//                            scheduler.schedule(task, 3, TimeUnit.SECONDS);
                             executor.schedule(new Runnable() {
                                 @Override
                                 public void run() {
@@ -293,12 +287,11 @@ public class TaskService implements ITaskService{
             }
 
         }else {
-            throw new Exception("");
+            if(historyTasks.containsKey(streamUrl)){
-//            if(historyTasks.containsKey(streamUrl)){
+                return historyTasks.get(streamUrl).peekLast();
-//                return historyTasks.get(streamUrl).peekLast();
+            }else {
-//            }else {
+                return null;
-//                return null;
+            }
-//            }
         }
     }
 
@@ -357,9 +350,7 @@ public class TaskService implements ITaskService{
 
     public void stopAllTask(){
         runningTasks.forEach((key, value) -> {
-            try {
+            stopTask(key);
-                stopTask(key);
-            }catch (Exception ignore){}
         });
     }
 }

src/main/java/com/tuoheng/steam/service/innerService/ProcessService.java

@@ -14,7 +14,10 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -27,8 +30,8 @@ public class ProcessService {
     @Value("${srs.splitPath}")
     private String splitPath;
 
-//    @Value("${ffmpeg}")
+    @Value("${ffmpeg}")
-    private String ffmpeg = "ffmpeg";
+    private String ffmpeg;
 
     @Value("${srs.targetPath}")
     private String targetPath;
@@ -140,15 +143,9 @@ public class ProcessService {
     public StreamProcess recordStream(String streamUrl) throws IOException {
 
         String  recordFileName = splitPath+'/'+UUID.randomUUID().toString() +".ts";
-        /**
-         * 如果streamUrl末尾有个_,在实际录制的时候需要将_去除
-         */
         String command = String.format(
                 ffmpeg+ " -i %s -c copy -f mpegts -reconnect 1 -reconnect_streamed 1 -reconnect_delay_max 2 %s",
-                Optional.of(streamUrl)
+                streamUrl, recordFileName);
-                        .filter(s -> s.endsWith("_"))
-                        .map(s -> s.substring(0, s.length() - 1))
-                        .orElse(streamUrl), recordFileName);
         logger.info("recordStream {}", command);
         ProcessBuilder pb = new ProcessBuilder(command.split(" "));
         pb.redirectErrorStream(true);

src/main/resources/application.properties

@@ -1,14 +1,14 @@
 spring.application.name=demo
-server.port = 8989
+#server.port = 8989
-srs.splitPath=/data/java/srs/stream_server/temp
+#srs.splitPath=/data/java/srs/stream_server/temp
-srs.targetPath=/data/java/srs/srs/trunk/objs/nginx/html
+#srs.targetPath=/data/java/srs/srs/trunk/objs/nginx/html
-ffmpeg=ffmpeg
+#ffmpeg=/data/ffmpeg/bin/ffmpeg
-recordPath=/data/java/srs/srs/trunk/objs/nginx/html/record
+#recordPath=/data/java/srs/srs/trunk/objs/nginx/html/record
-livedates=8
+#livedates=8
 
-#server.port = 8080
+server.port = 8080
-#srs.splitPath=/Users/sunpeng/workspace/stream/temp
+srs.splitPath=/Users/sunpeng/workspace/stream/temp
-#srs.targetPath=/Users/sunpeng/workspace/stream/html
+srs.targetPath=/Users/sunpeng/workspace/stream/html
-#ffmpeg=ffmpeg
+ffmpeg=ffmpeg
-#recordPath=/Users/sunpeng/workspace/stream/record
+recordPath=/Users/sunpeng/workspace/stream/record
-#livedates=7
+livedates=7