视频回放接口

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -844,9 +844,9 @@ public class BaseCameraManagementController extends BaseController {
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult getRecordByAlarmId(@RequestParam("alarmId") String alarmId) {
         Object cacheObject = redisCache.getCacheObject("STREAMING_ALARM_VIDEO:" + alarmId);
-        Map<String, Object> wait_merge_video_alarm_id = redisCache.getCacheMap("WAIT_MERGE_VIDEO_ALARM_ID");
-        log.info("待合成视频的报警信息集合：{}", wait_merge_video_alarm_id);
-        if (!wait_merge_video_alarm_id.keySet().contains(alarmId)) {
+        Map<String, Object> map = redisCache.getCacheObject("WAIT_MERGE_VIDEO_ALARM_ID");
+        log.info("待合成视频的报警信息集合：{}", map);
+        if (!map.keySet().contains(alarmId)) {
             return error("报警UUID:" + alarmId + ",是属于旧数据。请用新数据测试");
         }
         if (ObjectUtils.isEmpty(cacheObject)) {

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

@@ -783,7 +783,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.flv
         Calendar calendar = new GregorianCalendar();
 
 
-        Map<String, Object> alarmIdMap = redisCache.getCacheMap("WAIT_MERGE_VIDEO_ALARM_ID");
+        Map<String, Object> alarmIdMap = redisCache.getCacheObject("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.setCacheMap("WAIT_MERGE_VIDEO_ALARM_ID", alarmIdMap);
+        redisCache.setCacheObject("WAIT_MERGE_VIDEO_ALARM_ID", alarmIdMap);
 
     }
 }

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

@@ -197,10 +197,10 @@ public class GeoHazardMonitorTokenController {
                 respMsgAlarmVo.setIsCancel(2);
                 respMsgAlarmVo.setCancelTime(null);
                 // 记录要合成报警视频的报警id
-                Map<String, Object> map = redisCache.getCacheMap("WAIT_MERGE_VIDEO_ALARM_ID");
+                Map<String, Object> map = redisCache.getCacheObject("WAIT_MERGE_VIDEO_ALARM_ID");
                 map.put(msgAlarm.getAlarmId(), msgAlarm.getAlarmTime());
                 log.info("map:{}", map);
-                redisCache.setCacheMap("WAIT_MERGE_VIDEO_ALARM_ID", map);
+                redisCache.setCacheObject("WAIT_MERGE_VIDEO_ALARM_ID", map);
             } else {
                 BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarmVice);
                 String[] imageUrl = reqMsgAlarmVo.getImageUrls();