Browse Source

视频回放

hexiao 1 năm trước cách đây
mục cha
commit
e73a9c234e

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

@@ -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);
     }
 }

+ 1 - 0
hazard-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -203,6 +203,7 @@ public class GeoHazardMonitorTokenController {
                 }
                 map.put(msgAlarm.getAlarmId(), msgAlarm.getAlarmTime());
                 log.info("map:{}", map);
+                redisCache.deleteObject(RedisConstant.key);
                 redisCache.setCacheMap(RedisConstant.key, map);
             } else {
                 BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarmVice);