心跳接口修改

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

@@ -630,15 +630,18 @@ public class GeoHazardMonitorTokenController {
                     if (!ObjectUtils.isEmpty(list)) {
                         //获取报警里程所监控的所有相机
                         LambdaQueryWrapper<BaseCameraManagement> camera = new LambdaQueryWrapper<BaseCameraManagement>();
-                        camera.ge(BaseCameraManagement::getEndMile, list.get(0).getAlarmMile());
-                        camera.le(BaseCameraManagement::getBeginMile, list.get(0).getAlarmMile());
-                        camera.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
-                        camera.eq(BaseCameraManagement::getOnline, 2);
                         if (heartbeatVo.getLineDir() == 1) {
+                            camera.ge(BaseCameraManagement::getEndMile, list.get(0).getAlarmMile());
+                            camera.le(BaseCameraManagement::getBeginMile, list.get(0).getAlarmMile());
                             camera.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
-                        } else if (heartbeatVo.getLineDir() == 2) {
+                        }
+                        if (heartbeatVo.getLineDir() == 2) {
+                            camera.le(BaseCameraManagement::getEndMile, list.get(0).getAlarmMile());
+                            camera.ge(BaseCameraManagement::getBeginMile, list.get(0).getAlarmMile());
                             camera.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
                         }
+                        camera.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
+                        camera.eq(BaseCameraManagement::getOnline, 2);
                         camera.eq(BaseCameraManagement::getEnableOrNot, 1);
                         camera.orderByAsc(BaseCameraManagement::getInstallMile);
                         List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
@@ -695,13 +698,15 @@ public class GeoHazardMonitorTokenController {
                             msgHearbeatAlarmMessageMapper.insert(msgHearbeatAlarmMessage);
                             //获取剩余的报警信息
                             LambdaQueryWrapper<BaseCameraManagement> ment = new LambdaQueryWrapper<BaseCameraManagement>();
-                            ment.ge(BaseCameraManagement::getEndMile, list.get(i).getAlarmMile());
-                            ment.le(BaseCameraManagement::getBeginMile, list.get(i).getAlarmMile());
                             ment.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
                             ment.eq(BaseCameraManagement::getOnline, 2);
                             if (heartbeatVo.getLineDir() == 1) {
+                                ment.ge(BaseCameraManagement::getEndMile, list.get(i).getAlarmMile());
+                                ment.le(BaseCameraManagement::getBeginMile, list.get(i).getAlarmMile());
                                 ment.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
                             } else if (heartbeatVo.getLineDir() == 2) {
+                                ment.le(BaseCameraManagement::getEndMile, list.get(i).getAlarmMile());
+                                ment.ge(BaseCameraManagement::getBeginMile, list.get(i).getAlarmMile());
                                 ment.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
                             }
                             ment.orderByAsc(BaseCameraManagement::getInstallMile);