|
@@ -419,6 +419,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.flv
|
|
|
Map<Date, List<String>> objectObjectHashMap = new HashMap<>();
|
|
|
objectObjectHashMap.put(new Date(), fileTs);
|
|
|
mergeVideoTsFile.put(newfilePath, objectObjectHashMap);
|
|
|
+ rc.deleteObject("mergeVideoTsFile");
|
|
|
rc.setCacheMap("mergeVideoTsFile", mergeVideoTsFile);
|
|
|
|
|
|
sm.append("-c copy " + newfilePath);
|
|
@@ -805,6 +806,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.flv
|
|
|
}
|
|
|
}
|
|
|
log.info("删除后的alarmIdMap:{}", alarmIdMap);
|
|
|
+ redisCache.deleteObject(mvkey);
|
|
|
redisCache.setCacheMap(mvkey, alarmIdMap);
|
|
|
|
|
|
}
|
|
@@ -850,5 +852,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.flv
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ redisCache.deleteObject("mergeVideoTsFile");
|
|
|
+ redisCache.setCacheMap("mergeVideoTsFile", mergeVideoTsFile);
|
|
|
}
|
|
|
}
|