调整手动重算顺序

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

@@ -603,7 +603,6 @@ public class DataRecalculationImpl implements DataRecalculationService {
             //获取到结束时间的当天最后时间
             endTime = DateTimeUtil.getDayLastTime(endTime.getTime());
             List<StatisticsSituation> statisticsSituations = statisticsSituationService.list();
-            List<Map<String, Object>> windTowerDataParentTableMaps = windTowerDataParentTableService.selectDataByBetweenTimeAndEquipmetId(startTime, endTime, equipmentNo);
             List<EquipmentAttribute> equipmentAttributeList = equipmentAttributeService.list();
             List<WindTowerCalculationData> windTowerCalculationDataList = windTowerCalculationDataService.getByBetweenTimeAndEquipmentId(startTime, endTime, equipmentNo);
             List<WindTowerInfo> windTowerInfoList = windTowerInfoService.getByEquipmentNo(equipmentNo);
@@ -629,6 +628,12 @@ public class DataRecalculationImpl implements DataRecalculationService {
             //日平均气压
             ArrayList<WindTowerCalculationData> paDay = windTowerCalculationDataService.paDay(startTime, endTime, equipmentNo, prophaseWeatherDataList, equipmentAttributeList);
             allDataList.addAll(paDay);
+            //日平均风速
+            ArrayList<WindTowerCalculationData> wsDay = windTowerCalculationDataService.wsDay(startTime, endTime, equipmentNo, windTowerCalculationDataList, equipmentAttributeList, windTowerInfoList);
+            allDataList.addAll(wsDay);
+            //日平均风速标差
+            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);
             allDataList.addAll(turbulenceDay);
@@ -641,12 +646,7 @@ public class DataRecalculationImpl implements DataRecalculationService {
             //日平均风切变
             ArrayList<WindTowerCalculationData> shearDay = windTowerCalculationDataService.shearDay(startTime, endTime, equipmentNo, windTowerCalculationDataList, equipmentAttributeList, windTowerInfoList);
             allDataList.addAll(shearDay);
-            //日平均风速
-            ArrayList<WindTowerCalculationData> wsDay = windTowerCalculationDataService.wsDay(startTime, endTime, equipmentNo, windTowerCalculationDataList, equipmentAttributeList, windTowerInfoList);
-            allDataList.addAll(wsDay);
-            //日平均风速标差
-            ArrayList<WindTowerCalculationData> calculationData1 = windTowerCalculationDataService.calculateStaDay(startTime, endTime, equipmentNo, prophaseAnemometryDataList, equipmentAttributeList, windTowerInfoList, windTowerCalculationDataList);
-            allDataList.addAll(calculationData1);
+
 
             List<Long> dateTime = DateTimeUtil.getIntervalTimeByMonth(DateTimeUtil.beginOfMonth(startTime), DateTimeUtil.beginOfMonth(endTime));
             for (Long l : dateTime) {

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

@@ -1532,7 +1532,7 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
                 for (long time = startHour; time < endHour; time = time + Hour) {
                     long startDate = time;
                     //过滤一天的数据
-                    List<ProphaseAnemometryData> collect = prophaseAnemometryDataList.stream().filter(p -> p.getTs().getTime() >= startDate && p.getTs().getTime() <= startDate + Hour && p.getLayerHeight().equals(h)).collect(Collectors.toList());
+                    List<ProphaseAnemometryData> collect = prophaseAnemometryDataList.stream().filter(p -> p.getTs().getTime() >= startDate && p.getTs().getTime() < startDate + Hour && p.getLayerHeight().equals(h)).collect(Collectors.toList());
                     BigDecimal staSum = CalculationUtil.getBigDecimal(collect.stream().filter(c -> c.getWsSta() != null && c.getWsSta() != 0).mapToDouble(ProphaseAnemometryData::getWsSta).sum());
                     if (collect.size() > 0) {
                         WindTowerCalculationData windTowerCalculationData = new WindTowerCalculationData();