Explorar el Código

车载心跳监测接口添加逻辑

gao.qiang hace 11 meses
padre
commit
64c71395f3

+ 6 - 2
vehicle-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -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");