站端历史数据查询超短期数据展示上报的

cpp-admin/src/main/java/com/cpp/web/controller/stationDataQuery/PowerStationStatusDataController.java

@@ -45,7 +45,7 @@ public class PowerStationStatusDataController {
     @ApiOperation(value = "通过条件查询", notes = "通过条件查询")
     @GetMapping("/queryDays")
     public R queryDays() {
-        String queryDays = configService.selectConfigByKey("queryDays");
+        String queryDays = configService.selectConfigByKey("require_dq_day");
         if (StrUtil.isBlankIfStr(queryDays)){
             queryDays = "10";
         }

cpp-admin/src/main/java/com/cpp/web/service/station/impl/PowerStationStatusDataServiceImpl.java

@@ -35,8 +35,7 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor
 public class PowerStationStatusDataServiceImpl extends ServiceImpl<PowerStationStatusDataMapper, PowerStationStatusData> implements PowerStationStatusDataService {
-    private final ForecastPowerUltraShortTermStationService forecastPowerUltraShortTermStationService;
-    private final ForecastPowerUltraShortTermCloudService forecastPowerUltraShortTermCloudService;
+    private final ForecastPowerUltraShortTermRegulationService forecastPowerUltraShortTermRegulationService;
     private final ForecastPowerShortTermCloudService forecastPowerShortTermCloudService;
     private final ElectricFieldService electricFieldService;
     private final ForecastPowerShortTermStationService forecastPowerShortTermStationService;
@@ -151,7 +150,7 @@ public class PowerStationStatusDataServiceImpl extends ServiceImpl<PowerStationS
         headList.add(llglHeadMap);
         Map<String, String> cdqysHeadMap = new HashMap<>();
         cdqysHeadMap.put("field", "cdqys");
-        cdqysHeadMap.put("label", "超短期(MW)");
+        cdqysHeadMap.put("label", "超短期上报(MW)");
         headList.add(cdqysHeadMap);
         Map<String, String> dqysHeadMap = new HashMap<>();
         dqysHeadMap.put("field", "dqys");
@@ -197,16 +196,16 @@ public class PowerStationStatusDataServiceImpl extends ServiceImpl<PowerStationS
         for (ForecastPowerShortTermStation forecastPowerShortTermStation : forecastPowerShortTermStationList) {
             dqysMap.put(forecastPowerShortTermStation.getTime().getTime(), forecastPowerShortTermStation);
         }
-        // 获取超短期原始曲线
-        Map<Long, ForecastPowerUltraShortTermStation> cdqysMap = new HashMap<>();
+        // 获取超短期上报曲线
+        Map<Long, ForecastPowerUltraShortTermRegulation> cdqysMap = new HashMap<>();
         String cdqHowLongAgo = configService.selectConfigByKey("cdqHowLongAgo");
         QueryWrapper cdqysWrapper = new QueryWrapper<>();
         cdqysWrapper.eq("forecast_how_long_ago", Integer.parseInt(cdqHowLongAgo));
         cdqysWrapper.eq("station_code", stationCode);
         cdqysWrapper.between("time", new Date(startTime), new Date(endTime));
-        List<ForecastPowerUltraShortTermStation> forecastPowerUltraShortTermStationList = forecastPowerUltraShortTermStationService.list(cdqysWrapper);
-        for (ForecastPowerUltraShortTermStation forecastPowerUltraShortTermStation : forecastPowerUltraShortTermStationList) {
-            cdqysMap.put(forecastPowerUltraShortTermStation.getTime().getTime(), forecastPowerUltraShortTermStation);
+        List<ForecastPowerUltraShortTermRegulation> forecastPowerUltraShortTermRegulationList = forecastPowerUltraShortTermRegulationService.list(cdqysWrapper);
+        for (ForecastPowerUltraShortTermRegulation forecastPowerUltraShortTermRegulation : forecastPowerUltraShortTermRegulationList) {
+            cdqysMap.put(forecastPowerUltraShortTermRegulation.getTime().getTime(), forecastPowerUltraShortTermRegulation);
         }
         // 获取短期上报曲线
         Map<Long, ForecastPowerShortTermRegulation> dqsbMap = new HashMap<>();
@@ -301,15 +300,15 @@ public class PowerStationStatusDataServiceImpl extends ServiceImpl<PowerStationS
                 kyList.add(null);
                 llList.add(null);
             }
-            // 封装超短期原始曲线list
+            // 封装超短期上报曲线list
             if (cdqysMap.get(tempDateTime) != null) {
-                ForecastPowerUltraShortTermStation forecastPowerUltraShortTermStation = cdqysMap.get(tempDateTime);
-                if (forecastPowerUltraShortTermStation.getFpValue().compareTo(new BigDecimal("-99")) == 0) {
+                ForecastPowerUltraShortTermRegulation forecastPowerUltraShortTermRegulation = cdqysMap.get(tempDateTime);
+                if (forecastPowerUltraShortTermRegulation.getFpValue().compareTo(new BigDecimal("-99")) == 0) {
                     cdqysList.add(null);
                     map1.put("cdqys", null);
                 } else {
-                    cdqysList.add(forecastPowerUltraShortTermStation.getFpValue().toString());
-                    map1.put("cdqys", forecastPowerUltraShortTermStation.getFpValue().toString());
+                    cdqysList.add(forecastPowerUltraShortTermRegulation.getFpValue().toString());
+                    map1.put("cdqys", forecastPowerUltraShortTermRegulation.getFpValue().toString());
                 }
             } else {
                 cdqysList.add(null);
@@ -387,7 +386,7 @@ public class PowerStationStatusDataServiceImpl extends ServiceImpl<PowerStationS
         zhMap.put("实际功率", sjList);
         zhMap.put("可用功率", kyList);
         zhMap.put("理论功率", llList);
-        zhMap.put("超短期", cdqysList);
+        zhMap.put("超短期上报", cdqysList);
         zhMap.put("短期原始", dqysList);
         zhMap.put("短期调控", dqzxList);
         zhMap.put("短期上报", dqsbList);