整合 mongodb

neim-biz/src/main/java/com/jiayue/biz/domain/StationInfo.java

@@ -18,7 +18,7 @@ public class StationInfo {
     private StationBasicInfo stationBasicInfo;
     //风机信息
     private List<FanTower> fanTowerList;
-
-    private List<Equipment> equipmentList;
+    //塔信息
+    private List<Equipment> equipment;
 
 }

neim-biz/src/main/java/com/jiayue/biz/job/AirDensityJob.java

@@ -23,6 +23,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.Timestamp;
 import java.util.Date;
 import java.util.List;
@@ -314,7 +315,7 @@ public class AirDensityJob {
             FanJsonInfo towerJsonInfo = jsonObject1.toBean(FanJsonInfo.class);
 
             List<String> collect = stationInfo.getFanTowerList().stream().map(FanTower::getFanModel).distinct().collect(Collectors.toList());
-            String fdn = towerJsonInfo.getFd1n();
+            String fdn = new BigDecimal(towerJsonInfo.getFd1n()).setScale(2, RoundingMode.HALF_UP).toString();
             for (String s1 : collect) {
                 if (!s1.contains("MW")) {
                     continue;
@@ -323,10 +324,12 @@ public class AirDensityJob {
                 BigDecimal realTimeTotal = new BigDecimal(fdn).divide(new BigDecimal(s2), 2, BigDecimal.ROUND_HALF_UP);
 
                 //一期
-                FanModelData fanModelData = new FanModelData(UUID.randomUUID().toString(), stationInfo.getId()
-                        , stationInfo.getStationBasicInfo().getStationName(), s1, stationInfo.getStationBasicInfo().getAbbreviation(),
-                        towerJsonInfo.getPjfs(), towerJsonInfo.getZfx(), fdn, realTimeTotal.toString());
-                fdn = towerJsonInfo.getFd2n();
+                FanModelData fanModelData = new FanModelData(UUID.randomUUID().toString(), stationInfo.getId(),
+                        stationInfo.getStationBasicInfo().getStationName(), s1, stationInfo.getStationBasicInfo().getAbbreviation(),
+                        new BigDecimal(towerJsonInfo.getPjfs()).setScale(2,RoundingMode.HALF_UP).toString(), towerJsonInfo.getZfx(),
+                        fdn, realTimeTotal.toString());
+
+                fdn =  new BigDecimal(towerJsonInfo.getFd2n()).setScale(2, RoundingMode.HALF_UP).toString();
                 mongoTemplate.save(fanModelData);
 
             }

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

@@ -868,9 +868,25 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
                 }
 
             }
+            //过滤塔信息
+            List<Equipment> equipmentList = stationInfoList.get(0).getEquipment();
+            ArrayList<HashMap<String,String>> towerList = new ArrayList<>();
+            if(equipmentList.size() > 0 ){
+                for (Equipment equipment : equipmentList) {
+                    HashMap<String, String> towerMap = new HashMap<>();
+                    towerMap.put("name",equipment.getName());
+                    towerMap.put("towerId",equipment.getId());
+                    towerMap.put("equipmentNo",equipment.getEquipmentNo());
+                    towerMap.put("longitude",equipment.getLongitude());
+                    towerMap.put("latitude",equipment.getLatitude());
+                    towerList.add(towerMap);
+                }
+
+            }
             dataMap.put("modelT", arrayList);
             //风机点位
-            dataMap.put("modelTower", stationInfoList.get(0).getFanTowerList());
+            dataMap.put("modelFan", stationInfoList.get(0).getFanTowerList());
+            dataMap.put("tower", towerList);
         }
         return dataMap;
     }