地图升级

neim-biz/src/main/java/com/jiayue/biz/service/impl/HomePageServiceImpl.java

@@ -563,7 +563,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
         //获取风向 层高 最高层
         String wdHeights = windTowerInfo.getWdHeights();
         String wdHeightMax = "";
-        if(!wdHeights.isEmpty()){
+        if (!wdHeights.isEmpty()) {
             ArrayList<String> wdHeightList = new ArrayList(Arrays.asList(wdHeights.split(",")));
             List<Integer> collect = wdHeightList.stream().map(Integer::parseInt).sorted().collect(Collectors.toList());
             wdHeightMax = collect.get(collect.size() - 1).toString();
@@ -640,9 +640,9 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
         }
         Integer total = 0;
         for (Map.Entry<String, Integer> entry : wdMap.entrySet()) {
-            if(entry.getValue() >= total){
+            if (entry.getValue() >= total) {
                 dataMap.put("wdSum", entry.getKey());
-                total =  entry.getValue();
+                total = entry.getValue();
             }
         }
         BigDecimal batterySum = BigDecimal.ZERO;
@@ -903,15 +903,16 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
         }
         ArrayList<HashMap<String, Object>> otherStationList = new ArrayList<>();
         for (OtherStationInfo otherStationInfo : otherStationInfoList) {
-            HashMap<String, Object> hashMap = new HashMap<>();
-            hashMap.put("id", otherStationInfo.getId());
-            hashMap.put("stationName", otherStationInfo.getStationName());
-            //经度
-            hashMap.put("longitude", otherStationInfo.getLongitude());
-            //纬度
-            hashMap.put("latitude", otherStationInfo.getLatitude());
-            otherStationList.add(hashMap);
-
+            if (otherStationInfo.getStationType().equals("风")) {//目前只要风
+                HashMap<String, Object> hashMap = new HashMap<>();
+                hashMap.put("id", otherStationInfo.getId());
+                hashMap.put("stationName", otherStationInfo.getStationName());
+                //经度
+                hashMap.put("longitude", otherStationInfo.getLongitude());
+                //纬度
+                hashMap.put("latitude", otherStationInfo.getLatitude());
+                otherStationList.add(hashMap);
+            }
         }
         dataMap.put("HDStation", stationList);
         dataMap.put("otherStation", otherStationList);
@@ -986,11 +987,13 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
             if (stationInfo.getEquipment() != null && stationInfo.getEquipment().size() > 0) {
                 dataMap.put("longitude", stationInfo.getEquipment().get(0).getLongitude());
                 dataMap.put("latitude", stationInfo.getEquipment().get(0).getLatitude());
-            } else {
+            }
+            if (stationInfo.getFanTowerList() != null && stationInfo.getFanTowerList().size() > 0) {
                 dataMap.put("longitude", stationInfo.getFanTowerList().get(0).getLongitudeFan());
                 dataMap.put("latitude", stationInfo.getFanTowerList().get(0).getLatitudeFan());
             }
 
+
             dataMap.put("modelT", arrayList);
         }
         return dataMap;