|
@@ -1186,6 +1186,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
|
|
|
lw.eq(BaseCameraManagement::getCameraCode, cameraPlayVo.getCameraCode());
|
|
|
lw.eq(BaseCameraManagement::getOnline, 2);
|
|
|
+ lw.eq(BaseCameraManagement::getEnableOrNot, 1);
|
|
|
BaseCameraManagement one = baseCameraManagementService.getOne(lw);
|
|
|
if (ObjectUtils.isEmpty(one)) {
|
|
|
jsonObject.put("resultCode", 0);
|
|
@@ -1234,6 +1235,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
|
|
|
lw.eq(BaseCameraManagement::getCameraCode, cameraPlayVo.getCameraCode());
|
|
|
lw.eq(BaseCameraManagement::getOnline, 2);
|
|
|
+ lw.eq(BaseCameraManagement::getEnableOrNot, 1);
|
|
|
BaseCameraManagement one = baseCameraManagementService.getOne(lw);
|
|
|
if (ObjectUtils.isEmpty(one)) {
|
|
|
jsonObject.put("resultCode", 0);
|
|
@@ -1382,11 +1384,13 @@ public class GeoHazardMonitorTokenController {
|
|
|
camera.le(BaseCameraManagement::getEndMile, one.getAlarmMile());
|
|
|
camera.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
|
|
|
camera.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
+ camera.eq(BaseCameraManagement::getEnableOrNot, 1);
|
|
|
} else if (one.getLineDir() == 2) {
|
|
|
camera.le(BaseCameraManagement::getBeginMile, one.getAlarmMile());
|
|
|
camera.ge(BaseCameraManagement::getEndMile, one.getAlarmMile());
|
|
|
camera.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
|
|
|
camera.orderByDesc(BaseCameraManagement::getInstallMile);
|
|
|
+ camera.eq(BaseCameraManagement::getEnableOrNot, 1);
|
|
|
}
|
|
|
camera.eq(BaseCameraManagement::getOnline, 2);
|
|
|
List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
|