|
@@ -287,7 +287,7 @@ public class WindDirectionStatisticsDataServiceImpl extends ServiceImpl<WindDire
|
|
|
//计算当前层高平均风速
|
|
|
BigDecimal avgWindSpeed = CalculationUtil.getAvgWind(wsForHeight);
|
|
|
//获取指定最小层高风速数据
|
|
|
- int finalHeightMin = heightMin;
|
|
|
+ String finalHeightMin = String.valueOf(heightMin);
|
|
|
List<BigDecimal> wsMinForHeight = heightAndWindDirectionEnum.stream().filter(h -> h.getWsAve() != null && h.getWsAve() != 0 && h.getLayerHeight().equals(finalHeightMin)).map((ProphaseAnemometryData p) ->
|
|
|
{
|
|
|
return CalculationUtil.getBigDecimal(p.getWsAve());
|
|
@@ -296,6 +296,7 @@ public class WindDirectionStatisticsDataServiceImpl extends ServiceImpl<WindDire
|
|
|
//计算最小层高平均风速
|
|
|
BigDecimal minAvgWindSpeed = CalculationUtil.getAvgWind(wsMinForHeight);
|
|
|
BigDecimal bigDecimal = new BigDecimal(-99);
|
|
|
+
|
|
|
if (minAvgWindSpeed.compareTo(BigDecimal.ZERO) != 0) {
|
|
|
//计算风切变值
|
|
|
bigDecimal = CalculationUtil.caWindShear(avgWindSpeed, minAvgWindSpeed, new BigDecimal(height), new BigDecimal(heightMin));
|