66666688888

ipfcst/ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/entity/AccuracyPassRate.java

@@ -45,4 +45,12 @@ public class AccuracyPassRate extends AbstractBaseEntity {
     @Column
     private String ultraShortTermPassRate;
 
+    //中期准确率
+    @Column
+    private String midTermAccuracy;
+
+    //中期合格率
+    @Column
+    private String midTermPassRate;
+
 }

ipfcst/ipfcst-reportquery/src/main/frontend/views/realTimeQuery/nwpOne/charts/index.vue

@@ -281,7 +281,7 @@
           backgroundColor: 'transparent',
           title: {
             top: 20,
-            text: 'nwp一期信息',
+            text: '风电nwp',
             textStyle: {
               fontWeight: 'normal',
               fontSize: 16,

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/service/ForecastPowerUltraShortTermOneHisService.java

@@ -2,7 +2,6 @@ package com.jiayue.ipfcst.service;
 
 import com.jiayue.ipfcst.common.core.exception.BusinessException;
 import com.jiayue.ipfcst.common.data.entity.ElectricField;
-import com.jiayue.ipfcst.common.data.entity.ForecastPowerUltraShortTermHis;
 import com.jiayue.ipfcst.common.data.entity.ForecastPowerUltraShortTermOneHis;
 import com.jiayue.ipfcst.common.data.repository.ForecastPowerUltraShortTermHisRepository;
 import com.jiayue.ipfcst.common.data.repository.ForecastPowerUltraShortTermOneHisRepository;
@@ -28,13 +27,13 @@ import java.util.stream.Collectors;
 public class ForecastPowerUltraShortTermOneHisService extends BaseService {
   private final ForecastPowerUltraShortTermOneHisRepository forecastPowerUltraShortTermOneHisRepository;
 
-  private final PowerStationStatusDataService powerStationStatusDataService;
+  private final PowerStationStatusDataOneService powerStationStatusDataOneService;
   private final ElectricFieldService electricFieldService;
 
   @Autowired
-  public ForecastPowerUltraShortTermOneHisService(ForecastPowerUltraShortTermHisRepository forecastPowerUltraShortTermHisRepository, ForecastPowerUltraShortTermOneHisRepository forecastPowerUltraShortTermOneHisRepository, PowerStationStatusDataService powerStationStatusDataService, ElectricFieldService electricFieldService){
+  public ForecastPowerUltraShortTermOneHisService(ForecastPowerUltraShortTermHisRepository forecastPowerUltraShortTermHisRepository, ForecastPowerUltraShortTermOneHisRepository forecastPowerUltraShortTermOneHisRepository, PowerStationStatusDataService powerStationStatusDataService, PowerStationStatusDataOneService powerStationStatusDataOneService, ElectricFieldService electricFieldService){
     this.forecastPowerUltraShortTermOneHisRepository = forecastPowerUltraShortTermOneHisRepository;
-    this.powerStationStatusDataService = powerStationStatusDataService;
+    this.powerStationStatusDataOneService = powerStationStatusDataOneService;
     this.electricFieldService = electricFieldService;
   }
 
@@ -164,7 +163,7 @@ public class ForecastPowerUltraShortTermOneHisService extends BaseService {
       realPowerMap.put("value"+p,ableDatas);
     }
 
-    Map<String, Object> map = powerStationStatusDataService.findByTimeBetweenForContrast(new Date(startTime), new Date(endTime),900000l);
+    Map<String, Object> map = powerStationStatusDataOneService.findByTimeBetweenForContrast(new Date(startTime), new Date(endTime),900000l);
 
     ElectricField electricField = electricFieldService.get();
     map.put("value",realPowerMap);

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/service/PowerStationStatusDataOneService.java

@@ -1,7 +1,6 @@
 package com.jiayue.ipfcst.service;
 
 import com.jiayue.ipfcst.common.data.entity.ElectricField;
-import com.jiayue.ipfcst.common.data.entity.PowerStationStatusData;
 import com.jiayue.ipfcst.common.data.entity.PowerStationStatusDataOne;
 import com.jiayue.ipfcst.common.data.entity.SysParameter;
 import com.jiayue.ipfcst.common.data.repository.PowerStationStatusDataOneRepository;