心跳接口修改

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

@@ -642,12 +642,14 @@ public class GeoHazardMonitorTokenController {
                     if (!ObjectUtils.isEmpty(list)) {
                         //获取报警里程所监控的所有相机
                         if (heartbeatVo.getLineDir() == 1) {
+                            log.info("-------getLineDir() == 1--------"+list.get(0).getAlarmMile());
                             camera.ge(BaseCameraManagement::getEndMile, list.get(0).getAlarmMile());
                             camera.le(BaseCameraManagement::getBeginMile, list.get(0).getAlarmMile());
                             camera.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
                             camera.orderByAsc(BaseCameraManagement::getInstallMile);
                         }
                         if (heartbeatVo.getLineDir() == 2) {
+                            log.info("-------getLineDir() == 2--------"+list.get(0).getAlarmMile());
                             camera.le(BaseCameraManagement::getEndMile, list.get(0).getAlarmMile());
                             camera.ge(BaseCameraManagement::getBeginMile, list.get(0).getAlarmMile());
                             camera.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
@@ -778,9 +780,9 @@ public class GeoHazardMonitorTokenController {
                                 for (int o = 0; o < baseList.size(); o++) {
                                     //判断流媒体是否有流
                                     String playFlv = null;
-                                    playFlv = cameraUtil.heartbeatgetPlayFlv(baseCameraManagementList.get(o).getCameraCode(), baseCameraManagementList.get(o).getChannel(), type);
+                                    playFlv = cameraUtil.heartbeatgetPlayFlv(baseList.get(o).getCameraCode(), baseList.get(o).getChannel(), type);
                                     if (StringUtils.isEmpty(playFlv)) {
-                                        playFlv = cameraUtil.heartbeatgetUrl(baseCameraManagementList.get(o).getCameraCode(), baseCameraManagementList.get(o).getChannel(), type);
+                                        playFlv = cameraUtil.heartbeatgetUrl(baseList.get(o).getCameraCode(), baseList.get(o).getChannel(), type);
                                     }
 //                                    //判断心跳相机日志表后两条数据是否包含该相机编码
 //                                    if (!ObjectUtils.isEmpty(codeList)) {