配置文件修改

hazard-admin/src/main/java/com/ozs/web/controller/tool/TestController.java

@@ -73,15 +73,15 @@ public class TestController extends BaseController {
         cmdCameraUtil.cmd(cmd);
         return R.ok();
     }
-    @GetMapping("/mergeVideo")
-    public R<String> mergeVideo() {
-        try {
-            cameraUtil.mergeVideo();
-        } catch (Exception e) {
-            return R.ok(e.getMessage().toString());
-        }
-        return R.ok();
-    }
+//    @GetMapping("/mergeVideo")
+//    public R<String> mergeVideo() {
+//        try {
+//            cameraUtil.mergeVideo();
+//        } catch (Exception e) {
+//            return R.ok(e.getMessage().toString());
+//        }
+//        return R.ok();
+//    }
 
     @GetMapping("/deleteTs")
     public R<String> deleteTs() {

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

@@ -1011,26 +1011,26 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      * 定时合成视频
      * ----------------------------废弃
      */
-    public void mergeVideo() {
-        List<MsgAlarmCloud> msgAlarmCloudList = msgAlarmCloudService.queryAlarmInfoByAfterTenMinute();
-        if (!ObjectUtils.isEmpty(msgAlarmCloudList)) {
-            for (MsgAlarmCloud msgAlarmCloud : msgAlarmCloudList) {
-                // 表示已经超过报警时间10分钟，且没有解除报警、也没有报警Url 的可以合成视频
-                Map<String, Object> map = baseCameraManagementService.getCameraChannelByAlarmId(msgAlarmCloud.getAlarmId());
-                if (!StringUtils.isBlank(map.get("channel").toString())) {
-                    log.info("报警UUID:{},相机通道：{},开始时间：{}，结束时间：{}", msgAlarmCloud.getAlarmId(), map.get("channel").toString(), msgAlarmCloud.getAlarmTime(), new Date());
-                    try {
-                        String url = historyPlayListStr(map.get("channel").toString(), msgAlarmCloud.getAlarmTime(), new Date(), false);
-                        MsgAlarmCloud byId = msgAlarmCloudService.getById(msgAlarmCloud.getId());
-                        byId.setReleasedUrl(url);
-                        msgAlarmCloudService.updateById(byId);
-                    } catch (Exception e) {
-                        log.error("mergeVideo error:", e.getMessage());
-                    }
-                }
-            }
-        }
-    }
+//    public void mergeVideo() {
+//        List<MsgAlarmCloud> msgAlarmCloudList = msgAlarmCloudService.queryAlarmInfoByAfterTenMinute();
+//        if (!ObjectUtils.isEmpty(msgAlarmCloudList)) {
+//            for (MsgAlarmCloud msgAlarmCloud : msgAlarmCloudList) {
+//                // 表示已经超过报警时间10分钟，且没有解除报警、也没有报警Url 的可以合成视频
+//                Map<String, Object> map = baseCameraManagementService.getCameraChannelByAlarmId(msgAlarmCloud.getAlarmId());
+//                if (!StringUtils.isBlank(map.get("channel").toString())) {
+//                    log.info("报警UUID:{},相机通道：{},开始时间：{}，结束时间：{}", msgAlarmCloud.getAlarmId(), map.get("channel").toString(), msgAlarmCloud.getAlarmTime(), new Date());
+//                    try {
+//                        String url = historyPlayListStr(map.get("channel").toString(), msgAlarmCloud.getAlarmTime(), new Date(), false);
+//                        MsgAlarmCloud byId = msgAlarmCloudService.getById(msgAlarmCloud.getId());
+//                        byId.setReleasedUrl(url);
+//                        msgAlarmCloudService.updateById(byId);
+//                    } catch (Exception e) {
+//                        log.error("mergeVideo error:", e.getMessage());
+//                    }
+//                }
+//            }
+//        }
+//    }
 
 
     /**