|
@@ -1261,30 +1261,12 @@ public class KwfDriverService {
|
|
|
if (CollectionUtils.isEmpty(associatedTrackList)) {
|
|
if (CollectionUtils.isEmpty(associatedTrackList)) {
|
|
|
return Collections.emptyList();
|
|
return Collections.emptyList();
|
|
|
}
|
|
}
|
|
|
-// //查询轴数表
|
|
|
|
|
-// Set<Integer> truckAxleIds = associatedTrackList.stream()
|
|
|
|
|
-// .filter(x -> Objects.nonNull(x.getTruckAxleId()))
|
|
|
|
|
-// .map(x -> Integer.parseInt(x.getTruckAxleId().toString()))
|
|
|
|
|
-// .collect(Collectors.toSet());
|
|
|
|
|
-// Map<Integer, TmsTruckAxleNum> truckAxleNumMap = Maps.newHashMap();
|
|
|
|
|
-// if (CollectionUtils.isNotEmpty(truckAxleIds)) {
|
|
|
|
|
-// List<TmsTruckAxleNum> truckAxleNumList = truckAxleNumRepository.queryByIds(truckAxleIds);
|
|
|
|
|
-// if (CollectionUtils.isNotEmpty(truckAxleNumList)) {
|
|
|
|
|
-// log.info("查询轴数表结果:{}", JSON.toJSONString(truckAxleNumList));
|
|
|
|
|
-// truckAxleNumMap = truckAxleNumList.stream()
|
|
|
|
|
-// .collect(Collectors.toMap(TmsTruckAxleNum::getId, Function.identity(), (key1, key2) -> key1));
|
|
|
|
|
-// }
|
|
|
|
|
-// }
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
- //Map<Integer, TmsTruckAxleNum> finalTruckAxleNumMap = truckAxleNumMap;
|
|
|
|
|
List<KwfDriverAssociatedTrackVO> associatedTrackVOList = associatedTrackList.stream().map(truck ->{
|
|
List<KwfDriverAssociatedTrackVO> associatedTrackVOList = associatedTrackList.stream().map(truck ->{
|
|
|
KwfDriverAssociatedTrackVO vo = new KwfDriverAssociatedTrackVO();
|
|
KwfDriverAssociatedTrackVO vo = new KwfDriverAssociatedTrackVO();
|
|
|
TmsTruckAxleNum carAxisInfo = getCarAxisInfo(truck.getTruckAxleId());
|
|
TmsTruckAxleNum carAxisInfo = getCarAxisInfo(truck.getTruckAxleId());
|
|
|
vo.setId(truck.getId());
|
|
vo.setId(truck.getId());
|
|
|
vo.setTruckNo(truck.getTruckNo());
|
|
vo.setTruckNo(truck.getTruckNo());
|
|
|
vo.setTruckAxleName(carAxisInfo.getName());
|
|
vo.setTruckAxleName(carAxisInfo.getName());
|
|
|
- // TmsTruckAxleNum tmsTruckAxleNum = finalTruckAxleNumMap.getOrDefault(truck.getTruckAxleId(), new TmsTruckAxleNum());
|
|
|
|
|
vo.setLegalLoad(carAxisInfo.getLegalLoad());
|
|
vo.setLegalLoad(carAxisInfo.getLegalLoad());
|
|
|
vo.setStatus(truck.getStatus());
|
|
vo.setStatus(truck.getStatus());
|
|
|
return vo;
|
|
return vo;
|