系统效率及指标池代码修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProEconReportIndicatorPoolController.java

@@ -0,0 +1,44 @@
+package com.gyee.runeconomy.controller;
+
+
+import com.gyee.runeconomy.dto.AjaxResult;
+import com.gyee.runeconomy.service.auto.IProEconReportIndicatorPoolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 报表指标池 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-11-17
+ */
+@RestController
+@RequestMapping("//pro-econ-report-indicator-pool")
+@Api(value = "指标写入", tags = "指标写入")
+public class ProEconReportIndicatorPoolController {
+
+    @Resource
+    private IProEconReportIndicatorPoolService poolService;
+
+    @GetMapping("/pool")
+    @ResponseBody
+    @ApiOperation(value = "录入", notes = "录入")
+
+    public AjaxResult getinformation() throws Exception {
+
+        poolService.getpool();
+
+        return AjaxResult.success();
+
+
+    }
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProEconReportIndicatorPoolMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconReportIndicatorPool;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报表指标池 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-11-17
+ */
+public interface ProEconReportIndicatorPoolMapper extends BaseMapper<ProEconReportIndicatorPool> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/model/auto/ProEconReportIndicatorPool.java

@@ -0,0 +1,452 @@
+package com.gyee.runeconomy.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报表指标池
+ * </p>
+ *
+ * @author wang
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconReportIndicatorPool extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 外键编号
+     */
+    private String foreignKeyId;
+
+    /**
+     * 日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date recordDate;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 项目编号
+     */
+    private String projectId;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+
+    /**
+     * 公司编号
+     */
+    private String companyId;
+
+    /**
+     * 区域编号
+     */
+    private String regionId;
+
+    /**
+     * 所属位置(区域、区域风、区域光、公司、公司、公司风、公司光、场站、期次、线路)
+     */
+    private String location;
+
+    /**
+     * 日发电量(电表)
+     */
+    private BigDecimal rfdldb;
+
+    /**
+     * 日上网电量(电表)
+     */
+    private BigDecimal rswdldb;
+
+    /**
+     * 日工网购网电量(电表)
+     */
+    private BigDecimal rgwgwdldb;
+
+    /**
+     * 日农网购网电量(电表)
+     */
+    private BigDecimal rnwgwdldb;
+
+    /**
+     * 日综合场用电量(电表)
+     */
+    private BigDecimal rzhcydldb;
+
+    /**
+     * 日发电厂用电量(电表)
+     */
+    private BigDecimal rfdcydldb;
+
+    /**
+     * 月发电量(电表)
+     */
+    private BigDecimal yfdldb;
+
+    /**
+     * 月上网电量(电表)
+     */
+    private BigDecimal yswdldb;
+
+    /**
+     * 月工网购网电量(电表)
+     */
+    private BigDecimal ygwgwdldb;
+
+    /**
+     * 月农网购网电量(电表)
+     */
+    private BigDecimal ynwgwdldb;
+
+    /**
+     * 月综合场用电量(电表)
+     */
+    private BigDecimal yzhcydldb;
+
+    /**
+     * 月发电厂用电量(电表)
+     */
+    private BigDecimal yfdcydldb;
+
+    /**
+     * 年发电量(电表)
+     */
+    private BigDecimal nfdldb;
+
+    /**
+     * 年上网电量(电表)
+     */
+    private BigDecimal nswdldb;
+
+    /**
+     * 年工网购网电量(电表)
+     */
+    private BigDecimal ngwgwdldb;
+
+    /**
+     * 年农网购网电量(电表)
+     */
+    private BigDecimal nnwgwdldb;
+
+    /**
+     * 年综合场用电量(电表)
+     */
+    private BigDecimal nzhcydldb;
+
+    /**
+     * 年发电厂用电量(电表)
+     */
+    private BigDecimal nfdcydldb;
+
+    /**
+     * 日最大风速
+     */
+    private BigDecimal rzdfs;
+
+    /**
+     * 日最小风速
+     */
+    private BigDecimal rzxfs;
+
+    /**
+     * 日最大功率
+     */
+    private BigDecimal rzdgl;
+
+    /**
+     * 日最小功率
+     */
+    private BigDecimal rzxgl;
+
+    /**
+     * 日平均功率
+     */
+    private BigDecimal rpjgl;
+
+    /**
+     * 日平均风速
+     */
+    private BigDecimal rpjfs;
+
+    /**
+     * 日理论发电量
+     */
+    private BigDecimal rllfdl;
+
+    /**
+     * 日故障损失电量
+     */
+    private BigDecimal rgzssdl;
+
+    /**
+     * 日场内受累故障损失电量
+     */
+    private BigDecimal rcnslgzssdl;
+
+    /**
+     * 日检修损失电量
+     */
+    private BigDecimal rjxssdl;
+
+    /**
+     * 日场内受累检修损失电量
+     */
+    private BigDecimal rcnsljxssdl;
+
+    /**
+     * 日待机损失电量
+     */
+    private BigDecimal rdjssdl;
+
+    /**
+     * 日缺陷降出力损失电量
+     */
+    private BigDecimal rqxjclssdl;
+
+    /**
+     * 日手动停机损失电量
+     */
+    private BigDecimal rsdtjssdl;
+
+    /**
+     * 日性能损失电量
+     */
+    private BigDecimal rxnssdl;
+
+    /**
+     * 日限电停机损失电量
+     */
+    private BigDecimal rxdtjssdl;
+
+    /**
+     * 日限电降出力损失电量
+     */
+    private BigDecimal rxdjclssdl;
+
+    /**
+     * 日场外受累电网损失电量
+     */
+    private BigDecimal rcwsldwssdl;
+
+    /**
+     * 日场外受累天气损失电量
+     */
+    private BigDecimal rcwsltqssdl;
+
+    /**
+     * 月最大风速
+     */
+    private BigDecimal yzdfs;
+
+    /**
+     * 月最小风速
+     */
+    private BigDecimal yzxfs;
+
+    /**
+     * 月最大功率
+     */
+    private BigDecimal yzdgl;
+
+    /**
+     * 月最小功率
+     */
+    private BigDecimal yzxgl;
+
+    /**
+     * 月平均功率
+     */
+    private BigDecimal ypjgl;
+
+    /**
+     * 月平均风速
+     */
+    private BigDecimal ypjfs;
+
+    /**
+     * 月理论发电量
+     */
+    private BigDecimal yllfdl;
+
+    /**
+     * 月故障损失电量
+     */
+    private BigDecimal ygzssdl;
+
+    /**
+     * 月场内受累故障损失电量
+     */
+    private BigDecimal ycnslgzssdl;
+
+    /**
+     * 月检修损失电量
+     */
+    private BigDecimal yjxssdl;
+
+    /**
+     * 月场内受累检修损失电量
+     */
+    private BigDecimal ycnsljxssdl;
+
+    /**
+     * 月待机损失电量
+     */
+    private BigDecimal ydjssdl;
+
+    /**
+     * 月缺陷降出力损失电量
+     */
+    private BigDecimal yqxjclssdl;
+
+    /**
+     * 月手动停机损失电量
+     */
+    private BigDecimal ysdtjssdl;
+
+    /**
+     * 月性能损失电量
+     */
+    private BigDecimal yxnssdl;
+
+    /**
+     * 月限电停机损失电量
+     */
+    private BigDecimal yxdtjssdl;
+
+    /**
+     * 月限电降出力损失电量
+     */
+    private BigDecimal yxdjclssdl;
+
+    /**
+     * 月场外受累电网损失电量
+     */
+    private BigDecimal ycwsldwssdl;
+
+    /**
+     * 月场外受累天气损失电量
+     */
+    private BigDecimal ycwsltqssdl;
+
+    /**
+     * 年最大风速
+     */
+    private BigDecimal nzdfs;
+
+    /**
+     * 年最小风速
+     */
+    private BigDecimal nzxfs;
+
+    /**
+     * 年最大功率
+     */
+    private BigDecimal nzdgl;
+
+    /**
+     * 年最小功率
+     */
+    private BigDecimal nzxgl;
+
+    /**
+     * 年平均功率
+     */
+    private BigDecimal npjgl;
+
+    /**
+     * 年平均风速
+     */
+    private BigDecimal npjfs;
+
+    /**
+     * 年理论发电量
+     */
+    private BigDecimal nllfdl;
+
+    /**
+     * 年故障损失电量
+     */
+    private BigDecimal ngzssdl;
+
+    /**
+     * 年场内受累故障损失电量
+     */
+    private BigDecimal ncnslgzssdl;
+
+    /**
+     * 年检修损失电量
+     */
+    private BigDecimal njxssdl;
+
+    /**
+     * 年场内受累检修损失电量
+     */
+    private BigDecimal ncnsljxssdl;
+
+    /**
+     * 年待机损失电量
+     */
+    private BigDecimal ndjssdl;
+
+    /**
+     * 年缺陷降出力损失电量
+     */
+    private BigDecimal nqxjclssdl;
+
+    /**
+     * 年手动停机损失电量
+     */
+    private BigDecimal nsdtjssdl;
+
+    /**
+     * 年性能损失电量
+     */
+    private BigDecimal nxnssdl;
+
+    /**
+     * 年限电停机损失电量
+     */
+    private BigDecimal nxdtjssdl;
+
+    /**
+     * 年限电降出力损失电量
+     */
+    private BigDecimal nxdjclssdl;
+
+    /**
+     * 年场外受累电网损失电量
+     */
+    private BigDecimal ncwsldwssdl;
+
+    /**
+     * 年场外受累天气损失电量
+     */
+    private BigDecimal ncwsltqssdl;
+
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Comprehensive/PVSystemEfficiencyCalculator.java

@@ -257,7 +257,7 @@ public class PVSystemEfficiencyCalculator {
         }
 
 
-        //计算期次级别
+        //计算线路级别
         int ts3 = 1; // 设置为本年一月一号0点
 
         Calendar calendar3 = Calendar.getInstance();
@@ -391,79 +391,82 @@ public class PVSystemEfficiencyCalculator {
         Date date = null;
         List<ProEconSystemEfficiencyEquipment> stringList = new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wplsG) {
-            List<ProBasicEquipment> wtlsG = CacheContext.wtls.stream().filter(p -> p.getSpare1().equals("IN") && wp.getId().equals(p.getWindpowerstationId())).collect(Collectors.toList());
 
-            for (ProBasicEquipment wt : wtlsG) {
+                List<ProBasicEquipment> wtlsG = CacheContext.wtls.stream().filter(p -> p.getSpare1().equals("IN") && wp.getId().equals(p.getWindpowerstationId())).collect(Collectors.toList());
 
-                List<ProEconEquipmentmodel> collect = CacheContext.equipmentmodels.stream().filter(w -> wt.getModelId().equals(w.getId())).collect(Collectors.toList());
+                for (ProBasicEquipment wt : wtlsG) {
+
+                    List<ProEconEquipmentmodel> collect = CacheContext.equipmentmodels.stream().filter(w -> wt.getModelId().equals(w.getId())).collect(Collectors.toList());
 
 //            for (int i = 0; i < currentMonth; i++) {
 
 
-                if (calFirstMonth4 == currentMonth && dqnf == currentyear) {
-                    Calendar calendar5 = Calendar.getInstance();
-                    ts4 = calendar5.get(Calendar.DAY_OF_MONTH);
-                } else {
-                    // 获取当前月份的天数
-                    ts4 = calFirstDayZeroHour4.getActualMaximum(Calendar.DAY_OF_MONTH);
-                }
+                    if (calFirstMonth4 == currentMonth && dqnf == currentyear) {
+                        Calendar calendar5 = Calendar.getInstance();
+                        ts4 = calendar5.get(Calendar.DAY_OF_MONTH);
+                    } else {
+                        // 获取当前月份的天数
+                        ts4 = calFirstDayZeroHour4.getActualMaximum(Calendar.DAY_OF_MONTH);
+                    }
 
-                List<ProEconEquipmentInfoDay1> rzqdls = proEconEquipmentInfoDay1Service.getmax(wt.getId(), firstDayZeroHour4);
+                    List<ProEconEquipmentInfoDay1> rzqdls = proEconEquipmentInfoDay1Service.getmax(wt.getId(), firstDayZeroHour4);
 
-                double solarRadiationWattsPerSquareMeter = 0.0; // 太阳能辐射，单位为W/m²
-                double actualPowerOutputKilowattHours = 0.0; // 实际发电量，单位为千瓦时(kWh)
-                double moduleCapacityKilowatts = 0.0; // 光伏模块额定容量，单位为千瓦(kW)
-                double pr = 0.0;
+                    double solarRadiationWattsPerSquareMeter = 0.0; // 太阳能辐射，单位为W/m²
+                    double actualPowerOutputKilowattHours = 0.0; // 实际发电量，单位为千瓦时(kWh)
+                    double moduleCapacityKilowatts = 0.0; // 光伏模块额定容量，单位为千瓦(kW)
+                    double pr = 0.0;
 
-                if (!rzqdls.isEmpty() && rzqdls != null) {
-                    for (ProEconEquipmentInfoDay1 day : rzqdls) {
-                        actualPowerOutputKilowattHours = day.getYfdl().doubleValue();
-                        solarRadiationWattsPerSquareMeter = day.getYpjfs().doubleValue();
-                        date = day.getRecordDate();
+                    if (!rzqdls.isEmpty() && rzqdls != null) {
+                        for (ProEconEquipmentInfoDay1 day : rzqdls) {
+                            actualPowerOutputKilowattHours = day.getYfdl().doubleValue();
+                            solarRadiationWattsPerSquareMeter = day.getYpjfs().doubleValue();
+                            date = day.getRecordDate();
+                        }
                     }
-                }
 
 
-                moduleCapacityKilowatts = collect.get(0).getPowerProduction();
+                    moduleCapacityKilowatts = collect.get(0).getPowerProduction();
 
-                double expectedPowerOutputKilowattHours = calculateExpectedPowerOutput(solarRadiationWattsPerSquareMeter, moduleCapacityKilowatts, ts4); // 预期发电量（kWh）
-                pr = calculatePR(actualPowerOutputKilowattHours, expectedPowerOutputKilowattHours); // 计算PR
+                    double expectedPowerOutputKilowattHours = calculateExpectedPowerOutput(solarRadiationWattsPerSquareMeter, moduleCapacityKilowatts, ts4); // 预期发电量（kWh）
+                    pr = calculatePR(actualPowerOutputKilowattHours, expectedPowerOutputKilowattHours); // 计算PR
 
-                pr = StringUtils.round(pr, 2);
-                solarRadiationWattsPerSquareMeter = StringUtils.round(solarRadiationWattsPerSquareMeter, 2);
+                    pr = StringUtils.round(pr, 2);
+                    solarRadiationWattsPerSquareMeter = StringUtils.round(solarRadiationWattsPerSquareMeter, 2);
 
 
-                ProEconSystemEfficiencyEquipment power = new ProEconSystemEfficiencyEquipment();
-                if (date != null) {
-                    power.setId(StringUtils.getUUID());
-                    power.setForeignKeyId(wt.getNemCode());
-                    power.setStationId(wt.getWindpowerstationId());
-                    power.setProjectId(wt.getProjectId());
-                    power.setLineId(wt.getLineId());
-                    power.setEquipmentId(wt.getId());
-                    power.setLocation("wt");
-                    power.setDataDate(date);
-                    power.setPowerGeneration(actualPowerOutputKilowattHours);
-                    power.setLlfdlmax(expectedPowerOutputKilowattHours);
-                    power.setRzqd(solarRadiationWattsPerSquareMeter);
-                    power.setEfficiency(pr);
-                    power.setOrderNum(wt.getOrderNum());
-                    stringList.add(power);
-                }
+                    ProEconSystemEfficiencyEquipment power = new ProEconSystemEfficiencyEquipment();
+                    if (date != null) {
+                        power.setId(StringUtils.getUUID());
+                        power.setForeignKeyId(wt.getNemCode());
+                        power.setStationId(wt.getWindpowerstationId());
+                        power.setProjectId(wt.getProjectId());
+                        power.setLineId(wt.getLineId());
+                        power.setEquipmentId(wt.getId());
+                        power.setLocation("wt");
+                        power.setDataDate(date);
+                        power.setPowerGeneration(actualPowerOutputKilowattHours);
+                        power.setLlfdlmax(expectedPowerOutputKilowattHours);
+                        power.setRzqd(solarRadiationWattsPerSquareMeter);
+                        power.setEfficiency(pr);
+                        power.setOrderNum(wt.getOrderNum());
+                        stringList.add(power);
+                    }
 
 
 //
 //            firstDayZeroHour4 = DateUtils.addMonths(firstDayZeroHour4, 1);
 //            calFirstDayZeroHour4.setTime(firstDayZeroHour4);
 //            calFirstMonth4 = calFirstDayZeroHour4.get(Calendar.MONTH) + 1;
-                ts4 = calFirstDayZeroHour4.getActualMaximum(Calendar.DAY_OF_MONTH);
+                    ts4 = calFirstDayZeroHour4.getActualMaximum(Calendar.DAY_OF_MONTH);
 //        }
-                // 恢复初始值
+                    // 恢复初始值
 //            firstDayZeroHour4 = initialFirstDayZeroHour4;
-            }
+                }
+            efficiencyEquipmentService.batchAdd(stringList);
+            stringList.clear();
         }
 
-        efficiencyEquipmentService.batchAdd(stringList);
+
 
 
     }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Irradiationinput/IrradiationinputService.java

@@ -81,7 +81,7 @@ public class IrradiationinputService {
 
         if (!qwtList.isEmpty() || qwtList.size() >= 1) {
             for (ProEconIrradiationInput lr : qwtList) {
-//                if (lr.getWindpowerstationId().equals("SXJ_KGDL_YX_GDC_STA")) {
+                if (lr.getWindpowerstationId().equals("SXJ_KGDL_YG_GDC_STA")) {
                     Map<String, Map<String, ProBasicPowerstationPoint>> wppointmap = CacheContext.wppointmap;
                     Map<String, ProBasicPowerstationPoint> pointMap = wppointmap.get(lr.getWindpowerstationId());
                     if (pointMap.size() >= 1 || !pointMap.isEmpty()) {
@@ -98,9 +98,8 @@ public class IrradiationinputService {
                         realData.clear(); // 清空realData
                         wpPoints.clear(); // 清空wpPoints,为下一次循环准备
                     }
-//                }
+                }
             }
-//            edosUtil.sendMultiPoint(thls);
             edosUtil.updatePoint(thls);
         }
     }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/analysis/AnalysisNewService.java

@@ -79,9 +79,9 @@ public class AnalysisNewService {
 //            if (wp.getId().equals("SXJ_KGDL_XWT_FDC_STA")) continue;
 
 ////            补充数据可将其打开
-//            if (wp.getId().equals("SXJ_KGDL_SY_GDC_STA")) {
+//            if (wp.getId().equals("SXJ_KGDL_FS_GDC_STA")) {
 //
-//                for (int g = 0; g <= 43; g++) {
+//                for (int g = 0; g <= 50; g++) {
 
 
 
@@ -125,6 +125,7 @@ public class AnalysisNewService {
 //                    endDate = calendar.getTime();
 //                }
             proEconAnalysisSubtableBottomService.batchAdd(Listbat);
+                Listbat.clear();
 //             恢复初始值
 //            beginDate = initialFirstDayZeroHour;
 //            }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/IProEconReportIndicatorPoolService.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.runeconomy.model.auto.ProEconReportIndicatorPool;
+
+/**
+ * <p>
+ * 报表指标池 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-11-17
+ */
+public interface IProEconReportIndicatorPoolService extends IService<ProEconReportIndicatorPool> {
+    void getpool();
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconReportIndicatorPoolServiceImpl.java

@@ -0,0 +1,145 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
+import com.gyee.common.util.DateUtils;
+import com.gyee.runeconomy.mapper.auto.ProEconReportIndicatorPoolMapper;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay5;
+import com.gyee.runeconomy.model.auto.ProEconReportIndicatorPool;
+import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay1Service;
+import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay5Service;
+import com.gyee.runeconomy.service.auto.IProEconReportIndicatorPoolService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * <p>
+ * 报表指标池 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-11-17
+ */
+@Service
+public class ProEconReportIndicatorPoolServiceImpl extends ServiceImpl<ProEconReportIndicatorPoolMapper, ProEconReportIndicatorPool> implements IProEconReportIndicatorPoolService {
+    @Resource
+    private IProEconPowerstationInfoDay5Service day5Service;
+
+    @Resource
+    private IProEconPowerstationInfoDay1Service day1Service;
+    @Override
+    public void getpool() {
+
+        Date rq = DateUtils.getCurrentDate();
+
+        QueryWrapper<ProEconPowerstationInfoDay5> qw5 = new  QueryWrapper();
+        qw5.lambda().eq(ProEconPowerstationInfoDay5::getRecordDate,rq);
+        List<ProEconPowerstationInfoDay5> day5 = day5Service.list(qw5);
+
+        QueryWrapper<ProEconPowerstationInfoDay1> qw1 = new  QueryWrapper();
+        qw1.lambda().eq(ProEconPowerstationInfoDay1::getRecordDate,rq);
+        List<ProEconPowerstationInfoDay1> day1 = day1Service.list(qw1);
+
+        List<ProEconReportIndicatorPool> pool = new ArrayList<>();
+        for (ProEconPowerstationInfoDay5 day : day5){
+
+            ProEconReportIndicatorPool po = new  ProEconReportIndicatorPool();
+
+            po.setId(StringUtils.getUUID());
+            po.setForeignKeyId(day.getForeignKeyId());
+            po.setRecordDate(day.getRecordDate());
+            po.setType(day.getType());
+            po.setWindpowerstationId(day.getWindpowerstationId());
+            po.setProjectId(day.getProjectId());
+            po.setLineId(day.getLineId());
+            po.setCompanyId(day.getCompanyId());
+            po.setRegionId(day.getRegionId());
+            po.setLocation(day.getLocation());
+            po.setRfdldb(day.getRfdldb());
+            po.setRswdldb(day.getRswdldb());
+            po.setRgwgwdldb(day.getRgwgwdldb());
+            po.setRnwgwdldb(day.getRnwgwdldb());
+            po.setRzhcydldb(day.getRzhcydldb());
+            po.setRfdcydldb(day.getRfdcydldb());
+            po.setYfdldb(day.getYfdldb());
+            po.setYswdldb(day.getYswdldb());
+            po.setYgwgwdldb(day.getYgwgwdldb());
+            po.setYnwgwdldb(day.getYnwgwdldb());
+            po.setYzhcydldb(day.getYzhcydldb());
+            po.setYfdcydldb(day.getYfdcydldb());
+            po.setNfdldb(day.getNfdldb());
+            po.setNswdldb(day.getNswdldb());
+            po.setNgwgwdldb(day.getNgwgwdldb());
+            po.setNnwgwdldb(day.getNnwgwdldb());
+            po.setNzhcydldb(day.getNzhcydldb());
+            po.setNfdcydldb(day.getNfdcydldb());
+            po.setNfdcydldb(day.getNfdcydldb());
+
+            pool.add(po);
+        }
+
+        if (pool != null && pool.size() > 1) {
+
+            pool.stream().forEach(i -> {
+                Optional<ProEconPowerstationInfoDay1> optional = day1.stream()
+                        .filter(j -> j.getForeignKeyId().equals(i.getForeignKeyId()) && j.getRecordDate().equals(i.getRecordDate()))
+                        .findFirst();
+
+                if (optional.isPresent()) {
+                    ProEconPowerstationInfoDay1 day = optional.get();
+                    //日
+                    i.setRzdfs(day.getRzdfs());
+                    i.setRzxfs(day.getRzxfs());
+                    i.setRzdgl(day.getRzdgl());
+                    i.setRzxgl(day.getRzxgl());
+                    i.setRpjgl(day.getRpjgl());
+                    i.setRpjfs(day.getRpjfs());
+                    i.setRllfdl(day.getRllfdl());
+                    i.setRgzssdl(day.getRgzssdl());
+                    i.setRcnslgzssdl(day.getRcnslgzssdl());
+                    i.setRjxssdl(day.getRjxssdl());
+                    i.setRcnsljxssdl(day.getRcnsljxssdl());
+                    i.setRdjssdl(day.getRdjssdl());
+                    i.setRqxjclssdl(day.getRqxjclssdl());
+                    i.setRsdtjssdl(day.getRsdtjssdl());
+                    i.setRxnssdl(day.getRxnssdl());
+                    i.setRxdjclssdl(day.getRxdjclssdl());
+                    i.setRxdtjssdl(day.getRxdtjssdl());
+                    i.setRcwsldwssdl(day.getRcwsldwssdl());
+                    i.setRcwsltqssdl(day.getRcwsltqssdl());
+
+                    i.setYzdfs(day.getYzdfs());
+                    i.setYzxfs(day.getYzxfs());
+                    i.setYzdgl(day.getYzdgl());
+                    i.setYzxgl(day.getYzxgl());
+                    i.setYpjgl(day.getYpjgl());
+                    i.setYpjfs(day.getYpjfs());
+                    i.setYllfdl(day.getYllfdl());
+                    i.setYgzssdl(day.getYgzssdl());
+                }
+            });
+        }
+
+        pool.stream().forEach(i -> {
+            QueryWrapper<ProEconReportIndicatorPool> qwpool = new QueryWrapper<>();
+            qwpool.lambda().eq(ProEconReportIndicatorPool::getRecordDate, i.getRecordDate());
+            qwpool.lambda().eq(ProEconReportIndicatorPool::getForeignKeyId, i.getForeignKeyId());
+            int count = baseMapper.selectCount(qwpool);
+            if (count > 0){
+                baseMapper.update(i,qwpool);
+            } else if (count <= 0) {
+                baseMapper.insert(i);
+            }
+
+        });
+
+
+    }
+}