Browse Source

预测功率相关实体结构结构调整,检修方法删除重写

tl 8 months ago
parent
commit
a829158be6

+ 62 - 0
cpp-admin/src/main/java/com/cpp/web/domain/BaseForecastEntity.java

@@ -0,0 +1,62 @@
+package com.cpp.web.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.Digits;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 预测功率基类
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BaseForecastEntity extends BaseCppEntity {
+
+
+    /**
+     * 预测时间
+     */
+    @ApiModelProperty(value = "预测值时间")
+    private Date time;
+
+
+    /**
+     * 预测数据
+     */
+    @ApiModelProperty(value = "预测数据")
+    @Digits(integer = 10, fraction = 2)
+    private BigDecimal fpValue = new BigDecimal(-99);
+
+
+    /**
+     * 预测模型
+     */
+    @ApiModelProperty(value = "预测模型")
+    private String forecastModel;
+
+
+    /**
+     * 提前多久预测
+     */
+    @ApiModelProperty(value = "提前多久预测")
+    private Integer forecastHowLongAgo;
+
+
+    /**
+     * 开机容量
+     */
+    @ApiModelProperty(value = "开机容量")
+    private BigDecimal openCapacity = new BigDecimal(-99);
+
+
+    /**
+     * 装机容量
+     */
+    @ApiModelProperty(value = "装机容量")
+    @Digits(integer = 10, fraction = 2)
+    private BigDecimal capacity = new BigDecimal(-99);
+
+}

+ 2 - 44
cpp-admin/src/main/java/com/cpp/web/domain/cloud/ForecastPowerShortTermCloud.java

@@ -2,6 +2,7 @@ package com.cpp.web.domain.cloud;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cpp.web.domain.BaseCppEntity;
+import com.cpp.web.domain.BaseForecastEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -22,52 +23,9 @@ import javax.validation.constraints.Digits;
 @TableName("cpp_forecast_power_short_term_cloud")
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "cpp_forecast_power_short_term_cloud")
-public class ForecastPowerShortTermCloud extends BaseCppEntity {
+public class ForecastPowerShortTermCloud extends BaseForecastEntity {
 
 
-    /**
-     * 预测时间
-     */
-    @ApiModelProperty(value = "预测值时间")
-    private Date time;
-
-
-    /**
-     * 预测数据
-     */
-    @ApiModelProperty(value = "预测数据")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal fpValue = new BigDecimal(-99);
-
-
-    /**
-     * 预测模型
-     */
-    @ApiModelProperty(value = "预测模型")
-    private String forecastModel;
-
-
-    /**
-     * 提前多久预测
-     */
-    @ApiModelProperty(value = "提前多久预测")
-    private Integer forecastHowLongAgo;
-
-
-    /**
-     * 开机容量
-     */
-    @ApiModelProperty(value = "开机容量")
-    private BigDecimal openCapacity = new BigDecimal(-99);
-
-
-    /**
-     * 装机容量
-     */
-    @ApiModelProperty(value = "装机容量")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal capacity = new BigDecimal(-99);
-
 
 
 }

+ 2 - 42
cpp-admin/src/main/java/com/cpp/web/domain/cloud/ForecastPowerUltraShortTermCloud.java

@@ -2,6 +2,7 @@ package com.cpp.web.domain.cloud;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cpp.web.domain.BaseCppEntity;
+import com.cpp.web.domain.BaseForecastEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -22,49 +23,8 @@ import javax.validation.constraints.Digits;
 @TableName("cpp_forecast_power_ultra_short_term_cloud")
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "cpp_forecast_power_ultra_short_term_cloud")
-public class ForecastPowerUltraShortTermCloud extends BaseCppEntity {
+public class ForecastPowerUltraShortTermCloud extends BaseForecastEntity {
 
 
 
-    /**
-     * 预测模型
-     */
-    @ApiModelProperty(value = "预测模型")
-    private String forecastModel;
-
-    /**
-     * 预测值时间
-     */
-    @ApiModelProperty(value = "预测值时间")
-    private Date time;
-
-
-    /**
-     * 预测数据
-     */
-    @ApiModelProperty(value = "预测数据")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal fpValue = new BigDecimal(-99);
-
-    /**
-     * 开机容量
-     */
-    @ApiModelProperty(value = "开机容量")
-    private BigDecimal openCapacity = new BigDecimal(-99);
-
-
-    /**
-     * 装机容量
-     */
-    @ApiModelProperty(value = "装机容量")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal capacity = new BigDecimal(-99);
-
-
-    /**
-     * 提前多久预测
-     */
-    @ApiModelProperty(value = "提前多久预测")
-    private Integer forecastHowLongAgo;
-
 }

+ 2 - 36
cpp-admin/src/main/java/com/cpp/web/domain/station/ForecastPowerShortTermRegulation.java

@@ -2,6 +2,7 @@ package com.cpp.web.domain.station;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cpp.web.domain.BaseCppEntity;
+import com.cpp.web.domain.BaseForecastEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,44 +22,9 @@ import java.util.Date;
 @TableName("cpp_forecast_power_short_term_regulation")
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "cpp_forecast_power_short_term_regulation")
-public class ForecastPowerShortTermRegulation extends BaseCppEntity {
+public class ForecastPowerShortTermRegulation extends BaseForecastEntity {
 
 
-    /**
-     * 预测时间
-     */
-    @ApiModelProperty(value = "预测值时间")
-    private Date time;
-
-
-    /**
-     * 预测功率
-     */
-    @ApiModelProperty(value = "预测功率")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal fpValue = new BigDecimal(-99);
-
-    /**
-     * 开机容量
-     */
-    @ApiModelProperty(value = "开机容量")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal openCapacity = new BigDecimal(-99);
-
-
-    /**
-     * 装机容量
-     */
-    @ApiModelProperty(value = "装机容量")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal capacity = new BigDecimal(-99);
-
-
-    /**
-     * 提前多久预测
-     */
-    @ApiModelProperty(value = "提前多久预测")
-    private Integer forecastHowLongAgo;
 
 
 }

+ 2 - 37
cpp-admin/src/main/java/com/cpp/web/domain/station/ForecastPowerShortTermSend.java

@@ -2,6 +2,7 @@ package com.cpp.web.domain.station;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cpp.web.domain.BaseCppEntity;
+import com.cpp.web.domain.BaseForecastEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,44 +22,8 @@ import java.util.Date;
 @TableName("cpp_forecast_power_short_term_send")
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "cpp_forecast_power_short_term_send")
-public class ForecastPowerShortTermSend extends BaseCppEntity {
+public class ForecastPowerShortTermSend extends BaseForecastEntity {
 
 
-    /**
-     * 预测时间
-     */
-    @ApiModelProperty(value = "预测值时间")
-    private Date time;
-
-
-    /**
-     * 预测功率
-     */
-    @ApiModelProperty(value = "预测功率")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal fpValue = new BigDecimal(-99);
-
-    /**
-     * 开机容量
-     */
-    @ApiModelProperty(value = "开机容量")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal openCapacity = new BigDecimal(-99);
-
-
-    /**
-     * 装机容量
-     */
-    @ApiModelProperty(value = "装机容量")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal capacity = new BigDecimal(-99);
-
-
-    /**
-     * 提前多久预测
-     */
-    @ApiModelProperty(value = "提前多久预测")
-    private Integer forecastHowLongAgo;
-
 
 }

+ 2 - 33
cpp-admin/src/main/java/com/cpp/web/domain/station/ForecastPowerShortTermStation.java

@@ -2,6 +2,7 @@ package com.cpp.web.domain.station;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cpp.web.domain.BaseCppEntity;
+import com.cpp.web.domain.BaseForecastEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,14 +22,9 @@ import java.util.Date;
 @TableName("cpp_forecast_power_short_term_station")
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "cpp_forecast_power_short_term_station")
-public class ForecastPowerShortTermStation extends BaseCppEntity {
+public class ForecastPowerShortTermStation extends BaseForecastEntity {
 
 
-    /**
-     * 预测时间
-     */
-    @ApiModelProperty(value = "预测值时间")
-    private Date time;
 
     /**
      * 生成日期
@@ -36,34 +32,7 @@ public class ForecastPowerShortTermStation extends BaseCppEntity {
     @ApiModelProperty(value = "生成日期")
     private Date genDate;
 
-    /**
-     * 预测功率
-     */
-    @ApiModelProperty(value = "预测功率")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal fpValue = new BigDecimal(-99);
-
-    /**
-     * 开机容量
-     */
-    @ApiModelProperty(value = "开机容量")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal openCapacity = new BigDecimal(-99);
-
-
-    /**
-     * 装机容量
-     */
-    @ApiModelProperty(value = "装机容量")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal capacity = new BigDecimal(-99);
 
 
-    /**
-     * 提前多久预测
-     */
-    @ApiModelProperty(value = "提前多久预测")
-    private Integer forecastHowLongAgo;
-
 
 }

+ 2 - 36
cpp-admin/src/main/java/com/cpp/web/domain/station/ForecastPowerUltraShortTermRegulation.java

@@ -2,6 +2,7 @@ package com.cpp.web.domain.station;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cpp.web.domain.BaseCppEntity;
+import com.cpp.web.domain.BaseForecastEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,40 +22,5 @@ import java.util.Date;
 @TableName("cpp_forecast_power_ultra_short_term_regulation")
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "cpp_forecast_power_ultra_short_term_regulation")
-public class ForecastPowerUltraShortTermRegulation extends BaseCppEntity {
-
-    /**
-     * 预测时间
-     */
-    @ApiModelProperty(value = "预测值时间")
-    private Date time;
-
-    /**
-     * 预测功率
-     */
-    @ApiModelProperty(value = "预测功率")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal fpValue = new BigDecimal(-99);
-
-    /**
-     * 开机容量
-     */
-    @ApiModelProperty(value = "开机容量")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal openCapacity = new BigDecimal(-99);
-
-//
-//    /**
-//     * 装机容量
-//     */
-//    @ApiModelProperty(value = "装机容量")
-//    @Digits(integer = 10, fraction = 2)
-//    private BigDecimal capacity = new BigDecimal(-99);
-//
-
-    /**
-     * 提前多久预测
-     */
-    @ApiModelProperty(value = "提前多久预测")
-    private Integer forecastHowLongAgo;
+public class ForecastPowerUltraShortTermRegulation extends BaseForecastEntity {
 }

+ 2 - 34
cpp-admin/src/main/java/com/cpp/web/domain/station/ForecastPowerUltraShortTermStation.java

@@ -2,6 +2,7 @@ package com.cpp.web.domain.station;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cpp.web.domain.BaseCppEntity;
+import com.cpp.web.domain.BaseForecastEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,20 +22,7 @@ import java.util.Date;
 @TableName("cpp_forecast_power_ultra_short_term_station")
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "cpp_forecast_power_ultra_short_term_station")
-public class ForecastPowerUltraShortTermStation extends BaseCppEntity {
-
-    /**
-     * 预测时间
-     */
-    @ApiModelProperty(value = "预测值时间")
-    private Date time;
-
-    /**
-     * 预测功率
-     */
-    @ApiModelProperty(value = "预测功率")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal fpValue = new BigDecimal(-99);
+public class ForecastPowerUltraShortTermStation extends BaseForecastEntity {
 
     /**
      * 生成时间
@@ -42,24 +30,4 @@ public class ForecastPowerUltraShortTermStation extends BaseCppEntity {
     @ApiModelProperty(value = "生成时间")
     private Date genTime;
 
-    /**
-     * 开机容量
-     */
-    @ApiModelProperty(value = "开机容量")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal openCapacity = new BigDecimal(-99);
-
-//
-//    /**
-//     * 装机容量
-//     */
-//    @ApiModelProperty(value = "装机容量")
-//    @Digits(integer = 10, fraction = 2)
-//    private BigDecimal capacity = new BigDecimal(-99);
-
-    /**
-     * 提前多久预测
-     */
-    @ApiModelProperty(value = "提前多久预测")
-    private Integer forecastHowLongAgo;
 }

+ 13 - 10
cpp-admin/src/main/java/com/cpp/web/service/cloud/CloudFileParsing.java

@@ -1,6 +1,7 @@
 package com.cpp.web.service.cloud;
 
 import com.cpp.common.utils.StringUtils;
+import com.cpp.web.domain.BaseForecastEntity;
 import com.cpp.web.domain.cloud.ForecastPowerShortTermCloud;
 import com.cpp.web.domain.cloud.NwpCloud;
 import com.cpp.web.domain.datafactory.ParsingLog;
@@ -110,22 +111,24 @@ public class CloudFileParsing {
                         try {
                             parsingLog.setFileType(FileTypeEnum.dq);
                             // 解析短期文件
-                            List<ForecastPowerShortTermCloud> listDq = fileAnalysisShortTerm(file, new Date(currentDate));
+                            List<BaseForecastEntity> listDq = new ArrayList<>();
+                            listDq.addAll(fileAnalysisShortTerm(file, new Date(currentDate)));
                             if (!listDq.isEmpty()) {
                                 try {
-                                    parsingLog.setStationCode(listDq.get(0).getStationCode());
-                                    forecastPowerShortTermCloudService.saveBatch(listDq);
+                                    String stationCode = listDq.get(0).getStationCode();
+                                    parsingLog.setStationCode(stationCode);
+                                    forecastPowerShortTermCloudService.saveBatch(overhaulPlanService.getCorrectionData(listDq, FileTypeEnum.dq.name(), fileName, stationCode));
                                     flag = true;
                                 } catch (Exception e) {
                                     log.error("保存短期数据报错:" + fileName, e);
                                     parsingLog.setParsingDescribe("保存短期数据报错:" + fileName);
-                                    LogUtil.info(DataSourcesEnum.E2, AlarmEnum.E4,"保存短期数据报错:" + fileName,null);
+                                    LogUtil.info(DataSourcesEnum.E2, AlarmEnum.E4, "保存短期数据报错:" + fileName, null);
                                     flag = false;
                                 }
                             } else {
                                 log.info(file.getName() + "文件数据内容为空、不能正常解析 、移除该文件:" + fileName);
                                 parsingLog.setParsingDescribe("文件数据内容为空、不能正常解析 、移除该文件:" + fileName);
-                                LogUtil.info(DataSourcesEnum.E2, AlarmEnum.E4,"文件数据内容为空、不能正常解析 、移除该文件::" + fileName,null);
+                                LogUtil.info(DataSourcesEnum.E2, AlarmEnum.E4, "文件数据内容为空、不能正常解析 、移除该文件::" + fileName, null);
                                 flag = false;
                             }
 
@@ -133,7 +136,7 @@ public class CloudFileParsing {
                         } catch (Exception e) {
                             flag = false;
                             parsingLog.setParsingDescribe("解析DQ文件异常:" + fileName);
-                            LogUtil.info(DataSourcesEnum.E2, AlarmEnum.E4,"解析DQ文件失败:" + fileName,null);
+                            LogUtil.info(DataSourcesEnum.E2, AlarmEnum.E4, "解析DQ文件失败:" + fileName, null);
                             log.error("解析DQ文件失败:" + fileName, e);
                         }
                     }
@@ -149,19 +152,19 @@ public class CloudFileParsing {
                                     nwpCloudService.saveBatch(listNwp);
                                     flag = true;
                                 } catch (Exception e) {
-                                    LogUtil.info(DataSourcesEnum.E2, AlarmEnum.E4,"保存NWP数据报错:" + fileName,null);
+                                    LogUtil.info(DataSourcesEnum.E2, AlarmEnum.E4, "保存NWP数据报错:" + fileName, null);
                                     log.error("保存NWP数据报错:" + fileName, e);
                                     parsingLog.setParsingDescribe("保存NWP数据报错:" + fileName);
                                     flag = false;
                                 }
                             } else {
-                                LogUtil.info(DataSourcesEnum.E2, AlarmEnum.E4,"文件数据内容为空、不能正常解析 、移除该文件:" + fileName,null);
+                                LogUtil.info(DataSourcesEnum.E2, AlarmEnum.E4, "文件数据内容为空、不能正常解析 、移除该文件:" + fileName, null);
                                 parsingLog.setParsingDescribe("文件数据内容为空、不能正常解析 、移除该文件:" + fileName);
                                 log.info(file.getName() + "文件数据内容为空、不能正常解析 、移除该文件");
                                 flag = false;
                             }
                         } catch (Exception e) {
-                            LogUtil.info(DataSourcesEnum.E2, AlarmEnum.E4,"解析NWP文件失败:" + fileName,null);
+                            LogUtil.info(DataSourcesEnum.E2, AlarmEnum.E4, "解析NWP文件失败:" + fileName, null);
                             log.error("解析NWP文件失败:" + fileName, e);
                             parsingLog.setParsingDescribe("解析NWP文件失败:" + fileName);
                             flag = false;
@@ -420,7 +423,7 @@ public class CloudFileParsing {
             }
         }
 
-        return overhaulPlanService.getCorrectionData(forecastPowerShortTerm,"","");
+        return forecastPowerShortTerm;
     }
 
 

+ 2 - 3
cpp-admin/src/main/java/com/cpp/web/service/overhaulplan/OverhaulPlanService.java

@@ -2,10 +2,9 @@ package com.cpp.web.service.overhaulplan;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cpp.web.domain.BaseForecastEntity;
 import com.cpp.web.domain.overhaulplan.OverhaulPlan;
-import org.apache.poi.ss.formula.functions.T;
 
-import javax.xml.crypto.Data;
 import java.util.Date;
 import java.util.List;
 
@@ -25,6 +24,6 @@ public interface OverhaulPlanService extends IService<OverhaulPlan> {
 
     List<OverhaulPlan> findByStationCodeAndTimeBetween(Date date,String stationCode);
 
-    <T> List<T>  getCorrectionData(List<T> list,String fileType,String fileName);
+    List getCorrectionData(List<BaseForecastEntity> list, String fileType, String fileName, String stationCode);
 
 }

+ 3 - 73
cpp-admin/src/main/java/com/cpp/web/service/overhaulplan/impl/OverhaulPlanServiceImpl.java

@@ -2,6 +2,7 @@ package com.cpp.web.service.overhaulplan.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cpp.web.domain.BaseForecastEntity;
 import com.cpp.web.domain.datafactory.enums.FileTypeEnum;
 import com.cpp.web.domain.overhaulplan.OverhaulPlan;
 import com.cpp.web.domain.overhaulplan.OverhaulPlanRecords;
@@ -101,80 +102,9 @@ public class OverhaulPlanServiceImpl extends ServiceImpl<OverhaulPlanMapper, Ove
      * @return
      */
     @Override
-    public <T> List<T> getCorrectionData(List<T> list, String fileType, String fileName) {
+    public  List<BaseForecastEntity> getCorrectionData(List<BaseForecastEntity> list, String fileType, String fileName, String stationCode) {
 
-        List<T> resultList = new ArrayList<>();
-        BigDecimal electricFieldCapacity = BigDecimal.ZERO;
-        String forecastModel = "";
-        String stationCode = "";
-        Long id = null;
-        Date useStartTime = null;
-        Date useEndTime = null;
-        for (T tList : list) {
-            try {
-                Class<?> childClass = tList.getClass();
-                Class<?> superClass = childClass.getSuperclass();
-                // 时间
-                Field startTimeField = childClass.getDeclaredField("time");
-                startTimeField.setAccessible(true);
-                Date startTime = (Date) startTimeField.get(tList);
-                // 场站编号
-                Field stationCodeField = superClass.getDeclaredField("stationCode");
-                stationCodeField.setAccessible(true);
-                stationCode = (String) stationCodeField.get(tList);
-                // 获取场站装机
-                ElectricField electricField = electricFieldService.findByStationCode(stationCode);
-                if (null != electricField) {
-                    electricFieldCapacity = electricField.getCapacity();
-                }
-                // 装机
-                Field capacityField = childClass.getDeclaredField("capacity");
-                capacityField.setAccessible(true);
-                capacityField.set(tList, electricFieldCapacity);
-                // 开机
-                Field openCapcityField = childClass.getDeclaredField("openCapacity");
-                openCapcityField.setAccessible(true);
-                // 预测模型
-                Field forecastModelField = childClass.getDeclaredField("forecastModel");
-                forecastModelField.setAccessible(true);
-                forecastModel = (String) forecastModelField.get(tList);
-                // 根据时间查询使用中的检修计划
-                List<OverhaulPlan> overhaulPlanList = findByStationCodeAndTimeBetween(startTime, stationCode);
-                if (overhaulPlanList.size() > 0) {
-                    int flag = 0;
-                    if (flag == 0) {
-                        useStartTime = startTime;
-                    }
-                    useEndTime = startTime;
-                    id = overhaulPlanList.get(0).getId();
-                    BigDecimal overCapacity = overhaulPlanList.get(0).getOverhaulCapacity();
-                    openCapcityField.set(tList, electricFieldCapacity.subtract(overCapacity));
-                    // 预测数据(短期or超短期)
-                    Field fpValueFiled = childClass.getDeclaredField("fpValue");
-                    fpValueFiled.setAccessible(true);
-                    BigDecimal fpValue = (BigDecimal) fpValueFiled.get(tList);
-                    // 开机/装机
-                    BigDecimal ratio = (electricFieldCapacity.subtract(overCapacity)).divide(electricFieldCapacity, 2, RoundingMode.HALF_UP);
-                    fpValueFiled.set(tList, fpValue.multiply(ratio));
-                } else {
-                    // 设置开机为装机
-                    openCapcityField.set(tList, electricFieldCapacity);
-                }
-                resultList.add(tList);
 
-            } catch (NoSuchFieldException | IllegalAccessException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        if (null != id) {
-            OverhaulPlanRecords overhaulPlanRecords = new OverhaulPlanRecords();
-            overhaulPlanRecords.setForecastModel(forecastModel);
-            overhaulPlanRecords.setStationCode(stationCode);
-            overhaulPlanRecords.setOpId(id);
-            overhaulPlanRecords.setDetails(fileType + ":开始时间:" + useStartTime + "~结束时间:" + useEndTime);
-            overhaulPlanRecords.setForecastType(FileTypeEnum.valueOf(fileType));
-            overhaulPlanRecordsService.save(overhaulPlanRecords);
-        }
-        return resultList;
+        return list;
     }
 }