|
|
@@ -3,7 +3,9 @@ package com.cpp.web.service.powerGeneation.impl;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import com.cpp.common.core.domain.entity.SysDictData;
|
|
|
import com.cpp.common.utils.DateUtils;
|
|
|
+import com.cpp.common.utils.DictUtils;
|
|
|
import com.cpp.web.domain.BaseCppEntity;
|
|
|
import com.cpp.web.domain.accuracy.AccuracyPassRate;
|
|
|
import com.cpp.web.domain.cloud.ForecastPowerShortTermCloud;
|
|
|
@@ -11,6 +13,7 @@ import com.cpp.web.domain.enums.DataSourcesEnum;
|
|
|
import com.cpp.web.domain.powerGeneration.DayPowerGeneration;
|
|
|
import com.cpp.web.domain.station.ForecastPowerShortTermRegulation;
|
|
|
import com.cpp.web.domain.station.ForecastPowerShortTermStation;
|
|
|
+import com.cpp.web.dto.TableColumn;
|
|
|
import com.cpp.web.mapper.powerGeneration.DayPowerGenerationMapper;
|
|
|
import com.cpp.web.service.accuracy.AccuracyPassRateService;
|
|
|
import com.cpp.web.service.cloud.ForecastPowerShortTermCloudService;
|
|
|
@@ -94,8 +97,16 @@ public class DayPowerGenerationServiceImpl extends ServiceImpl<DayPowerGeneratio
|
|
|
));
|
|
|
// 找出平均值最大的那一组
|
|
|
Optional<Map.Entry<String, Double>> maxAverageEntry = averageByCategory.entrySet().stream().max(Map.Entry.comparingByValue());
|
|
|
+
|
|
|
+ // 查询默认模型数据
|
|
|
+ String defaultModel = null;
|
|
|
+ for (SysDictData sysDictData : DictUtils.getDictCache("forecast_model")) {
|
|
|
+ if (sysDictData.getRemark().equals("default")){
|
|
|
+ defaultModel = sysDictData.getDictValue();
|
|
|
+ }
|
|
|
+ }
|
|
|
// 获取模型
|
|
|
- forecastModel = maxAverageEntry.isPresent() ? maxAverageEntry.get().getKey() : "JY" ;
|
|
|
+ forecastModel = maxAverageEntry.isPresent() ? maxAverageEntry.get().getKey() : defaultModel ;
|
|
|
}
|
|
|
|
|
|
Date startTime = DateTimeUtil.getDayStartTime(System.currentTimeMillis() + 24 * 60 * 60 * 1000L);
|
fanxiaoyu