心跳接口修改

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

@@ -658,7 +658,11 @@ public class GeoHazardMonitorTokenController {
                         List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
                         List<AlarmListVo> listVos = new ArrayList<>();
                         if (baseCameraManagementList.size() > 0) {
-                            String playFlv = cameraUtil.heartbeatgetUrl(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel(), type);
+                            String playFlv = null;
+                            playFlv = cameraUtil.heartbeatgetPlayFlv(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel(), type);
+                            if (StringUtils.isEmpty(playFlv)) {
+                                playFlv = cameraUtil.heartbeatgetUrl(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel(), type);
+                            }
 //                            //判断心跳相机日志表后两条数据是否包含该相机编码
 //                            if (!ObjectUtils.isEmpty(codeList)) {
 //                                if (!codeList.contains(baseCameraManagementList.get(0).getCameraCode())) {
@@ -770,7 +774,11 @@ public class GeoHazardMonitorTokenController {
                             if (baseList.size() > 0) {
                                 for (int o = 0; o < baseList.size(); o++) {
                                     //判断流媒体是否有流
-                                    String playFlv = cameraUtil.heartbeatgetUrl(baseList.get(o).getCameraCode(), baseList.get(o).getChannel(), type);
+                                    String playFlv = null;
+                                    playFlv = cameraUtil.heartbeatgetPlayFlv(baseCameraManagementList.get(o).getCameraCode(), baseCameraManagementList.get(o).getChannel(), type);
+                                    if (StringUtils.isEmpty(playFlv)) {
+                                        playFlv = cameraUtil.heartbeatgetUrl(baseCameraManagementList.get(o).getCameraCode(), baseCameraManagementList.get(o).getChannel(), type);
+                                    }
 //                                    //判断心跳相机日志表后两条数据是否包含该相机编码
 //                                    if (!ObjectUtils.isEmpty(codeList)) {
 //                                        if (!codeList.contains(baseList.get(o).getCameraCode())) {
@@ -813,10 +821,14 @@ public class GeoHazardMonitorTokenController {
                                 }
                                 ArrayList<String> list3 = new ArrayList<>();
                                 //添加缓存
+                                List<String> stringList = redisCache.getCacheObject("heartbeat");
                                 for (BaseCameraManagement baseCameraManagement : baseList) {
                                     String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel();
                                     list3.add(code);
                                 }
+                                if (!ObjectUtils.isEmpty(stringList)){
+                                    list3.addAll(stringList);
+                                }
                                 log.info("--------------heartbeat--------------:" + list3);
                                 redisCache.setCacheObject("heartbeat", list3);
                                 //获取缓冲
@@ -884,10 +896,14 @@ public class GeoHazardMonitorTokenController {
                         }
                         ArrayList<String> list3 = new ArrayList<>();
                         //添加缓存
+                        List<String> stringList = redisCache.getCacheObject("heartbeat");
                         for (BaseCameraManagement baseCameraManagement : list1) {
                             String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel();
                             list3.add(code);
                         }
+                        if (!ObjectUtils.isEmpty(stringList)){
+                            list3.addAll(stringList);
+                        }
                         log.info("--------------heartbeat--------------:" + list3);
                         redisCache.setCacheObject("heartbeat", list3);
                         //获取缓冲