hexiao 1 rok temu
rodzic
commit
5e9333bb46

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

@@ -197,13 +197,16 @@ public class GeoHazardMonitorTokenController {
                 respMsgAlarmVo.setIsCancel(2);
                 respMsgAlarmVo.setCancelTime(null);
                 // 记录要合成报警视频的报警id
-                Map<String, Object> map = redisCache.getCacheObject("WAIT_MERGE_VIDEO_ALARM_ID");
-                if (ObjectUtils.isEmpty(map)) {
+                String mapStr = redisCache.getCacheObject(RedisConstant.key);
+                Map<String, Object> map = null;
+                if (StringUtils.isEmpty(mapStr)) {
                     map = new HashMap<>();
+                } else {
+                    map = JSON.parseObject(mapStr, Map.class);
                 }
                 map.put(msgAlarm.getAlarmId(), msgAlarm.getAlarmTime());
                 log.info("map:{}", map);
-                redisCache.setCacheObject("WAIT_MERGE_VIDEO_ALARM_ID", map);
+                redisCache.setCacheObject(RedisConstant.key, JSON.toJSONString(map));
             } else {
                 BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarmVice);
                 String[] imageUrl = reqMsgAlarmVo.getImageUrls();

+ 6 - 0
hazard-sdk/src/main/java/com/ozs/controller/upload/RedisConstant.java

@@ -0,0 +1,6 @@
+package com.ozs.controller.upload;
+
+public class RedisConstant {
+
+    public final static String key = "WAIT_MERGE_VIDEO_ALARM_ID";
+}