视频回放

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -412,18 +412,20 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.flv
         }
 
         if (fileTs.size() > 0) {
+            Map<String, Object> mergeVideoTsFile = rc.getCacheMap("mergeVideoTsFile");
+            if (ObjectUtils.isEmpty(mergeVideoTsFile)) {
+                mergeVideoTsFile = new HashMap<>();
+            }
+            Map<Date, List<String>> objectObjectHashMap = new HashMap<>();
+            objectObjectHashMap.put(new Date(), fileTs);
+            mergeVideoTsFile.put(newfilePath, objectObjectHashMap);
+            rc.setCacheMap("mergeVideoTsFile", mergeVideoTsFile);
+
             sm.append("-c copy " + newfilePath);
             log.info("合并命令：{}", sm.toString());
             cUtil.cmd(sm.toString());
         }
-        Map<String, Object> mergeVideoTsFile = rc.getCacheMap("mergeVideoTsFile");
-        if (ObjectUtils.isEmpty(mergeVideoTsFile)) {
-            mergeVideoTsFile = new HashMap<>();
-        }
-        Map<Date, List<String>> objectObjectHashMap = new HashMap<>();
-        objectObjectHashMap.put(new Date(), fileTs);
-        mergeVideoTsFile.put(newfilePath, objectObjectHashMap);
-        rc.setCacheMap("mergeVideoTsFile", mergeVideoTsFile);
+
 //        for (String fileT : fileTs) {
 //            File ft = new File(fileT);
 //            if (ft.exists()) {