|
@@ -2235,8 +2235,12 @@ public class GeoHazardMonitorTokenController {
|
|
|
VehiclePosition vehiclePosition = vehiclePositionService.getOne(new LambdaQueryWrapper<VehiclePosition>().eq(VehiclePosition::getVehicleCode, baseTerminalLog.getTrainNum()).orderByDesc(VehiclePosition::getCreateTime).last("limit 1"));
|
|
|
VehiclePosition positionServiceOne = vehiclePositionService.getOne(new LambdaQueryWrapper<VehiclePosition>().eq(VehiclePosition::getVehicleCode, baseTerminalLog.getFrontTrainNum()).orderByDesc(VehiclePosition::getCreateTime).last("limit 1"));
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
- int dif= vehiclePosition.getTravelMile()-positionServiceOne.getTravelMile();
|
|
|
- map.put("frontVehicleDistance", Math.abs(dif));
|
|
|
+ if (!ObjectUtils.isEmpty(positionServiceOne)) {
|
|
|
+ int dif = vehiclePosition.getTravelMile() - positionServiceOne.getTravelMile();
|
|
|
+ map.put("frontVehicleDistance", Math.abs(dif));
|
|
|
+ }else {
|
|
|
+ map.put("frontVehicleDistance", "_");
|
|
|
+ }
|
|
|
AjaxResults1 = new AjaxResults(1, "ok", map);
|
|
|
}else {
|
|
|
AjaxResults1 = new AjaxResults(1, "ok");
|