|
@@ -49,9 +49,9 @@ public class DayPowerGenerationController {
|
|
}
|
|
}
|
|
List<DayPowerGeneration> zdCollectList = zdList.stream().filter(f -> f.getTime().equals(simpleDateFormat.format(new Date(finalI)))).collect(Collectors.toList());
|
|
List<DayPowerGeneration> zdCollectList = zdList.stream().filter(f -> f.getTime().equals(simpleDateFormat.format(new Date(finalI)))).collect(Collectors.toList());
|
|
if (zdCollectList.size() > 0){
|
|
if (zdCollectList.size() > 0){
|
|
- powerGenerationDto.setForecastPowerGenerationYd(zdCollectList.get(0).getForecastPowerGeneration());
|
|
|
|
|
|
+ powerGenerationDto.setForecastPowerGenerationZd(zdCollectList.get(0).getForecastPowerGeneration());
|
|
}else {
|
|
}else {
|
|
- powerGenerationDto.setForecastPowerGenerationYd(null);
|
|
|
|
|
|
+ powerGenerationDto.setForecastPowerGenerationZd(null);
|
|
}
|
|
}
|
|
generationDtoList.add(powerGenerationDto);
|
|
generationDtoList.add(powerGenerationDto);
|
|
}
|
|
}
|