bug修改

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

@@ -12,6 +12,8 @@ public class StationBasicInfo {
     private String stationName;
     //简称
     private String abbreviation;
+    //场站id
+    private String stationId;
     //场站类型
     private String stationType;
     //经度

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

@@ -118,7 +118,7 @@ public class StationEnvironmentData {
     /**
      * 设备ID
      **/
-    private String equipmentId;
+    private String stationId;
 
 
 }

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

@@ -74,7 +74,7 @@ public class StationWindData {
     /**
      * 设备ID
      **/
-    private String equipmentId;
+    private String stationId;
     /**
      * 层高
      **/

neim-biz/src/main/java/com/jiayue/biz/mapper/StationEnvironmentDataMapper.java

@@ -13,11 +13,11 @@ import java.util.List;
 public interface StationEnvironmentDataMapper extends BaseMapper<StationEnvironmentData> {
 
     @Insert("<script>" +
-            "insert into environment_${equipmentId} USING station_environment_data TAGS(${equipmentId}) values " +
+            "insert into environment_${stationId} USING station_environment_data TAGS(${stationId}) values " +
             "<foreach collection='stationEnvironmentData' item='p' separator=','> " +
             "(#{p.ts},#{p.tInst},#{p.tMax},#{p.tMin},#{p.tAve},#{p.tSta},#{p.tNow},#{p.rhInst},#{p.rhMax},#{p.rhMin},#{p.rhAve},#{p.rhSta},#{p.rhNow},#{p.paInst},#{p.paMax},#{p.paMin},#{p.paAve},#{p.paSta},#{p.paNow},#{p.vInst},#{p.vMax},#{p.vMin},#{p.vAve},#{p.vSta},#{p.vNow},#{p.airDensity}) " +
             "</foreach> " +
             "</script>")
-    int insertSplice(@Param("stationEnvironmentData") List<StationEnvironmentData> stationEnvironmentData, @Param("equipmentId") String equipmentId);
+    int insertSplice(@Param("stationEnvironmentData") List<StationEnvironmentData> stationEnvironmentData, @Param("stationId") String stationId);
 
 }

neim-biz/src/main/java/com/jiayue/biz/mapper/StationWindDataMapper.java

@@ -12,12 +12,12 @@ import java.util.List;
 public interface StationWindDataMapper extends BaseMapper<StationWindData> {
 
     @Insert("<script>" +
-            "insert into wind_${equipmentId}_${layerHeight} USING station_wind_data TAGS(#{equipmentId}, #{layerHeight}) values " +
+            "insert into wind_${stationId}_${layerHeight} USING station_wind_data TAGS(#{stationId}, #{layerHeight}) values " +
             "<foreach collection='stationWindData' item='p' separator=','> " +
             "(#{p.ts},#{p.wsInst},#{p.wsMax},#{p.wsMin},#{p.wsAve},#{p.wsGreat},#{p.wsGust},#{p.wsSta},#{p.wdInst},#{p.wdMax},#{p.wdMin},#{p.wdAve},#{p.wdSta},#{p.wdNow},#{p.wdOnWs}) " +
             "</foreach> " +
             "</script>")
-    int insertSplice(@Param("stationWindData") List<StationWindData> stationWindData, @Param("equipmentId") String equipmentId, @Param("layerHeight") String layerHeight);
+    int insertSplice(@Param("stationWindData") List<StationWindData> stationWindData, @Param("stationId") String stationId, @Param("layerHeight") String layerHeight);
 
 
 }

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

@@ -596,17 +596,17 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
 
         // 风速集合
         String finalHeight = height;
-        List<BigDecimal> wsForHeight = anemometryDataList.stream().filter(a -> a.getLayerHeight().equals(finalHeight)).map(h -> {
-            return BigDecimal.valueOf(h.getWsAve());
-        }).collect(Collectors.toList());
+        List<BigDecimal> wsForHeight = anemometryDataList.stream().filter(a -> a.getLayerHeight().equals(finalHeight) && a.getWsAve() != null)
+                .map(h -> BigDecimal.valueOf(h.getWsAve()))
+                .collect(Collectors.toList());
         //最小风速集合
-        List<BigDecimal> minWsForHeight = anemometryDataList.stream().filter(a -> a.getLayerHeight().equals(minHeight)).map(h -> {
-            return BigDecimal.valueOf(h.getWsAve());
-        }).collect(Collectors.toList());
+        List<BigDecimal> minWsForHeight = anemometryDataList.stream().filter(a -> a.getLayerHeight().equals(minHeight) && a.getWsAve() != null)
+                .map(h -> BigDecimal.valueOf(h.getWsAve()))
+                .collect(Collectors.toList());
         // 风速标准差集合
-        List<BigDecimal> wsStaForHeight = anemometryDataList.stream().filter(a -> a.getLayerHeight().equals(finalHeight)).map(h -> {
-            return BigDecimal.valueOf(h.getWsSta());
-        }).collect(Collectors.toList());
+        List<BigDecimal> wsStaForHeight = anemometryDataList.stream().filter(a -> a.getLayerHeight().equals(finalHeight) && a.getWsSta() != null)
+                .map(h -> BigDecimal.valueOf(h.getWsSta()))
+                .collect(Collectors.toList());
 
         BigDecimal avgWs = CalculationUtil.getAvgWind(wsForHeight); // 风速平均值
         BigDecimal avgMinWs = CalculationUtil.getAvgWind(minWsForHeight); // 最小风速平均值

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

@@ -1,6 +1,5 @@
 package com.jiayue.biz.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jiayue.biz.domain.StationWindData;
 import com.jiayue.biz.mapper.StationWindDataMapper;

neim-biz/src/main/java/com/jiayue/biz/util/CalculationUtil.java

@@ -48,7 +48,7 @@ public class CalculationUtil {
         List<ProphaseAnemometryData> collect = new ArrayList<>();
         if (windEnum.name().equals("N")) {
             // N的范围为 348.75<wd<360 + 0<wd<11.25
-            List.stream().filter(w -> w.getWdAve() != null && (getBigDecimal(w.getWdAve()).compareTo(windEnum.getLower()) >= 0 && getBigDecimal(w.getWdAve()).compareTo(new BigDecimal(360)) <= 0) || (getBigDecimal(w.getWdAve()).compareTo(windEnum.getUpper()) < 0 && getBigDecimal(w.getWdAve()).compareTo(new BigDecimal(0)) > 0)).collect(Collectors.toList());
+            List.stream().filter(e -> e.getWdAve() != null).filter(w ->  (getBigDecimal(w.getWdAve()).compareTo(windEnum.getLower()) >= 0 && getBigDecimal(w.getWdAve()).compareTo(new BigDecimal(360)) <= 0) || (getBigDecimal(w.getWdAve()).compareTo(windEnum.getUpper()) < 0 && getBigDecimal(w.getWdAve()).compareTo(new BigDecimal(0)) > 0)).collect(Collectors.toList());
         } else {
             collect = List.stream().filter(w -> w.getWdAve() != null && getBigDecimal(w.getWdAve()).compareTo(windEnum.getLower()) >= 0 && getBigDecimal(w.getWdAve()).compareTo(windEnum.getUpper()) < 0).collect(Collectors.toList());
         }