修改统计入库bug

neim-biz/src/main/java/com/jiayue/biz/job/AirDensityJob.java

@@ -196,12 +196,12 @@ public class AirDensityJob {
                 //月环境数据 温湿压最大最小平均
                 ArrayList<WindTowerCalculationData> environmentData = windTowerCalculationDataService.environmentData(startMonthDate, endMonthDate, windTowerInfo.getEquipmentNo(), prophaseWeatherDataList, equipmentAttributeList);
                 dataList.addAll(environmentData);
+                // 月玫瑰图
+                windDirectionStatisticsDataService.roseMonth(startMonthDate, endMonthDate, windTowerInfo.getEquipmentNo(), prophaseAnemometryDataList, prophaseWeatherDataList, equipmentAttributeList);
 
             }
             // 统计概述
             statisticsSituationService.statisticsSituation(windTowerInfo, statisticsSituations, equipmentAttributeList);
-            // 月玫瑰图
-            windDirectionStatisticsDataService.roseMonth(startMonthDate, endMonthDate, windTowerInfo.getEquipmentNo(), prophaseAnemometryDataList, prophaseWeatherDataList, equipmentAttributeList);
             //保存
             windTowerCalculationDataService.saveBatchByEquipmentId(dataList,windTowerInfo.getEquipmentNo());
         }

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

@@ -1,7 +1,11 @@
 package com.jiayue.biz.service.impl;
 
 import com.jiayue.biz.domain.*;
+import com.jiayue.biz.mapper.ProphaseWeatherDataMapper;
+import com.jiayue.biz.service.ProphaseWeatherDataService;
 import com.jiayue.biz.service.WindTowerDataParentTableService;
+import com.jiayue.common.utils.DateUtil;
+import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -11,7 +15,9 @@ import com.jiayue.biz.service.StatisticsSituationService;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -21,25 +27,23 @@ import java.util.stream.Collectors;
  * @date 2022-08-26
  */
 @Service
+@AllArgsConstructor
 public class StatisticsSituationServiceImpl extends ServiceImpl<StatisticsSituationMapper, StatisticsSituation> implements StatisticsSituationService {
 
-    @Autowired
+
     private final WindTowerCalculationDataServiceImpl windTowerCalculationDataService;
-    @Autowired
+
     private final WindTowerDataParentTableService windTowerDataParentTableService;
 
-    public StatisticsSituationServiceImpl(WindTowerCalculationDataServiceImpl windTowerCalculationDataService, WindTowerDataParentTableService windTowerDataParentTableService) {
-        this.windTowerCalculationDataService = windTowerCalculationDataService;
-        this.windTowerDataParentTableService = windTowerDataParentTableService;
-    }
+    private final ProphaseWeatherDataService prophaseWeatherDataService;
 
     /**
      * 统计概况入库
      */
     public void statisticsSituation(WindTowerInfo windTowerInfo, List<StatisticsSituation> statisticsSituations, List<EquipmentAttribute> equipmentAttributeList) {
         try {
-            // 测风塔数据最后一条
-            WindTowerDataParentTable lastWindTowerStatusData = windTowerDataParentTableService.getLastData(windTowerInfo.getEquipmentNo());
+            // 测风塔数据起止时间
+            Map<String, Long> dataTimeStartAndEnd = prophaseWeatherDataService.getDataTimeStartAndEnd(windTowerInfo.getEquipmentNo());
             // 过滤
             List<StatisticsSituation> statisticsSituationList = statisticsSituations.stream().filter(w -> w.getEquipmentId().equals(windTowerInfo.getEquipmentNo())).collect(Collectors.toList());
             StatisticsSituation statisticsSituation = new StatisticsSituation();
@@ -54,7 +58,7 @@ public class StatisticsSituationServiceImpl extends ServiceImpl<StatisticsSituat
             WindTowerDataParentTable windTowerStatusData = windTowerDataParentTableService.getFirstData(windTowerInfo.getEquipmentNo());
             // 拼接起止时间
             if (windTowerStatusData != null) {
-                String time = windTowerStatusData.getTime().getTime() + "," + lastWindTowerStatusData.getTime().getTime();
+                String time = dataTimeStartAndEnd.get("startTime") + "," + dataTimeStartAndEnd.get("endTime");
                 statisticsSituation.setEquipmentId(windTowerInfo.getEquipmentNo());
                 statisticsSituation.setStartTimeAndEndTime(time);
                 statisticsSituation = calculationWs(statisticsSituation, windTowerInfo, equipmentAttributeList);