|
@@ -783,7 +783,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.flv
|
|
|
Calendar calendar = new GregorianCalendar();
|
|
|
|
|
|
|
|
|
- Map<String, Object> alarmIdMap = redisCache.getCacheObject("WAIT_MERGE_VIDEO_ALARM_ID");
|
|
|
+ Map<String, Object> alarmIdMap = redisCache.getCacheMap("WAIT_MERGE_VIDEO_ALARM_ID");
|
|
|
log.info("WAIT_MERGE_VIDEO_ALARM_ID:{}", alarmIdMap);
|
|
|
if (!ObjectUtils.isEmpty(alarmIdMap)) {
|
|
|
Set<String> alarmIds = alarmIdMap.keySet();
|
|
@@ -809,7 +809,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.flv
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- redisCache.setCacheObject("WAIT_MERGE_VIDEO_ALARM_ID", alarmIdMap);
|
|
|
+ redisCache.setCacheMap("WAIT_MERGE_VIDEO_ALARM_ID", alarmIdMap);
|
|
|
|
|
|
}
|
|
|
}
|