优化推流鉴权对后续录像查询的影响

648540858
1 parent a0aaf5ab
Showing 3 changed files with 57 additions and 10 deletions
src/main/java/top/panll/assist/config/StartConfig.java
src/main/java/top/panll/assist/controller/RecordController.java
src/main/java/top/panll/assist/service/VideoFileService.java
@@ -73,7 +73,7 @@ public class StartConfig implements CommandLineRunner {
                                     File[] files = dateFile.listFiles();
                                     if (files != null && files.length > 0) {
                                         for (File file : files) {
-                                            videoFileService.handFile(file);
+                                            videoFileService.handFile(file, appFile.getName(), streamFile.getName());
                                         }
                                     }
                                 }
@@ -18,6 +18,7 @@ import top.panll.assist.dto.SignInfo;
 import top.panll.assist.dto.SpaceInfo;
 import top.panll.assist.service.VideoFileService;
 import top.panll.assist.utils.PageInfo;
+import top.panll.assist.utils.RedisUtil;
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
@@ -38,6 +39,9 @@ public class RecordController {
     @Autowired
     private VideoFileService videoFileService;
+    @Autowired
+    private RedisUtil redisUtil;
+
     private SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -390,9 +394,11 @@ public class RecordController {
         ret.put("code", 0);
         ret.put("msg", "success");
         String file_path = json.getString("file_path");
+        String app = json.getString("app");
+        String stream = json.getString("stream");
         logger.debug("ZLM 录制完成，参数：" + file_path);
         if (file_path == null) return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);
-        videoFileService.handFile(new File(file_path));
+        videoFileService.handFile(new File(file_path), app, stream);
         return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);
     }
@@ -432,4 +438,22 @@ public class RecordController {
         ret.put("data", duration);
         return new ResponseEntity<>(ret.toString(), HttpStatus.OK);
     }
+
+    /**
+     * 增加推流的鉴权信息，用于录像存储使用
+     */
+    @ApiOperation("增加推流的鉴权信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="app", value = "应用名", required = true, dataTypeClass = String.class),
+            @ApiImplicitParam(name="stream", value = "流ID", required = true, dataTypeClass = String.class),
+            @ApiImplicitParam(name="callId", value = "录像自鉴权ID", required = true, dataTypeClass = String.class),
+    })
+    @ResponseBody
+    @GetMapping(value = "/addStreamCallInfo", produces = "application/json;charset=UTF-8")
+    @PostMapping(value = "/addStreamCallInfo", produces = "application/json;charset=UTF-8")
+    public ResponseEntity<String> addStreamCallInfo(String app, String stream, String callId) {
+        String key = "Stream_Call_Info" + app + "_" + stream;
+        redisUtil.set(key, callId, -1);
+        return new ResponseEntity<>(null, HttpStatus.OK);
+    }
 }
@@ -131,10 +131,11 @@ public class VideoFileService {
      * @param file
      * @throws ParseException
      */
-    public void handFile(File file) {
+    public void handFile(File file,String app, String stream) {
         FFprobe ffprobe = ffmpegExecUtils.getFfprobe();
         if(file.exists() && file.isFile() && !file.getName().startsWith(".")&& file.getName().endsWith(".mp4") && file.getName().indexOf(":") < 0) {
             try {
+
                 FFmpegProbeResult in = ffprobe.probe(file.getAbsolutePath());
                 double duration = in.getFormat().duration * 1000;
                 String endTimeStr = file.getName().replace(".mp4", "");
@@ -149,9 +150,23 @@ public class VideoFileService {
                 long endTime = startTime + durationLong;
                 endTime = endTime - endTime%1000;
-                String newName = file.getAbsolutePath().replace(file.getName(),
-                        simpleDateFormat.format(startTime) + "-" + simpleDateFormat.format(endTime) + "-" + durationLong + ".mp4");
-                file.renameTo(new File(newName));
+                String key = "Stream_Call_Info" + app + "_" + stream;
+                String callId = (String) redisUtil.get(key);
+                if (callId != null) {
+
+                    File newPath = new File(file.getParentFile().getParent() + "_" + callId + File.separator + file.getParentFile().getName());
+                    if (!newPath.exists()) {
+                        newPath.mkdirs();
+                    }
+                    String newName = newPath.getAbsolutePath() + File.separator+  simpleDateFormat.format(startTime) + "-" + simpleDateFormat.format(endTime) + "-" + durationLong + ".mp4";
+                    file.renameTo(new File(newName));
+                }else {
+                    String newName = file.getAbsolutePath().replace(file.getName(),
+                            simpleDateFormat.format(startTime) + "-" + simpleDateFormat.format(endTime) + "-" + durationLong + ".mp4");
+
+                    file.renameTo(new File(newName));
+                }
+
                 logger.debug("[处理文件] {}", file.getName());
             } catch (IOException e) {
                 logger.warn("文件可能以损坏[{}]", file.getAbsolutePath());
@@ -340,7 +355,9 @@ public class VideoFileService {
         logger.info("[录像合并] 开始合并，APP:{}, STREAM: {}, 任务ID：{}", app, stream, taskId);
         String destDir = "recordTemp" + File.separator + taskId + File.separator + app;
         File recordFile = new File(new File(userSettings.getRecord()).getParentFile().getAbsolutePath()  + File.separator + destDir );
-        if (!recordFile.exists()) recordFile.mkdirs();
+        if (!recordFile.exists()) {
+            recordFile.mkdirs();
+        }
         MergeOrCutTaskInfo mergeOrCutTaskInfo = new MergeOrCutTaskInfo();
         mergeOrCutTaskInfo.setId(taskId);
         mergeOrCutTaskInfo.setApp(app);
@@ -474,9 +491,15 @@ public class VideoFileService {
     public List<MergeOrCutTaskInfo> getTaskListForDownload(Boolean idEnd, String app, String stream, String taskId) {
         ArrayList<MergeOrCutTaskInfo> result = new ArrayList<>();
-        if (app == null) app = "*";
-        if (stream == null) stream = "*";
-        if (taskId == null) taskId = "*";
+        if (app == null) {
+            app = "*";
+        }
+        if (stream == null) {
+            stream = "*";
+        }
+        if (taskId == null) {
+            taskId = "*";
+        }
         List<Object> taskCatch = redisUtil.scan(String.format("%S_%S_%S_%S", keyStr, app, stream, taskId));
         for (int i = 0; i < taskCatch.size(); i++) {
             String keyItem = taskCatch.get(i).toString();