|
@@ -1014,15 +1014,13 @@ public class GeoHazardMonitorTokenController {
|
|
|
// log.info("-----add6----" + add6);
|
|
|
}
|
|
|
//获取缓冲
|
|
|
- String code = redisCache.getCacheObject("heartbeat");
|
|
|
- if (StringUtils.isNotEmpty(code)) {
|
|
|
- log.info("--------------code--------------:" + code);
|
|
|
- List<String> list = JSON.parseArray(code, List.class);
|
|
|
- log.info("--------------list--------------:" + list);
|
|
|
+ List<String> heartbeat = redisCache.getCacheObject("heartbeat");
|
|
|
+ if (StringUtils.isNotEmpty(heartbeat)) {
|
|
|
+ log.info("--------------heartbeat--------------:" + heartbeat);
|
|
|
List<String> rtspApiList = cameraUtil.rtspApiList();
|
|
|
log.info("--------------rtspApiList1111--------------:" + rtspApiList);
|
|
|
if (!ObjectUtils.isEmpty(rtspApiList)) {
|
|
|
- rtspApiList.removeAll(list);
|
|
|
+ rtspApiList.removeAll(heartbeat);
|
|
|
}
|
|
|
log.info("--------------rtspApiList2222--------------:" + rtspApiList);
|
|
|
if (!ObjectUtils.isEmpty(rtspApiList)) {
|