修改湍流平均值 以及统计计算逻辑 湍流平均值取风速段14.5-15.5之间

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

@@ -635,7 +635,7 @@ public class DataRecalculationImpl implements DataRecalculationService {
             ArrayList<WindTowerCalculationData> calculationData1 = windTowerCalculationDataService.calculateStaDay(startTime, endTime, equipmentNo, prophaseAnemometryDataList, equipmentAttributeList, windTowerInfoList, windTowerCalculationDataList);
             allDataList.addAll(calculationData1);
             //日平均湍流
-            ArrayList<WindTowerCalculationData> turbulenceDay = windTowerCalculationDataService.turbulenceDay(startTime, endTime, equipmentNo, equipmentAttributeList, windTowerInfoList, windTowerCalculationDataList,prophaseAnemometryDataList);
+            ArrayList<WindTowerCalculationData> turbulenceDay = windTowerCalculationDataService.turbulenceDay(startTime, endTime, equipmentNo, equipmentAttributeList, windTowerInfoList, windTowerCalculationDataList);
             allDataList.addAll(turbulenceDay);
             //日平均空气密度
             ArrayList<WindTowerCalculationData> airDensityDay = windTowerCalculationDataService.airDensityDay(startTime, endTime, equipmentNo, prophaseWeatherDataList, equipmentAttributeList, windTowerCalculationDataList);

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

@@ -504,7 +504,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
      * @param equipmentId 场站编号
      * @return Map<String, BigDecimal>
      */
-    public Map<String, Object> getAirAndPaAndT(String projectId,String equipmentId, String month) {
+    public Map<String, Object> getAirAndPaAndT(String projectId, String equipmentId, String month) {
         List<WindTowerInfo> windTowerInfoList = windTowerInfoService.lambdaQuery().eq(WindTowerInfo::getEquipmentNo, equipmentId).list();
         String[] wdHeight = windTowerInfoList.get(0).getWdHeights().split(",");
         ProjectInfo oneProjectInfoById = projectInfoService.getOneProjectInfoById(projectId);
@@ -519,6 +519,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
         //获取去年月份开始时间
 //        Date beginTime = DateUtil.offsetMonth(DateUtil.beginOfMonth(yearDay), 1);
         Date endTime = lastDataCalculation.getTime();
+        List<ProphaseAnemometryData> prophaseAnemometryDataList = prophaseAnemometryDataService.selectWdAveAndWdAveAndWsStaForHeight(equipmentId, new Timestamp(yearDay.getTime()), new Timestamp(endTime.getTime()), maxHeight.toString());
 
         List<EquipmentAttribute> equipmentAttributeList = equipmentAttributeService.lambdaQuery().eq(EquipmentAttribute::getFieldName, "airDensityMonth").or().eq(EquipmentAttribute::getFieldName, "tAVE").or().
                 eq(EquipmentAttribute::getFieldName, "paAVE").or().eq(EquipmentAttribute::getFieldName, maxHeight + "turbulenceMonth").or().
@@ -535,20 +536,20 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
         //压强
         dataMap.put("pa", this.getDataForCalculationByEb(equipmentAttributeList, windTowerCalculationDataList, "paAVE"));
         //湍流
-        dataMap.put("turbulence", this.getDataForCalculationByEb(equipmentAttributeList, windTowerCalculationDataList, maxHeight + "turbulenceMonth"));
+        dataMap.put("turbulence",getTurTi(prophaseAnemometryDataList));
         //风切变
         dataMap.put("windShear", this.getDataForCalculationByEb(equipmentAttributeList, windTowerCalculationDataList, "windShearMonth"));
         //层高
         dataMap.put("height", maxHeight);
         //发电量
-        if(StrUtil.isNotBlank(oneProjectInfoById.getProjectBasicInfo().getTPowerGeneration())){
+        if (StrUtil.isNotBlank(oneProjectInfoById.getProjectBasicInfo().getTPowerGeneration())) {
             dataMap.put("battery", oneProjectInfoById.getProjectBasicInfo().getTPowerGeneration());
         }
         //满发小时数
-        if (StrUtil.isNotBlank(oneProjectInfoById.getProjectBasicInfo().getTAvailableHours())){
+        if (StrUtil.isNotBlank(oneProjectInfoById.getProjectBasicInfo().getTAvailableHours())) {
             dataMap.put("hour", oneProjectInfoById.getProjectBasicInfo().getTAvailableHours());
         }
-        if(StrUtil.isNotBlank(oneProjectInfoById.getProjectBasicInfo().getWd())){
+        if (StrUtil.isNotBlank(oneProjectInfoById.getProjectBasicInfo().getWd())) {
             //主风向
             dataMap.put("wdSum", oneProjectInfoById.getProjectBasicInfo().getWd());
         }
@@ -594,6 +595,9 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
         //层高排序
         List<Integer> heightList = arrayList.stream().map(s -> Integer.parseInt(CalculationUtil.getNumberFromString(s))).sorted().collect(Collectors.toList());
         Integer maxHeight = heightList.get(heightList.size() - 1);
+
+
+
         //获取最后一条记录
         WindTowerCalculationData lastDataCalculation = windTowerCalculationDataService.getLastDataCalculation(equipmentId);
 
@@ -601,7 +605,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
         //获取去年月份开始时间
 //        Date beginTime = DateUtil.offsetMonth(DateUtil.beginOfMonth(yearDay), 1);
         Date endTime = lastDataCalculation.getTime();
-
+        List<ProphaseAnemometryData> prophaseAnemometryDataList = prophaseAnemometryDataService.selectWdAveAndWdAveAndWsStaForHeight(equipmentId, new Timestamp(yearDay.getTime()), new Timestamp(endTime.getTime()), maxHeight.toString());
         List<EquipmentAttribute> equipmentAttributeList = equipmentAttributeService.lambdaQuery().eq(EquipmentAttribute::getFieldName, "airDensityMonth").or().eq(EquipmentAttribute::getFieldName, "tAVE").or().
                 eq(EquipmentAttribute::getFieldName, "paAVE").or().eq(EquipmentAttribute::getFieldName, maxHeight + "turbulenceMonth").or().
                 eq(EquipmentAttribute::getFieldName, "windShearMonth").or().eq(EquipmentAttribute::getFieldName, "batteryDay")
@@ -617,7 +621,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
         //压强
         dataMap.put("pa", this.getDataForCalculationByEb(equipmentAttributeList, windTowerCalculationDataList, "paAVE"));
         //湍流
-        dataMap.put("turbulence", this.getDataForCalculationByEb(equipmentAttributeList, windTowerCalculationDataList, maxHeight + "turbulenceMonth"));
+        dataMap.put("turbulence", getTurTi(prophaseAnemometryDataList));
         //风切变
         dataMap.put("windShear", this.getDataForCalculationByEb(equipmentAttributeList, windTowerCalculationDataList, "windShearMonth"));
         //层高
@@ -670,6 +674,15 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
 
     }
 
+    public BigDecimal getTurTi(List<ProphaseAnemometryData> prophaseAnemometryDataList) {
+        return BigDecimal.valueOf(prophaseAnemometryDataList.stream().filter(p -> p.getWsAve() != null && p.getWsAve() >= 14.5 && p.getWsAve() <= 15.5 && p.getWsSta() > 0)
+                .map(a -> {
+                    return BigDecimal.valueOf(a.getWsSta()).divide(BigDecimal.valueOf(a.getWsAve()), 2, RoundingMode.HALF_UP);
+                }).collect(Collectors.averagingDouble(BigDecimal::doubleValue))).setScale(2,RoundingMode.HALF_UP);
+
+
+    }
+
 
     //首页全省资源概述
     public HashMap<String, String> getResourcesOverview() {

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

@@ -134,7 +134,6 @@ public class ProjectProgressServiceImpl implements ProjectProgressService {
         ProjectMenusOne projectMenusOne = new ProjectMenusOne();
         ProjectMenusTow projectMenusTow = new ProjectMenusTow();
         List<List<Object>> collect = read.stream().filter(r -> r.get(0).toString().equals("一")).collect(Collectors.toList());
-        System.out.println("collect = " + collect);
         //循环每行数据
         for (List<Object> objects : read) {
             if (indexStr.contains(objects.get(0).toString())) {

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

@@ -60,6 +60,7 @@ public class RealTimeDisplayServiceImpl implements RealTimeDisplayService {
         ArrayList densityList = new ArrayList<>();
         ArrayList<HashMap<String, Object>> densityList2 = new ArrayList<>();
         ArrayList<HashMap<String, Object>> densityList3 = new ArrayList<>();
+        ArrayList<HashMap<String, Object>> densityListTi = new ArrayList<>();
         //用于遍历数据
         TreeMap<String, Object> map = new TreeMap<>();
         if (height == null || height.equals("")) {
@@ -116,18 +117,35 @@ public class RealTimeDisplayServiceImpl implements RealTimeDisplayService {
 
             ArrayList<Object> densityList1 = new ArrayList<>();
             densityList2 = new ArrayList<>();
+            BigDecimal TurCount = BigDecimal.ZERO;
+            BigDecimal TurSum = BigDecimal.ZERO;
             BigDecimal TurAve = BigDecimal.ZERO;
+            int i1 = treeMap.entrySet().size();
+            TurCount = TurCount.add(BigDecimal.valueOf(i1));
 
 
             //拼接返回给前台
             for (Map.Entry<BigDecimal, BigDecimal> o1 : treeMap.entrySet()) {
+                if(o1.getKey().compareTo(BigDecimal.valueOf(15)) == 0){
+                    HashMap<String, Object> mapTi = new HashMap<>();
+                    mapTi.put("heightTi", h);
+                    mapTi.put("TurAveTi", o1.getValue());
+                    densityListTi.add(mapTi);
+
+
+                }
                 Map<String, Object> map2 = new HashMap();
+
                 map2.put("ws", o1.getKey());
                 map2.put("tur", o1.getValue());
-                if(o1.getKey().compareTo(BigDecimal.valueOf(15)) == 0){
-                    TurAve = o1.getValue();
-                }
                 densityList1.add(map2);
+                if (o1.getValue() != null) {
+                    TurSum = TurSum.add(BigDecimal.valueOf(Double.parseDouble(o1.getValue().toString())));
+                }
+            }
+            //如果不等于0
+            if (!TurCount.equals(BigDecimal.ZERO)) {
+                TurAve = TurSum.divide(TurCount, 2, RoundingMode.HALF_UP);
             }
             //放入风速和湍流值
             map.put(h, densityList1);
@@ -151,6 +169,7 @@ public class RealTimeDisplayServiceImpl implements RealTimeDisplayService {
         densityList.add(densityList2);
 
         densityList.add(densityList3);
+        densityList.add(densityListTi);
 
         return densityList;
 

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

@@ -1604,7 +1604,7 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
      * @param equipmentId 设备id
      * @return
      */
-    public ArrayList<WindTowerCalculationData> turbulenceDay(Date startTime, Date endTime, String equipmentId, List<EquipmentAttribute> equipmentAttributeList, List<WindTowerInfo> windTowerInfoList, List<WindTowerCalculationData> windTowerCalculationDataList, List<ProphaseAnemometryData> prophaseAnemometryDataList) {
+    public ArrayList<WindTowerCalculationData> turbulenceDay(Date startTime, Date endTime, String equipmentId, List<EquipmentAttribute> equipmentAttributeList, List<WindTowerInfo> windTowerInfoList, List<WindTowerCalculationData> windTowerCalculationDataList) {
         long startHour = startTime.getTime();
         long endHour = endTime.getTime();
         long dayTime = 86400000L;
@@ -1614,29 +1614,26 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
         ArrayList<WindTowerCalculationData> list = new ArrayList<>();
         try {
             for (String h : heightAll) {
-                List<ProphaseAnemometryData> anemometryDataList = prophaseAnemometryDataList.stream().filter(p -> p.getLayerHeight().equals(h)).collect(Collectors.toList());
+
                 List<EquipmentAttribute> turList = equipmentAttributeList.stream().filter(equipmentAttribute -> equipmentAttribute.getFieldName().equals(h + turbulenceDay)).collect(Collectors.toList());
+                List<EquipmentAttribute> staList = equipmentAttributeList.stream().filter(equipmentAttribute -> equipmentAttribute.getFieldName().equals(h + staDay)).collect(Collectors.toList());
+                List<EquipmentAttribute> wsList = equipmentAttributeList.stream().filter(equipmentAttribute -> equipmentAttribute.getFieldName().equals(h + "awsDay")).collect(Collectors.toList());
 
                 removeByStartTimeBetweenAndEquipmentIdAndEbId(startTime, endTime, equipmentId, turList.get(0).getId());
                 for (long start1 = startHour; start1 < endHour; start1 = start1 + dayTime) {
-                    BigDecimal turAve = BigDecimal.ZERO;
+
                     long finalStart = start1;
-                    List<ProphaseAnemometryData> prophaseAnemometryData = anemometryDataList.stream().filter(p -> p.getTs().getTime() >= finalStart && p.getTs().getTime() < finalStart + dayTime && p.getWsAve() != null && p.getWsAve() >= 14.5 && p.getWsAve() <= 15.5 && p.getWsSta() != null && p.getWsSta() > 0).collect(Collectors.toList());
-                    if (prophaseAnemometryData.size() > 0) {
-                        BigDecimal turSum = BigDecimal.ZERO;
-                        for (ProphaseAnemometryData prophaseAnemometryDatum : prophaseAnemometryData) {
-                            turSum = turSum.add(CalculationUtil.caTurbulenceIntensity(BigDecimal.valueOf(prophaseAnemometryDatum.getWsSta()), BigDecimal.valueOf(prophaseAnemometryDatum.getWsAve())));
-                        }
-                        turAve = turSum.divide(BigDecimal.valueOf(prophaseAnemometryData.size()), 2, RoundingMode.HALF_UP);
-                    }
-                    if (anemometryDataList.size() > 0) {
+                    List<WindTowerCalculationData> staDay = windTowerCalculationDataList.stream().filter(w -> w.getEbId().equals(staList.get(0).getId()) && w.getTime().getTime() == finalStart).collect(Collectors.toList());
+                    List<WindTowerCalculationData> wsDay = windTowerCalculationDataList.stream().filter(w -> w.getEbId().equals(wsList.get(0).getId()) && w.getTime().getTime() == finalStart).collect(Collectors.toList());
+
+                    if (!staDay.isEmpty() && !wsDay.isEmpty()) {
 
                         //数据入库
                         WindTowerCalculationData windTowerCalculationData = new WindTowerCalculationData();
                         windTowerCalculationData.setTime(new Date(start1));
                         windTowerCalculationData.setEbId(turList.get(0).getId());
                         windTowerCalculationData.setEquipmentId(equipmentId);
-                        windTowerCalculationData.setValue(turAve);
+                        windTowerCalculationData.setValue(CalculationUtil.caTurbulenceIntensity(staDay.get(0).getValue(), wsDay.get(0).getValue()));
                         windTowerCalculationDataList.add(windTowerCalculationData);
                         list.add(windTowerCalculationData);
                     } else {
@@ -1655,6 +1652,7 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
         return list;
     }
 
+
     /**
      * 月平均湍流
      *
@@ -1683,23 +1681,17 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
                 //获取所有日平均湍流风速
                 List<WindTowerCalculationData> windTowerCalculationDatas = windTowerCalculationDataList1.stream().filter(w -> w.getEbId().equals(ebIdDay) && w.getTime().after(startHour) && w.getTime().before(endTime) && w.getEquipmentId().equals(equipmentId)).collect(Collectors.toList());
                 BigDecimal sum = new BigDecimal(0);
-                BigDecimal total = new BigDecimal(0);
-                BigDecimal turMonth = new BigDecimal(0);
+
                 for (WindTowerCalculationData w : windTowerCalculationDatas) {
-                    if (w.getValue().compareTo(BigDecimal.ZERO) > 0) {
-                        sum = sum.add(w.getValue());
-                        total = total.add(BigDecimal.ONE);
-                    }
-                }
-                if (total.compareTo(BigDecimal.ZERO) > 0) {
-                    turMonth = sum.divide(total, 2, RoundingMode.HALF_UP);
+                    sum = sum.add(w.getValue());
                 }
+
                 if (!windTowerCalculationDatas.isEmpty()) {
                     WindTowerCalculationData windTowerCalculationData = new WindTowerCalculationData();
                     windTowerCalculationData.setEbId(ebIdMonth);
                     windTowerCalculationData.setTime(startTime);
                     windTowerCalculationData.setEquipmentId(equipmentId);
-                    windTowerCalculationData.setValue(turMonth);
+                    windTowerCalculationData.setValue(sum.divide(new BigDecimal(windTowerCalculationDatas.size()), 2, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP));
                     list.add(windTowerCalculationData);
                 } else {
                     log.info("设备编号{}，{}月，{}米层高月平均湍流计算失败，缺少数据^ ^", equipmentId, startTime.getMonth() + 1, h);
@@ -2510,16 +2502,14 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
                     long endHour = time + hour;
                     //筛选小时数据
 //                    List<Map<String, Object>> collect = mapList.stream().filter(w -> Long.parseLong(w.get("time").toString()) >= startHour && Long.parseLong(w.get("time").toString()) <= endHour && w.get("equipment_id").equals(equipmentId)).collect(Collectors.toList());
-                    List<ProphaseAnemometryData> anemometryDataList = prophaseAnemometryDataList.stream().filter(p -> p.getTs().getTime() >= startHour && p.getTs().getTime() <= endHour && p.getLayerHeight().equals(h)
-                            && p.getWsAve() != null && p.getWsAve() > 0
-                            && p.getWsSta() != null && p.getWsSta() > 0).collect(Collectors.toList());
+                    List<ProphaseAnemometryData> anemometryDataList = prophaseAnemometryDataList.stream().filter(p -> p.getTs().getTime() >= startHour && p.getTs().getTime() <= endHour && p.getLayerHeight().equals(h)).collect(Collectors.toList());
 
-                    BigDecimal turAve = BigDecimal.ZERO;
-                    List<ProphaseAnemometryData> prophaseAnemometryData = anemometryDataList.stream().filter(a -> a.getWsAve() >= 14.5 && a.getWsAve() <= 15.5).collect(Collectors.toList());
-                    if (prophaseAnemometryData.size() > 0) {
+
+                    if (anemometryDataList.size() > 0) {
+                        BigDecimal turAve = BigDecimal.ZERO;
                         //循环实时数据计算总风速和标差
-                        BigDecimal wsSun = CalculationUtil.getBigDecimal(anemometryDataList.stream().mapToDouble(ProphaseAnemometryData::getWsAve).sum());
-                        BigDecimal staSun = CalculationUtil.getBigDecimal(anemometryDataList.stream().mapToDouble(ProphaseAnemometryData::getWsSta).sum());
+                        BigDecimal wsSun = CalculationUtil.getBigDecimal(anemometryDataList.stream().filter(a -> a.getWsAve() != null).mapToDouble(ProphaseAnemometryData::getWsAve).sum());
+                        BigDecimal staSun = CalculationUtil.getBigDecimal(anemometryDataList.stream().filter(a -> a.getWsSta() != null).mapToDouble(ProphaseAnemometryData::getWsSta).sum());
                         //除以一小时的个数 求小时的平均值
                         BigDecimal wsAve = wsSun.divide(BigDecimal.valueOf(anemometryDataList.size()), 2, RoundingMode.HALF_UP);
                         BigDecimal staAve = staSun.divide(BigDecimal.valueOf(anemometryDataList.size()), 2, RoundingMode.HALF_UP);
@@ -2528,8 +2518,6 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
                             continue;
                         }
                         turAve = staAve.divide(wsAve, 2, RoundingMode.HALF_UP);
-                    }
-                    if (anemometryDataList.size() > 0) {
                         //判断map中是否存在此小时的key 如果存在就把数值相加 个数加一
                         if (timeAndTurMap.get(new Date(startHour).getHours()) != null) {
 
@@ -2537,16 +2525,14 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
                             BigDecimal total = totalAndTurMap.get(new Date(startHour).getHours()).add(BigDecimal.ONE);
 
                             timeAndTurMap.put(new Date(startHour).getHours(), Average);
-                            if (turAve.compareTo(BigDecimal.ZERO) != 0) {
-                                totalAndTurMap.put(new Date(startHour).getHours(), total);
-                            }
+                            totalAndTurMap.put(new Date(startHour).getHours(), total);
                         } else {
                             //如果map中不存在这个key则直接把平均值加入 个数加一
                             timeAndTurMap.put(new Date(startHour).getHours(), turAve);
                             totalAndTurMap.put(new Date(startHour).getHours(), BigDecimal.ONE);
                         }
-
                     }
+
                 }
                 if (!timeAndTurMap.entrySet().isEmpty()) {
                     SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMMdd");
@@ -2576,6 +2562,7 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
     }
 
 
+
     /**
      * 空气密度月逐时入库
      *

neim-ui/src/views/windResources/turIntensity/index.vue

@@ -45,6 +45,9 @@
         <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
           <el-tab-pane label="湍流曲线" name="first">
             <div class="avgTextDiv">
+              <div v-html="avgTiText"/>
+            </div>
+            <div class="avgTextDiv">
               <div v-html="avgText"/>
             </div>
             <div id="tunInChart"/>
@@ -73,6 +76,7 @@ export default {
       startDateAndEndDate: [],
       turData: [],
       avgText: '',//平均值文字
+      avgTiText: '',//平均值文字
       tunInChart: null,
       turAve: '',
       activeName: 'first',
@@ -151,13 +155,21 @@ export default {
       turbulenceWindTowerStatusInfo(param).then(res => {
         //平均值
         let data = res.rows[1]
+        let dataTi = res.rows[2]
         this.avgText = ''
+        this.avgTiText = '<span style="color: #1c84c6;font-weight: bold">15m/s时湍流强度(TI15):</span>'
         for (let i = 0; i < data.length; i++) {
           this.avgText += ' <span style="color: #1c84c6;font-weight: bold">' + data[i].height + 'm平均值：</span>' + '<span style="color: #1ab394">' + data[i].TurAve + '</span>' + '，'
         }
+        for (let i = 0; i < dataTi.length; i++) {
+          this.avgTiText += ' <span style="color: #1c84c6;font-weight: bold">' + dataTi[i].heightTi + 'm：</span>' + '<span style="color: #1ab394">' + dataTi[i].TurAveTi + '</span>' + '，'
+        }
         if (this.avgText != '') {
           this.avgText = this.avgText.slice(0, this.avgText.length - 1)
         }
+        if (this.avgTiText != '') {
+          this.avgTiText = this.avgTiText.slice(0, this.avgTiText.length - 1)
+        }
         //曲线
         this.turData = res.rows[0]
         // 降序排序