|
@@ -792,10 +792,12 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
+// towerList.stream().filter(key -> key.get("towerNo").equals())
|
|
|
+
|
|
|
dataMap.put("towerList", towerList);
|
|
|
dataMap.put("coordinatesList", coordinateList);
|
|
|
|
|
|
-
|
|
|
for (StationInfo stationInfo : stationInfoList) {
|
|
|
|
|
|
if (stationInfo.getEquipment() != null && stationInfo.getEquipment().size() > 0) {
|
|
@@ -937,12 +939,11 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
|
|
|
map.put("latitude", split[1]);
|
|
|
}
|
|
|
if (projectInfo.getEquipment() != null && projectInfo.getEquipment().size() > 0) {
|
|
|
-
|
|
|
map.put("id", projectInfo.getId());
|
|
|
map.put("projectNameEasy", projectInfo.getProjectBasicInfo().getProjectNameEasy());
|
|
|
map.put("projectName", projectInfo.getProjectBasicInfo().getProjectName());
|
|
|
- arrayList.add(map);
|
|
|
}
|
|
|
+ arrayList.add(map);
|
|
|
}
|
|
|
return arrayList;
|
|
|
}
|