|
@@ -914,6 +914,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
|
|
|
hashMap.put("longitude", stationInfo.getStationBasicInfo().getLongitude());
|
|
|
//纬度
|
|
|
hashMap.put("latitude", stationInfo.getStationBasicInfo().getLatitude());
|
|
|
+ hashMap.put("type", stationInfo.getStationBasicInfo().getStationType());
|
|
|
stationList.add(hashMap);
|
|
|
}
|
|
|
ArrayList<HashMap<String, Object>> otherStationList = new ArrayList<>();
|
|
@@ -926,6 +927,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
|
|
|
hashMap.put("longitude", otherStationInfo.getLongitude());
|
|
|
//纬度
|
|
|
hashMap.put("latitude", otherStationInfo.getLatitude());
|
|
|
+ hashMap.put("type", otherStationInfo.getStationType());
|
|
|
otherStationList.add(hashMap);
|
|
|
}
|
|
|
}
|
|
@@ -951,6 +953,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
|
|
|
String[] split = projectInfo.getProjectBasicInfo().getPosition().split(",");
|
|
|
map.put("longitude", split[0]);
|
|
|
map.put("latitude", split[1]);
|
|
|
+ map.put("type", projectInfo.getProjectBasicInfo().getProjectType());
|
|
|
}
|
|
|
// if (projectInfo.getEquipment() != null && projectInfo.getEquipment().size() > 0) {
|
|
|
//
|