Browse Source

报警视频回放修改逻辑

hexiao 1 year ago
parent
commit
d43b7917c4
1 changed files with 1 additions and 1 deletions
  1. 1 1
      hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

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

@@ -774,7 +774,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                 // 表示已经超过报警时间10分钟,且没有解除报警、也没有报警Url 的可以合成视频
                 Map<String, Object> map = baseCameraManagementService.getCameraChannelByAlarmId(msgAlarm.getAlarmId());
                 if (!StringUtils.isBlank(map.get("channel").toString())) {
-                    log.info("报警UUID:{},相机通道:{},开始时间:{},结束时间:{}", msgAlarm.getAlarmId(), map.get("channel").toString(), (Date) oTime, date);
+                    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);