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