|
@@ -1389,15 +1389,15 @@ public class KwfTruckService {
|
|
|
//获取要返回的车辆信息
|
|
//获取要返回的车辆信息
|
|
|
List<CapacityStatusVo.Truck> trucks = Lists.newArrayList();
|
|
List<CapacityStatusVo.Truck> trucks = Lists.newArrayList();
|
|
|
fleetIdAndFleetTruckListMap.forEach((fleetId, fleetTruckList) -> {
|
|
fleetIdAndFleetTruckListMap.forEach((fleetId, fleetTruckList) -> {
|
|
|
- buildTruck(fleetId, fleetTruckList, fleetMap);
|
|
|
|
|
|
|
+ buildTruck(fleetId, fleetTruckList, fleetMap,trucks);
|
|
|
});
|
|
});
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
CapacityStatusVo capacityStatusVo = new CapacityStatusVo();
|
|
CapacityStatusVo capacityStatusVo = new CapacityStatusVo();
|
|
|
capacityStatusVo.setTruck(trucks);
|
|
capacityStatusVo.setTruck(trucks);
|
|
|
return capacityStatusVo;
|
|
return capacityStatusVo;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private static void buildTruck(Long fleetId, List<KwfFleetTruck> fleetTruckList, Map<Long, KwfFleet> fleetMap) {
|
|
|
|
|
|
|
+ private static void buildTruck(Long fleetId, List<KwfFleetTruck> fleetTruckList, Map<Long, KwfFleet> fleetMap,List<CapacityStatusVo.Truck> trucks) {
|
|
|
CapacityStatusVo.Truck truck = new CapacityStatusVo.Truck();
|
|
CapacityStatusVo.Truck truck = new CapacityStatusVo.Truck();
|
|
|
truck.setFleetId(String.valueOf(fleetId));
|
|
truck.setFleetId(String.valueOf(fleetId));
|
|
|
truck.setFleetName(fleetMap.getOrDefault(fleetId, new KwfFleet()).getName());
|
|
truck.setFleetName(fleetMap.getOrDefault(fleetId, new KwfFleet()).getName());
|
|
@@ -1415,6 +1415,7 @@ public class KwfTruckService {
|
|
|
truck.setRunningNum(String.valueOf(runningNum));
|
|
truck.setRunningNum(String.valueOf(runningNum));
|
|
|
}
|
|
}
|
|
|
truck.setAbnormalNum("0");
|
|
truck.setAbnormalNum("0");
|
|
|
|
|
+ trucks.add(truck);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|