Explorar o código

心跳接口修改

gao.qiang hai 1 ano
pai
achega
8c7d992a2c

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

@@ -622,7 +622,6 @@ public class GeoHazardMonitorTokenController {
                         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::getLineDir, heartbeatVo.getLineDir());
                         camera.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
 //                    camera.eq(BaseCameraManagement::getOnline,2);
                         camera.eq(BaseCameraManagement::getEnableOrNot, 1);
@@ -684,7 +683,6 @@ public class GeoHazardMonitorTokenController {
                             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::getLineDir, heartbeatVo.getLineDir());
                             ment.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
                             ment.eq(BaseCameraManagement::getEnableOrNot, 1);
                             ment.orderByAsc(BaseCameraManagement::getInstallMile);
@@ -741,13 +739,6 @@ public class GeoHazardMonitorTokenController {
                         //没有报警信息的时候
                         distance = heartbeatVo.getVisualDistance() + heartbeatVo.getCurrentMile();
                         LambdaQueryWrapper<BaseCameraManagement> base = new LambdaQueryWrapper<>();
-                        if (heartbeatVo.getLineDir() == 1) {
-                            base.gt(BaseCameraManagement::getInstallMile, distance);
-                        }
-                        if (heartbeatVo.getLineDir() == 2) {
-                            base.lt(BaseCameraManagement::getInstallMile, distance);
-                        }
-                        base.eq(BaseCameraManagement::getLineDir, heartbeatVo.getLineDir());
                         base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
                         base.orderByAsc(BaseCameraManagement::getInstallMile);
                         base.eq(BaseCameraManagement::getEnableOrNot, 1);
@@ -782,13 +773,6 @@ public class GeoHazardMonitorTokenController {
                     //没有报警信息的时候
                     distance = heartbeatVo.getVisualDistance() + heartbeatVo.getCurrentMile();
                     LambdaQueryWrapper<BaseCameraManagement> base = new LambdaQueryWrapper<>();
-                    if (heartbeatVo.getLineDir() == 1) {
-                        base.gt(BaseCameraManagement::getInstallMile, distance);
-                    }
-                    if (heartbeatVo.getLineDir() == 2) {
-                        base.lt(BaseCameraManagement::getInstallMile, distance);
-                    }
-                    base.eq(BaseCameraManagement::getLineDir, heartbeatVo.getLineDir());
                     base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
                     base.orderByAsc(BaseCameraManagement::getInstallMile);
                     base.eq(BaseCameraManagement::getEnableOrNot, 1);