|
@@ -73,10 +73,10 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
|
|
|
station.getEquipmentInfos().forEach(enEquipmentInfo ->
|
|
station.getEquipmentInfos().forEach(enEquipmentInfo ->
|
|
|
enEquipmentInfo.setShortId(kymCache.getShortId(enEquipmentInfo.getEquipmentId()))
|
|
enEquipmentInfo.setShortId(kymCache.getShortId(enEquipmentInfo.getEquipmentId()))
|
|
|
.setParkingNo(kymCache.getParkNoByEquipmentId(enEquipmentInfo.getEquipmentId())));
|
|
.setParkingNo(kymCache.getParkNoByEquipmentId(enEquipmentInfo.getEquipmentId())));
|
|
|
- //station.setPictures(stations.stream().filter(item -> item.getStationId().equals(station.getStationId())).toList().get(0).getPictures());
|
|
|
|
|
|
|
+ station.setPictures(stations.stream().filter(item -> item.getStationId().equals(station.getStationId())).toList().get(0).getPictures());
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- stationList.forEach(vo -> vo.setEquipmentInfos(vo.getEquipmentInfos().stream()/*.sorted(Comparator.comparing(EnEquipmentInfo::getShortId))*/.toList()));
|
|
|
|
|
|
|
+ stationList.forEach(vo -> vo.setEquipmentInfos(vo.getEquipmentInfos().stream().sorted(Comparator.comparing(EnEquipmentInfo::getShortId)).toList()));
|
|
|
return stationList;
|
|
return stationList;
|
|
|
|
|
|
|
|
}
|
|
}
|