|
@@ -670,8 +670,8 @@ public class GeoHazardMonitorTokenController {
|
|
|
}
|
|
|
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.ge(BaseCameraManagement::getEndMile, list.get(0).getAlarmMile());
|
|
|
+ camera.le(BaseCameraManagement::getBeginMile, list.get(0).getAlarmMile());
|
|
|
camera.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
|
|
|
camera.orderByDesc(BaseCameraManagement::getInstallMile);
|
|
|
}
|
|
@@ -811,8 +811,8 @@ public class GeoHazardMonitorTokenController {
|
|
|
ment.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
|
|
|
ment.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
} else if (heartbeatVo.getLineDir() == 2) {
|
|
|
- ment.le(BaseCameraManagement::getEndMile, list.get(i).getAlarmMile());
|
|
|
- ment.ge(BaseCameraManagement::getBeginMile, list.get(i).getAlarmMile());
|
|
|
+ ment.ge(BaseCameraManagement::getEndMile, list.get(i).getAlarmMile());
|
|
|
+ ment.le(BaseCameraManagement::getBeginMile, list.get(i).getAlarmMile());
|
|
|
ment.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
|
|
|
ment.orderByDesc(BaseCameraManagement::getInstallMile);
|
|
|
}
|