|
@@ -738,7 +738,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
|
|
|
//拐点坐标List
|
|
|
ArrayList<List<Coordinates>> coordinateList = new ArrayList<>();
|
|
|
//风机List
|
|
|
- ArrayList<List<FanTower>> fanList = new ArrayList<>();
|
|
|
+ ArrayList<FanTower> fanList = new ArrayList<>();
|
|
|
for (ProjectInfo projectInfo : projectInfoList) {
|
|
|
//拐点坐标
|
|
|
coordinateList.add(projectInfo.getCoordinates());
|
|
@@ -776,7 +776,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
|
|
|
}
|
|
|
towerList.addAll(arrayList);
|
|
|
}
|
|
|
- fanList.add(stationInfo.getFanTowerList());
|
|
|
+ fanList.addAll(stationInfo.getFanTowerList());
|
|
|
}
|
|
|
dataMap.put("fan", fanList);
|
|
|
|