|
|
@@ -80,7 +80,12 @@ public class StationServiceImpl extends MPJBaseServiceImpl<StationMapper, Statio
|
|
|
station.getEquipmentInfos().forEach(enEquipmentInfo ->
|
|
|
enEquipmentInfo.setShortId(KymCache.INSTANCE.getShortIdByEquipmentIdOrConnectorId(enEquipmentInfo.getEquipmentId()))
|
|
|
.setParkingNo(KymCache.INSTANCE.getParkNoByEquipmentIdOrConnectorId(enEquipmentInfo.getEquipmentId())));
|
|
|
- station.setPictures(stations.stream().filter(item -> item.getStationId().equals(station.getStationId())).toList().get(0).getPictures());
|
|
|
+ var res = stations.stream().filter(item -> item.getStationId().equals(station.getStationId())).toList();
|
|
|
+ if (!res.isEmpty()) {
|
|
|
+ station.setPictures(res.get(0).getPictures());
|
|
|
+ } else {
|
|
|
+ station.setPictures(null);
|
|
|
+ }
|
|
|
});
|
|
|
|
|
|
stationList.forEach(vo -> vo.setEquipmentInfos(vo.getEquipmentInfos().stream().sorted(Comparator.comparing(EnEquipmentInfo::getShortId)).toList()));
|