|
@@ -805,14 +805,15 @@ public class GeoHazardMonitorTokenController {
|
|
|
}
|
|
|
} else {
|
|
|
//没有报警信息的时候
|
|
|
- distance = heartbeatVo.getVisualDistance() + heartbeatVo.getCurrentMile();
|
|
|
LambdaQueryWrapper<BaseCameraManagement> base = new LambdaQueryWrapper<>();
|
|
|
if (heartbeatVo.getLineDir() == 1) {
|
|
|
+ distance = heartbeatVo.getVisualDistance() + heartbeatVo.getCurrentMile();
|
|
|
base.gt(BaseCameraManagement::getInstallMile, distance);
|
|
|
base.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
|
|
|
base.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
}
|
|
|
if (heartbeatVo.getLineDir() == 2) {
|
|
|
+ distance = heartbeatVo.getVisualDistance() - heartbeatVo.getCurrentMile();
|
|
|
base.lt(BaseCameraManagement::getInstallMile, distance);
|
|
|
base.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
|
|
|
base.orderByDesc(BaseCameraManagement::getInstallMile);
|
|
@@ -885,14 +886,15 @@ public class GeoHazardMonitorTokenController {
|
|
|
}
|
|
|
} else {
|
|
|
//没有报警信息的时候
|
|
|
- distance = heartbeatVo.getVisualDistance() + heartbeatVo.getCurrentMile();
|
|
|
LambdaQueryWrapper<BaseCameraManagement> base = new LambdaQueryWrapper<>();
|
|
|
if (heartbeatVo.getLineDir() == 1) {
|
|
|
+ distance = heartbeatVo.getVisualDistance() + heartbeatVo.getCurrentMile();
|
|
|
base.gt(BaseCameraManagement::getInstallMile, distance);
|
|
|
base.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
|
|
|
base.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
}
|
|
|
if (heartbeatVo.getLineDir() == 2) {
|
|
|
+ distance = heartbeatVo.getVisualDistance() - heartbeatVo.getCurrentMile();
|
|
|
base.lt(BaseCameraManagement::getInstallMile, distance);
|
|
|
base.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
|
|
|
base.orderByDesc(BaseCameraManagement::getInstallMile);
|