|
@@ -995,13 +995,15 @@ public class GeoHazardMonitorTokenController {
|
|
|
//没有报警信息的时候
|
|
|
if (heartbeatVo.getLineDir() == 1) {
|
|
|
distance = heartbeatVo.getVisualDistance() + heartbeatVo.getCurrentMile();
|
|
|
- camera.gt(BaseCameraManagement::getInstallMile, distance);
|
|
|
+ camera.ge(BaseCameraManagement::getInstallMile, distance);
|
|
|
+ camera.le(BaseCameraManagement::getInstallMile, (distance + 10000));
|
|
|
camera.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
|
|
|
camera.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
}
|
|
|
if (heartbeatVo.getLineDir() == 2) {
|
|
|
distance = heartbeatVo.getCurrentMile() - heartbeatVo.getVisualDistance();
|
|
|
- camera.lt(BaseCameraManagement::getInstallMile, distance);
|
|
|
+ camera.le(BaseCameraManagement::getInstallMile, distance);
|
|
|
+ camera.ge(BaseCameraManagement::getInstallMile, (distance - 10000));
|
|
|
camera.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
|
|
|
camera.orderByDesc(BaseCameraManagement::getInstallMile);
|
|
|
}
|
|
@@ -1148,13 +1150,15 @@ public class GeoHazardMonitorTokenController {
|
|
|
LambdaQueryWrapper<BaseCameraManagement> base = new LambdaQueryWrapper<>();
|
|
|
if (heartbeatVo.getLineDir() == 1) {
|
|
|
distance = heartbeatVo.getVisualDistance() + heartbeatVo.getCurrentMile();
|
|
|
- base.gt(BaseCameraManagement::getInstallMile, distance);
|
|
|
+ base.ge(BaseCameraManagement::getInstallMile, distance);
|
|
|
base.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
|
|
|
base.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
+ base.le(BaseCameraManagement::getInstallMile, (distance + 10000));
|
|
|
}
|
|
|
if (heartbeatVo.getLineDir() == 2) {
|
|
|
distance = heartbeatVo.getCurrentMile() - heartbeatVo.getVisualDistance();
|
|
|
- base.lt(BaseCameraManagement::getInstallMile, distance);
|
|
|
+ base.le(BaseCameraManagement::getInstallMile, distance);
|
|
|
+ base.ge(BaseCameraManagement::getInstallMile, (distance - 10000));
|
|
|
base.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
|
|
|
base.orderByDesc(BaseCameraManagement::getInstallMile);
|
|
|
}
|