|
@@ -643,7 +643,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
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::getOnline,2);
|
|
|
camera.eq(BaseCameraManagement::getEnableOrNot,1);
|
|
|
camera.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
|
|
@@ -699,7 +699,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
ment.le(BaseCameraManagement::getBeginMile, list.get(i).getAlarmMile());
|
|
|
ment.eq(BaseCameraManagement::getLineDir, heartbeatVo.getLineDir());
|
|
|
ment.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
|
- ment.eq(BaseCameraManagement::getOnline,2);
|
|
|
+// ment.eq(BaseCameraManagement::getOnline,2);
|
|
|
ment.eq(BaseCameraManagement::getEnableOrNot,1);
|
|
|
ment.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
if (i == 0) {
|
|
@@ -756,7 +756,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
base.eq(BaseCameraManagement::getLineDir, heartbeatVo.getLineDir());
|
|
|
base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
|
base.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
- base.eq(BaseCameraManagement::getOnline,2);
|
|
|
+// base.eq(BaseCameraManagement::getOnline,2);
|
|
|
base.eq(BaseCameraManagement::getEnableOrNot,1);
|
|
|
base.last("limit 4");
|
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
|
|
@@ -907,7 +907,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
if (!ObjectUtils.isEmpty(cameraVo.getLineDir())) {
|
|
|
wrapper.eq(BaseCameraManagement::getLineDir, cameraVo.getLineDir());
|
|
|
}
|
|
|
- wrapper.eq(BaseCameraManagement::getOnline,2);
|
|
|
+// wrapper.eq(BaseCameraManagement::getOnline,2);
|
|
|
wrapper.eq(BaseCameraManagement::getEnableOrNot,1);
|
|
|
wrapper.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
List<BaseCameraManagement> list = baseCameraManagementService.list(wrapper);
|
|
@@ -999,7 +999,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
}
|
|
|
LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
|
|
|
lw.eq(BaseCameraManagement::getCameraCode, cameraPlayVo.getCameraCode());
|
|
|
- lw.eq(BaseCameraManagement::getOnline,2);
|
|
|
+// lw.eq(BaseCameraManagement::getOnline,2);
|
|
|
lw.eq(BaseCameraManagement::getEnableOrNot,1);
|
|
|
BaseCameraManagement one = baseCameraManagementService.getOne(lw);
|
|
|
if (ObjectUtils.isEmpty(one)) {
|
|
@@ -1151,7 +1151,7 @@ public class GeoHazardMonitorTokenController {
|
|
|
camera.ge(BaseCameraManagement::getEndMile, one.getAlarmMile());
|
|
|
camera.eq(BaseCameraManagement::getLineDir, one.getLineDir());
|
|
|
camera.orderByAsc(BaseCameraManagement::getInstallMile);
|
|
|
- camera.eq(BaseCameraManagement::getOnline,2);
|
|
|
+// camera.eq(BaseCameraManagement::getOnline,2);
|
|
|
camera.eq(BaseCameraManagement::getEnableOrNot,1);
|
|
|
List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
|
|
|
if (baseCameraManagementList.size() > 0) {
|