pdf 风切变

wrdep-biz/src/main/java/com/jiayue/biz/service/impl/PdfServiceImpl.java

@@ -1016,7 +1016,7 @@ public class PdfServiceImpl extends ServiceImpl<WindTowerDataParentTableMapper,
             List<BigDecimal> minHeightForWsList = prophaseAnemometryData.stream().filter(p -> p.getLayerHeight().equals(mixHeight)).map(p -> {
                 return CalculationUtil.getBigDecimal(p.getWsAve());
             }).collect(Collectors.toList());
-            BigDecimal wsAveForMax = CalculationUtil.getAvgWind(minHeightForWsList);
+            BigDecimal wsAveForMin = CalculationUtil.getAvgWind(minHeightForWsList);
             //筛选高层高
             List<String> heightList = new ArrayList<>(Arrays.asList(heights)).stream().filter(s -> Integer.valueOf(CalculationUtil.getNumberFromString(mixHeight)) < Integer.valueOf(CalculationUtil.getNumberFromString(s))).collect(Collectors.toList());
             for (String maxHeight : heightList) {
@@ -1026,11 +1026,11 @@ public class PdfServiceImpl extends ServiceImpl<WindTowerDataParentTableMapper,
                 List<BigDecimal> maxHeightForWsList = prophaseAnemometryData.stream().filter(p -> p.getLayerHeight().equals(maxHeight)).map(p -> {
                     return CalculationUtil.getBigDecimal(p.getWsAve());
                 }).collect(Collectors.toList());
-                BigDecimal wsAveMin = CalculationUtil.getAvgWind(maxHeightForWsList);
+                BigDecimal wsAveMax = CalculationUtil.getAvgWind(maxHeightForWsList);
                 double z = new BigDecimal(CalculationUtil.getNumberFromString(maxHeight)).divide(new BigDecimal(CalculationUtil.getNumberFromString(mixHeight)), 8, RoundingMode.HALF_UP).doubleValue();
                 double z1 = Math.log10(z);
-                if (wsAveForMax.compareTo(BigDecimal.ZERO) > 0 && wsAveMin.compareTo(BigDecimal.ZERO) > 0 && z1 != 0) {
-                    BigDecimal shear = Convert.toBigDecimal(Math.log10(Convert.toDouble(wsAveForMax.divide(wsAveMin, 8, RoundingMode.HALF_UP))))
+                if (wsAveForMin.compareTo(BigDecimal.ZERO) > 0 && wsAveMax.compareTo(BigDecimal.ZERO) > 0 && z1 != 0) {
+                    BigDecimal shear = Convert.toBigDecimal(Math.log10(Convert.toDouble(wsAveMax.divide(wsAveForMin, 8, RoundingMode.HALF_UP))))
                             .divide(BigDecimal.valueOf(z1), 2, RoundingMode.HALF_UP);
                     mainData.put(maxHeight, shear);