视频回放

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

@@ -56,6 +56,8 @@ public class CameraUtil {
     private static String bakUrl;
     private static CmdCameraUtil cUtil;
     private static RedisCache rc;
+
+    public final static String mvkey = "WAIT_MERGE_VIDEO_ALARM_ID";
     @Autowired
     private CaneraConfig caneraConfig;
 
@@ -788,9 +790,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.flv
     public void mergeVideo() {
         Date date = new Date();
         Calendar calendar = new GregorianCalendar();
-
-
-        Map<String, Object> alarmIdMap = redisCache.getCacheMap("WAIT_MERGE_VIDEO_ALARM_ID");
+        Map<String, Object> alarmIdMap = redisCache.getCacheMap(mvkey);
         log.info("WAIT_MERGE_VIDEO_ALARM_ID:{}", alarmIdMap);
         if (!ObjectUtils.isEmpty(alarmIdMap)) {
             Set<String> alarmIds = alarmIdMap.keySet();
@@ -816,7 +816,8 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.flv
                 }
             }
         }
-        redisCache.setCacheMap("WAIT_MERGE_VIDEO_ALARM_ID", alarmIdMap);
+        log.info("删除后的alarmIdMap：{}", alarmIdMap);
+        redisCache.setCacheMap(mvkey, alarmIdMap);
 
     }