心跳接口修改

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

@@ -854,8 +854,14 @@ public class GeoHazardMonitorTokenController {
                             }
                             //获取缓冲
                             List<String> heartbeat = redisCache.getCacheObject("heartbeat");
+                            log.info("--------------heartbeat111--------------:" + heartbeat);
+                            List<String> cameraPlayList = redisCache.getCacheObject("cameraPlay");
+                            log.info("--------------cameraPlayList--------------:" + cameraPlayList);
                             if (!ObjectUtils.isEmpty(heartbeat)) {
-                                log.info("--------------heartbeat--------------:" + heartbeat);
+                                if (!ObjectUtils.isEmpty(cameraPlayList)) {
+                                    heartbeat.addAll(cameraPlayList);
+                                }
+                                log.info("--------------heartbeat222--------------:" + heartbeat);
                                 List<String> rtspApiList = cameraUtil.rtspApiList();
                                 log.info("--------------rtspApiList1111--------------:" + rtspApiList);
                                 if (!ObjectUtils.isEmpty(rtspApiList)) {
@@ -892,8 +898,14 @@ public class GeoHazardMonitorTokenController {
                             }
                             //获取缓冲
                             List<String> heartbeat = redisCache.getCacheObject("heartbeat");
+                            log.info("--------------heartbeat111--------------:" + heartbeat);
+                            List<String> cameraPlayList = redisCache.getCacheObject("cameraPlay");
+                            log.info("--------------cameraPlayList--------------:" + cameraPlayList);
                             if (!ObjectUtils.isEmpty(heartbeat)) {
-                                log.info("--------------heartbeat--------------:" + heartbeat);
+                                if (!ObjectUtils.isEmpty(cameraPlayList)) {
+                                    heartbeat.addAll(cameraPlayList);
+                                }
+                                log.info("--------------heartbeat222--------------:" + heartbeat);
                                 List<String> rtspApiList = cameraUtil.rtspApiList();
                                 log.info("--------------rtspApiList1111--------------:" + rtspApiList);
                                 if (!ObjectUtils.isEmpty(rtspApiList)) {
@@ -972,8 +984,14 @@ public class GeoHazardMonitorTokenController {
                         }
                         //获取缓冲
                         List<String> heartbeat = redisCache.getCacheObject("heartbeat");
+                        log.info("--------------heartbeat111--------------:" + heartbeat);
+                        List<String> cameraPlayList = redisCache.getCacheObject("cameraPlay");
+                        log.info("--------------cameraPlayList--------------:" + cameraPlayList);
                         if (!ObjectUtils.isEmpty(heartbeat)) {
-                            log.info("--------------heartbeat--------------:" + heartbeat);
+                            if (!ObjectUtils.isEmpty(cameraPlayList)) {
+                                heartbeat.addAll(cameraPlayList);
+                            }
+                            log.info("--------------heartbeat222--------------:" + heartbeat);
                             List<String> rtspApiList = cameraUtil.rtspApiList();
                             log.info("--------------rtspApiList1111--------------:" + rtspApiList);
                             if (!ObjectUtils.isEmpty(rtspApiList)) {
@@ -1025,8 +1043,14 @@ public class GeoHazardMonitorTokenController {
                         }
                         //获取缓冲
                         List<String> heartbeat = redisCache.getCacheObject("heartbeat");
+                        log.info("--------------heartbeat111--------------:" + heartbeat);
+                        List<String> cameraPlayList = redisCache.getCacheObject("cameraPlay");
+                        log.info("--------------cameraPlayList--------------:" + cameraPlayList);
                         if (!ObjectUtils.isEmpty(heartbeat)) {
-                            log.info("--------------heartbeat--------------:" + heartbeat);
+                            if (!ObjectUtils.isEmpty(cameraPlayList)) {
+                                heartbeat.addAll(cameraPlayList);
+                            }
+                            log.info("--------------heartbeat222--------------:" + heartbeat);
                             List<String> rtspApiList = cameraUtil.rtspApiList();
                             log.info("--------------rtspApiList1111--------------:" + rtspApiList);
                             if (!ObjectUtils.isEmpty(rtspApiList)) {