|
@@ -712,6 +712,7 @@ public class GeoHazardMonitorTokenController {
|
|
LambdaQueryWrapper<BaseCameraManagement> ment = new LambdaQueryWrapper<BaseCameraManagement>();
|
|
LambdaQueryWrapper<BaseCameraManagement> ment = new LambdaQueryWrapper<BaseCameraManagement>();
|
|
ment.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
ment.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
ment.eq(BaseCameraManagement::getOnline, 2);
|
|
ment.eq(BaseCameraManagement::getOnline, 2);
|
|
|
|
+ ment.eq(BaseCameraManagement::getEnableOrNot, 1);
|
|
if (heartbeatVo.getLineDir() == 1) {
|
|
if (heartbeatVo.getLineDir() == 1) {
|
|
ment.ge(BaseCameraManagement::getEndMile, list.get(i).getAlarmMile());
|
|
ment.ge(BaseCameraManagement::getEndMile, list.get(i).getAlarmMile());
|
|
ment.le(BaseCameraManagement::getBeginMile, list.get(i).getAlarmMile());
|
|
ment.le(BaseCameraManagement::getBeginMile, list.get(i).getAlarmMile());
|
|
@@ -787,6 +788,7 @@ public class GeoHazardMonitorTokenController {
|
|
}
|
|
}
|
|
base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
base.eq(BaseCameraManagement::getOnline, 2);
|
|
base.eq(BaseCameraManagement::getOnline, 2);
|
|
|
|
+ base.eq(BaseCameraManagement::getEnableOrNot, 1);
|
|
base.last("limit 2");
|
|
base.last("limit 2");
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
|
|
for (BaseCameraManagement baseCameraManagement : list1) {
|
|
for (BaseCameraManagement baseCameraManagement : list1) {
|
|
@@ -820,6 +822,7 @@ public class GeoHazardMonitorTokenController {
|
|
}
|
|
}
|
|
base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
base.eq(BaseCameraManagement::getOnline, 2);
|
|
base.eq(BaseCameraManagement::getOnline, 2);
|
|
|
|
+ base.eq(BaseCameraManagement::getEnableOrNot, 1);
|
|
base.last("limit 2");
|
|
base.last("limit 2");
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
|
|
if (list1.size() <= 0) {
|
|
if (list1.size() <= 0) {
|
|
@@ -901,6 +904,7 @@ public class GeoHazardMonitorTokenController {
|
|
}
|
|
}
|
|
base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
|
|
base.eq(BaseCameraManagement::getOnline, 2);
|
|
base.eq(BaseCameraManagement::getOnline, 2);
|
|
|
|
+ base.eq(BaseCameraManagement::getEnableOrNot, 1);
|
|
base.last("limit 2");
|
|
base.last("limit 2");
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
|
|
if (list1.size() <= 0) {
|
|
if (list1.size() <= 0) {
|