替换合并视频代码

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

@@ -44,6 +44,7 @@ import java.util.stream.Collectors;
 @Component
 public class CameraUtil {
 
+   private static final ExecutorService executor = Executors.newFixedThreadPool(10);
     private static String historyUrl;
     private static String ffmpegPath;
     private static String filePath;
@@ -80,8 +81,6 @@ public class CameraUtil {
         if (ObjectUtils.isEmpty(fromVideoFileList) || fromVideoFileList.size() <= 0) {
             throw new BaseException("当前相机无视频录像");
         }
-        ExecutorService executor = Executors.newFixedThreadPool(10);
-
         executor.submit(new Runnable() {
             @Override
             public void run() {