首页对比十日曲线展示修改

cpp-admin/src/main/java/com/cpp/web/controller/largeScreen/LargeScreenController.java

@@ -657,9 +657,12 @@ public class LargeScreenController {
     public R getForecastContrast(String forecastDay, String forecastType) {
         Date dayStartTime = DateTimeUtil.getDayStartTime(System.currentTimeMillis());
         Date dayEndTime = null;
+        String dqHowLongAgo = "";
         if ("day".equals(forecastDay)) {
             // 当日
             dayEndTime = DateTimeUtil.getDayLastTime(System.currentTimeMillis());
+            // 获取短期上报
+            dqHowLongAgo = configService.selectConfigByKey("dqHowLongAgo");
         } else {
             // 包含当天的才是10天
             dayEndTime = DateUtil.offsetDay(new Date(), 9);
@@ -706,10 +709,16 @@ public class LargeScreenController {
             // 按场时间分组
             Map<Long, List<ForecastPowerUltraShortTermRegulation>> utraShortTermStationDataGroup = forecastPowerUltraShortTermStationList.stream().collect(Collectors.groupingBy(s -> s.getTime().getTime()));
 
-            // 获取短期上报
-            String dqHowLongAgo = configService.selectConfigByKey("dqHowLongAgo");
+            // 短期上报数据
             QueryWrapper dqsbWrapper = new QueryWrapper<>();
-            dqsbWrapper.eq("forecast_how_long_ago", Integer.parseInt(dqHowLongAgo));
+            if (!"".equals(dqHowLongAgo)){
+                dqsbWrapper.eq("forecast_how_long_ago", Integer.parseInt(dqHowLongAgo));
+            }
+            else{
+                // 昨日生成的上报数据
+                Date yesterdayStartTime = DateTimeUtil.getDayStartTime(DateUtil.yesterday().getTime());
+                dqsbWrapper.eq("gen_date", yesterdayStartTime);
+            }
             dqsbWrapper.between("time", dayStartTime, dayEndTime);
             dqsbWrapper.in("station_code", stationCodeList);
             List<ForecastPowerShortTermRegulation> forecastPowerShortTermRegulationList = forecastPowerShortTermRegulationService.list(dqsbWrapper);