Merge remote-tracking branch 'origin/master'

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

@@ -361,7 +361,14 @@ public class LargeScreenController {
                     stationModelMap.put(accuracyEntry.getKey(),forecastModel);
                 }
                 else{
-                    stationModelMap.put(accuracyEntry.getKey(),"JY");
+                    SysDictData sysDictData = new SysDictData();
+                    sysDictData.setDictType("forecast_model");
+                    List<SysDictData> forecastModelList = iSysDictDataService.selectDictDataList(sysDictData);
+                    for (SysDictData sysDictData1:forecastModelList){
+                        if ("default".equals(sysDictData1.getRemark())){
+                            stationModelMap.put(accuracyEntry.getKey(),sysDictData1.getDictValue());
+                        }
+                    }
                 }
             }
         }
@@ -538,7 +545,14 @@ public class LargeScreenController {
                     stationModelMap.put(accuracyEntry.getKey(),forecastModel);
                 }
                 else{
-                    stationModelMap.put(accuracyEntry.getKey(),"JY");
+                    SysDictData sysDictData = new SysDictData();
+                    sysDictData.setDictType("forecast_model");
+                    List<SysDictData> forecastModelList = iSysDictDataService.selectDictDataList(sysDictData);
+                    for (SysDictData sysDictData1:forecastModelList){
+                        if ("default".equals(sysDictData1.getRemark())){
+                            stationModelMap.put(accuracyEntry.getKey(),sysDictData1.getDictValue());
+                        }
+                    }
                 }
             }
         }

cpp-admin/src/main/java/com/cpp/web/service/datafactory/impl/ParsingStatusServiceImpl.java

@@ -1,6 +1,7 @@
 package com.cpp.web.service.datafactory.impl;
 
 import cn.hutool.json.JSONUtil;
+import com.cpp.common.utils.spring.SpringUtils;
 import com.cpp.web.domain.datafactory.BaseParsing;
 import com.cpp.web.domain.datafactory.dto.ParsingResultDto;
 import com.cpp.web.domain.datafactory.enums.FileTypeEnum;
@@ -13,6 +14,7 @@ import com.cpp.web.utils.LogUtil;
 import com.cpp.web.utils.ParsingFileUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,11 +33,10 @@ import java.util.List;
  */
 @Service("statusParsing")
 @Slf4j
-@AllArgsConstructor
+@RequiredArgsConstructor
 @Transactional
 public class ParsingStatusServiceImpl implements ParsingInterface {
 
-    private final OverhaulPlanService overhaulPlanService;
 
     @Override
     public boolean save(BaseParsing parsingInfo) {
@@ -121,7 +122,7 @@ public class ParsingStatusServiceImpl implements ParsingInterface {
                     overhaulPlans.add(overhaulPlan);
                 }
 
-                overhaulPlanService.saveBatch(overhaulPlans);
+                SpringUtils.getBean(OverhaulPlanService.class).saveBatch(overhaulPlans);
             }
 
         }

cpp-admin/src/main/java/com/cpp/web/service/powerGeneation/impl/DayPowerGenerationServiceImpl.java

@@ -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 (null != sysDictData.getRemark() && 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);