|
@@ -827,11 +827,15 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
|
|
|
ArrayList<Object> arrayList = new ArrayList<>();
|
|
|
List<Map<String, Object>> towerNo = towerList.stream().filter(key -> key.get("towerNo").equals(s)).collect(Collectors.toList());
|
|
|
for (Map<String, Object> map : towerNo) {
|
|
|
+ HashMap<Object, Object> hashMap1 = new HashMap<>();
|
|
|
+ hashMap1.put("type",map.get("type"));
|
|
|
if (map.containsKey("projectId")) {
|
|
|
- arrayList.add(map.get("projectId"));
|
|
|
+ hashMap1.put("id",map.get("projectId"));
|
|
|
+ arrayList.add(hashMap1);
|
|
|
}
|
|
|
if (map.containsKey("stationId")) {
|
|
|
- arrayList.add(map.get("stationId"));
|
|
|
+ hashMap1.put("id",map.get("stationId"));
|
|
|
+ arrayList.add(hashMap1);
|
|
|
}
|
|
|
}
|
|
|
hashMap.put("towerNo", s);
|