修改路径

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

@@ -791,7 +791,6 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      * ----------------------------废弃
      */
     public void mergeVideo() {
-        // todo 查询没有URl 和 未解除的 报警信息  且过报警时间10 分钟
         List<MsgAlarm> msgAlarms = msgAlarmService.queryAlarmInfoByAfterTenMinute();
         if (!ObjectUtils.isEmpty(msgAlarms)) {
             for (MsgAlarm msgAlarm : msgAlarms) {
@@ -799,10 +798,14 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                 Map<String, Object> map = baseCameraManagementService.getCameraChannelByAlarmId(msgAlarm.getAlarmId());
                 if (!StringUtils.isBlank(map.get("channel").toString())) {
                     log.info("报警UUID:{},相机通道：{},开始时间：{}，结束时间：{}", msgAlarm.getAlarmId(), map.get("channel").toString(), msgAlarm.getAlarmTime(), new Date());
-                    String url = historyPlayListStr(map.get("channel").toString(), msgAlarm.getAlarmTime(), new Date(), false);
-                    MsgAlarm byId = msgAlarmService.getById(msgAlarm.getId());
-                    byId.setReleasedUrl(url);
-                    msgAlarmService.updateById(byId);
+                    try {
+                        String url = historyPlayListStr(map.get("channel").toString(), msgAlarm.getAlarmTime(), new Date(), false);
+                        MsgAlarm byId = msgAlarmService.getById(msgAlarm.getId());
+                        byId.setReleasedUrl(url);
+                        msgAlarmService.updateById(byId);
+                    } catch (Exception e) {
+                        log.error("mergeVideo error:", e.getMessage());
+                    }
                 }
             }
         }