计划电量实际电量统计

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

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 预测功率合格 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-09-13
+ */
+@RestController
+@RequestMapping("//pro-econ-station-power")
+public class ProEconStationPowerController {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconStationPower;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 预测功率合格 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-09-13
+ */
+public interface ProEconStationPowerMapper extends BaseMapper<ProEconStationPower> {
+
+}

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

@@ -0,0 +1,58 @@
+package com.gyee.runeconomy.model.auto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 预测功率合格
+ * </p>
+ *
+ * @author wang
+ * @since 2023-09-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconStationPower extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编码
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    private String id;
+
+    /**
+     * 日期
+     */
+    private LocalDate recordDate;
+
+    /**
+     * 所属风电场
+     */
+    private String windpowerstationId;
+
+    /**
+     * 日96点准确率
+     */
+    private BigDecimal powerAccuracy;
+
+    /**
+     * 日考核分数
+     */
+    private BigDecimal assessmentScore;
+
+    /**
+     * 日发电量预测
+     */
+    private BigDecimal dayPowerForecast;
+
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/StationPower/StationPowerService.java

@@ -0,0 +1,377 @@
+package com.gyee.runeconomy.service.StationPower;
+
+import com.gyee.common.contant.ContantXk;
+import com.gyee.common.model.PointData;
+import com.gyee.common.util.DateUtils;
+import com.gyee.common.util.SortUtils;
+import com.gyee.runeconomy.dto.ForecastVo;
+import com.gyee.runeconomy.init.CacheContext;
+import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
+import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
+import com.gyee.runeconomy.model.auto.ProBasicProject;
+import com.gyee.runeconomy.service.auto.IProBasicPowerstationPointService;
+import com.gyee.runeconomy.util.StringUtils;
+import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+@Service
+public class StationPowerService {
+
+    @Resource
+    private IEdosUtil edosUtil;
+
+    @Resource
+    private IProBasicPowerstationPointService proBasicPowerstationPointService;
+
+    public Map<String, Object> getcockpittype(String beginDate, String endDate, String type) throws Exception {
+
+        Date starttime = DateUtils.parseDate(beginDate);
+        Date endtime = DateUtils.parseDate(endDate);
+
+        String wpId = null;
+
+
+        List<ProBasicProject> pjls = CacheContext.pjls;
+
+        List<ProBasicProject> pjllist = null;
+
+        List<ProBasicPowerstation> wplLs = CacheContext.wpls;
+        SortUtils.sort(wplLs, "orderNum", SortUtils.ASC);
+
+        List<ForecastVo> vos = null;
+        Map<String, Object> map = new LinkedHashMap<>();
+        ProBasicPowerstationPoint pjfs = null;
+        ProBasicPowerstationPoint fsyc = null;
+        ProBasicPowerstationPoint ycgl = null;
+        ProBasicPowerstationPoint sjgl = null;
+        ProBasicPowerstationPoint llgl = null;
+
+        for (ProBasicPowerstation Wp : wplLs) {
+            if (Wp.getId().contains("MLJ"))continue;
+            wpId = Wp.getId();
+
+
+            pjllist = new ArrayList();
+            //得到此循环场站期次
+            for (ProBasicProject pj : pjls) {
+                if (wpId.equals(pj.getWindpowerstationId())) {
+                    pjllist.add(pj);
+                }
+            }
+
+            List<ProBasicPowerstation> station = new ArrayList<>();
+            for (ProBasicPowerstation wp1 : CacheContext.wpls) {
+                if (wpId.equals(wp1.getId())) {
+                    station.add(wp1);
+                }
+            }
+
+            if (wpId.contains("GJY") | wpId.contains("TZ_GDC_STA") | wpId.contains("PTZ_FDC_STA") | wpId.contains("NJL") | wpId.contains("SY")) {
+                for (ProBasicProject wp : pjllist) {
+                    List<ForecastVo> vos1 = new ArrayList<>();
+                    List<ForecastVo> vos2 = new ArrayList<>();
+                    List<ForecastVo> vos3 = new ArrayList<>();
+                    List<ForecastVo> vos4 = new ArrayList<>();
+                    List<ForecastVo> vos5 = new ArrayList<>();
+
+                    // 在每次循环开始前将变量置为null
+                    pjfs = null;
+                    fsyc = null;
+                    ycgl = null;
+                    sjgl = null;
+                    llgl = null;
+
+                    if (wpId.endsWith("FDC_STA") && type.equals("F")) {
+                        ycgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.ZYCGL);
+                        sjgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.PJGL15);
+                    }
+                    if (wpId.endsWith("GDC_STA") && type.equals("G")) {
+                        ycgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.ZYCGL);
+                        sjgl = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.PJGL15);
+                    }
+
+                    if (sjgl != null) {
+                        List<PointData> ycglls = edosUtil.getHistoryDatasSnap(ycgl, starttime.getTime() / 1000, endtime.getTime() / 1000, null, 900L);
+                        List<PointData> sjglls = edosUtil.getHistoryDatasSnap(sjgl, starttime.getTime() / 1000, endtime.getTime() / 1000, null, 900L);
+
+                        double temp1 = 0;
+                        double temp2 = 0;
+                        double temp3 = 0;
+                        double temp4 = 0;
+                        double temp5 = 0;
+
+                        if (wpId.contains("GJY")) {
+                            for (int i = 0; i < sjglls.size(); i++) {
+                                ForecastVo vo = new ForecastVo();
+                                vo.setPjfs(0.0); //平均风速
+                                vo.setYcfs(0.0); //预测风速
+                                vo.setSjgl(0.0); //实际功率
+                                vo.setYcgl(0.0); //功率预测
+                                vo.setLlgl(0.0); //理论功率
+                                vo.setHours(2023L);  //时间戳
+                                vo.setName(wpId);
+
+                                vo.setHours(sjglls.get(i).getPointTime());
+                                vo.setName("平鲁高家堰风电场");
+
+                                vo.setId(wpId);
+
+                                temp3 = ycglls.get(i).getPointValueInDouble();
+                                vo.setYcgl(StringUtils.round(temp3, 2));
+
+                                temp4 = sjglls.get(i).getPointValueInDouble();
+                                vo.setSjgl(StringUtils.round(temp4 /1000, 2));
+
+                                vos1.add(vo);
+                            }
+                        }
+
+                        if (wpId.contains("TZ_GDC_STA")) {
+                            for (int i = 0; i < sjglls.size(); i++) {
+                                ForecastVo vo2 = new ForecastVo();
+                                vo2.setPjfs(0.0); //平均风速
+                                vo2.setYcfs(0.0); //预测风速
+                                vo2.setSjgl(0.0); //实际功率
+                                vo2.setYcgl(0.0); //功率预测
+                                vo2.setLlgl(0.0); //理论功率
+                                vo2.setHours(2023L);  //时间戳
+                                vo2.setName(wpId);
+
+                                vo2.setHours(sjglls.get(i).getPointTime());
+                                vo2.setName("天镇电站");
+                                vo2.setId(wpId);
+
+                                temp3 = ycglls.get(i).getPointValueInDouble();
+                                vo2.setYcgl(StringUtils.round(temp3, 2));
+
+                                temp4 = sjglls.get(i).getPointValueInDouble();
+                                vo2.setSjgl(StringUtils.round(temp4 /1000, 2));
+
+                                vos2.add(vo2);
+                            }
+                        }
+
+                        if (wpId.contains("PTZ_FDC_STA")) {
+                            for (int i = 0; i < sjglls.size(); i++) {
+                                ForecastVo vo3 = new ForecastVo();
+                                vo3.setPjfs(0.0); //平均风速
+                                vo3.setYcfs(0.0); //预测风速
+                                vo3.setSjgl(0.0); //实际功率
+                                vo3.setYcgl(0.0); //功率预测
+                                vo3.setLlgl(0.0); //理论功率
+                                vo3.setHours(2023L);  //时间戳
+                                vo3.setName(wpId);
+
+                                vo3.setHours(sjglls.get(i).getPointTime());
+
+                                vo3.setName("寿阳平头镇风电场");
+
+                                vo3.setId(wpId);
+
+                                temp3 = ycglls.get(i).getPointValueInDouble();
+                                vo3.setYcgl(StringUtils.round(temp3, 2));
+
+                                temp4 = sjglls.get(i).getPointValueInDouble();
+                                vo3.setSjgl(StringUtils.round(temp4 /1000, 2));
+                                vos3.add(vo3);
+                            }
+                        }
+
+                        if (wpId.contains("NJL")) {
+                            for (int i = 0; i < sjglls.size(); i++) {
+                                ForecastVo vo4 = new ForecastVo();
+                                vo4.setPjfs(0.0); //平均风速
+                                vo4.setYcfs(0.0); //预测风速
+                                vo4.setSjgl(0.0); //实际功率
+                                vo4.setYcgl(0.0); //功率预测
+                                vo4.setLlgl(0.0); //理论功率
+                                vo4.setHours(2023L);  //时间戳
+                                vo4.setName(wpId);
+
+                                vo4.setHours(sjglls.get(i).getPointTime());
+
+                                vo4.setName("朔城牛家岭风电场");
+
+                                vo4.setId(wpId);
+
+                                temp3 = ycglls.get(i).getPointValueInDouble();
+                                vo4.setYcgl(StringUtils.round(temp3, 2));
+
+                                temp4 = sjglls.get(i).getPointValueInDouble();
+                                vo4.setSjgl(StringUtils.round(temp4 /1000, 2));
+                                vos4.add(vo4);
+                            }
+                        }
+
+                        if (wpId.contains("SY")) {
+                            for (int i = 0; i < sjglls.size(); i++) {
+                                ForecastVo vo5 = new ForecastVo();
+                                vo5.setPjfs(0.0); //平均风速
+                                vo5.setYcfs(0.0); //预测风速
+                                vo5.setSjgl(0.0); //实际功率
+                                vo5.setYcgl(0.0); //功率预测
+                                vo5.setLlgl(0.0); //理论功率
+                                vo5.setHours(2023L);  //时间戳
+                                vo5.setName(wpId);
+
+                                vo5.setHours(sjglls.get(i).getPointTime());
+                                vo5.setName("山阴电站");
+                                vo5.setId(wpId);
+
+                                 temp3 = ycglls.get(i).getPointValueInDouble();
+                                vo5.setYcgl(StringUtils.round(temp3, 2));
+
+                                temp4 = sjglls.get(i).getPointValueInDouble();
+                                vo5.setSjgl(StringUtils.round(temp4 /1000, 2));
+
+                                vos5.add(vo5);
+                            }
+                        }
+
+
+                        if (wpId.contains("GJY")) {
+                            if (map.containsKey("SXJ_KGDL_GJYF01_EG")) {
+                                List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_GJYF01_EG");
+                                for (int i = 0; i < vos1.size(); i++) {
+                                    ForecastVo previousVo1 = previousVos1.get(i);
+                                    ForecastVo currentVo1 = vos1.get(i);
+
+                                    currentVo1.setSjgl(previousVo1.getSjgl() + currentVo1.getSjgl());
+                                    currentVo1.setYcgl(previousVo1.getYcgl() + currentVo1.getYcgl());
+
+                                }
+                            }
+                        } else if (wpId.contains("TZ_GDC_STA")) {
+                            if (map.containsKey("SXJ_KGDL_TZG01_EG")) {
+                                List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_TZG01_EG");
+                                for (int i = 0; i < vos2.size(); i++) {
+                                    ForecastVo previousVo1 = previousVos1.get(i);
+                                    ForecastVo currentVo1 = vos2.get(i);
+
+                                    currentVo1.setSjgl(previousVo1.getSjgl() + currentVo1.getSjgl());
+                                    currentVo1.setYcgl(previousVo1.getYcgl() + currentVo1.getYcgl());
+
+                                }
+                            }
+                        } else if (wpId.contains("SY")) {
+                            if (map.containsKey("SXJ_KGDL_SYG01_EG")) {
+                                List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_SYG01_EG");
+                                for (int i = 0; i < vos5.size(); i++) {
+                                    ForecastVo previousVo1 = previousVos1.get(i);
+                                    ForecastVo currentVo1 = vos5.get(i);
+
+                                    currentVo1.setSjgl(previousVo1.getSjgl() + currentVo1.getSjgl());
+                                    currentVo1.setYcgl(previousVo1.getYcgl() + currentVo1.getYcgl());
+
+                                }
+                            }
+                        } else if (wpId.contains("NJL")) {
+                            if (map.containsKey("SXJ_KGDL_NJLF01_EG")) {
+                                List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_NJLF01_EG");
+                                for (int i = 0; i < vos4.size(); i++) {
+                                    ForecastVo previousVo1 = previousVos1.get(i);
+                                    ForecastVo currentVo1 = vos4.get(i);
+
+                                    currentVo1.setSjgl(previousVo1.getSjgl() + currentVo1.getSjgl());
+                                    currentVo1.setYcgl(previousVo1.getYcgl() + currentVo1.getYcgl());
+                                }
+                            }
+                        } else if (wpId.contains("PTZ_FDC_STA")) {
+                            if (map.containsKey("SXJ_KGDL_PTZF01_EG")) {
+                                List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_PTZF01_EG");
+                                for (int i = 0; i < vos3.size(); i++) {
+                                    ForecastVo previousVo1 = previousVos1.get(i);
+                                    ForecastVo currentVo1 = vos3.get(i);
+
+                                    currentVo1.setSjgl(previousVo1.getSjgl() + currentVo1.getSjgl());
+                                    currentVo1.setYcgl(previousVo1.getYcgl() + currentVo1.getYcgl());
+                                }
+                            }
+                        }
+
+                        if (wpId.contains("GJY")) {
+                            map.put("SXJ_KGDL_GJY_FDC_STA", vos1);
+
+                        }
+                        if (wpId.contains("NJL")) {
+                            map.put("SXJ_KGDL_NJL_FDC_STA", vos4);
+
+                        }
+                        if (wpId.contains("PTZ_FDC_STA")) {
+                            map.put("SXJ_KGDL_PTZ_FDC_STA", vos3);
+
+                        }
+
+                        if (wpId.contains("TZ_GDC_STA")) {
+                            map.put("SXJ_KGDL_TZ_GDC_STA", vos2);
+                        }
+
+                        if (wpId.contains("SY")) {
+                            map.put("SXJ_KGDL_SY_FDC_STA", vos5);
+                        }
+
+                    }
+                }
+
+            } else {
+                for (ProBasicPowerstation wp : station) {
+                    vos = new ArrayList<>();
+
+                    ProBasicPowerstationPoint pjfs1 = null;
+                    ProBasicPowerstationPoint fsyc1 = null;
+                    ProBasicPowerstationPoint ycgl1 = null;
+                    ProBasicPowerstationPoint sjgl1 = null;
+                    ProBasicPowerstationPoint llgl1 = null;
+
+                    if (wpId.endsWith("FDC_STA") && type.equals("F")) {
+
+                        ycgl1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.ZYCGL);
+                        sjgl1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.PJGL15);
+                    }
+                    if (wpId.endsWith("GDC_STA") && type.equals("G")) {
+                        ycgl1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.ZYCGL);
+                        sjgl1 = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.PJGL15);
+                    }
+                    if (sjgl1 != null) {
+                        List<PointData> ycglls = edosUtil.getHistoryDatasSnap(ycgl1, starttime.getTime() / 1000, endtime.getTime() / 1000, null, 900L);
+                        List<PointData> sjglls = edosUtil.getHistoryDatasSnap(sjgl1, starttime.getTime() / 1000, endtime.getTime() / 1000, null, 900L);
+                         double temp1 = 0;
+                        double temp2 = 0;
+                        double temp3 = 0;
+                        double temp4 = 0;
+                        double temp5 = 0;
+                        for (int i = 0; i < sjglls.size(); i++) {
+
+                            ForecastVo vo = new ForecastVo();
+                            vo.setPjfs(0.0); //平均风速
+                            vo.setYcfs(0.0); //平均风速
+                            vo.setSjgl(0.0); //实际功率
+                            vo.setYcgl(0.0); //功率预测
+                            vo.setLlgl(0.0); //超短期功率预测
+                            vo.setHours(2023L);  //时间戳
+                            vo.setName(wpId);
+
+                            temp3 = ycglls.get(i).getPointValueInDouble();
+                            vo.setYcgl(StringUtils.round(temp3, 2));
+
+                            temp4 = sjglls.get(i).getPointValueInDouble();
+                            vo.setSjgl(StringUtils.round(temp4 /1000, 2));
+                            vo.setHours(sjglls.get(i).getPointTime());
+
+                            vo.setName(wp.getAname());
+                            vo.setId(wpId);
+
+                            vos.add(vo);
+                        }
+                        map.put(wp.getId(), vos);
+
+                    }
+                }
+            }
+        }
+        return map;
+    }
+}

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

@@ -37,4 +37,6 @@ public interface IProEconPowerstationInfoDay1Service extends IService<ProEconPow
 
     List<ProEconPowerstationInfoDay1> getEconFiveLosslist(List<String> foreignKeyIds, Date date);
 
+    List<ProEconPowerstationInfoDay1> getmax(String foreignKeyId ,Date date);
+
 }

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

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.runeconomy.model.auto.ProEconStationPower;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 预测功率合格 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-09-13
+ */
+public interface IProEconStationPowerService extends IService<ProEconStationPower> {
+    List<ProEconStationPower> getlist(String Station , Date begindate);
+    List<ProEconStationPower> getlist1(String Station , Date begindate);
+}

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

@@ -126,5 +126,32 @@ public class ProEconPowerstationInfoDay1ServiceImpl extends ServiceImpl<ProEconP
         return list;
     }
 
+    @Override
+    public List<ProEconPowerstationInfoDay1> getmax(String foreignKeyId, Date date) {
+        QueryWrapper<ProEconPowerstationInfoDay1> qw = null;
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+        Date endOfDayOfLastDayOfMonth = calendar.getTime();
+        //当前数据
+        List<ProEconPowerstationInfoDay1> currlist = new ArrayList<>();
+        if (null != date) {
+            qw = new QueryWrapper<>();
+            if (StringUtils.isNotEmpty(foreignKeyId)) {
+                qw.lambda().eq(ProEconPowerstationInfoDay1::getForeignKeyId, foreignKeyId);
+            }
+            qw.lambda().between(ProEconPowerstationInfoDay1::getRecordDate, DateUtils.getMonthFirst(date), endOfDayOfLastDayOfMonth);
+            qw.lambda().orderByDesc(ProEconPowerstationInfoDay1::getRecordDate);
+            qw.last("limit 1");
+            currlist = baseMapper.selectList(qw);
+
+        }
+        return currlist;
+    }
+
 
 }

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

@@ -0,0 +1,82 @@
+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.ProEconStationPowerMapper;
+import com.gyee.runeconomy.model.auto.ProEconStationPower;
+import com.gyee.runeconomy.service.auto.IProEconStationPowerService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 预测功率合格 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-09-13
+ */
+@Service
+public class ProEconStationPowerServiceImpl extends ServiceImpl<ProEconStationPowerMapper, ProEconStationPower> implements IProEconStationPowerService {
+
+    @Override
+    public List<ProEconStationPower> getlist(String Station,Date begindate) {
+        QueryWrapper<ProEconStationPower> qw = null;
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(begindate);
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+        Date endOfDayOfLastDayOfMonth = calendar.getTime();
+        //当前数据
+        List<ProEconStationPower> currlist = new ArrayList<>();
+
+            qw = new QueryWrapper<>();
+            if (StringUtils.isNotEmpty(Station)) {
+                qw.lambda().eq(ProEconStationPower::getWindpowerstationId, Station);
+            }
+            qw.lambda().between(ProEconStationPower::getRecordDate, DateUtils.getMonthFirst(begindate), endOfDayOfLastDayOfMonth);
+            qw.lambda().orderByDesc(ProEconStationPower::getRecordDate);
+
+            currlist = baseMapper.selectList(qw);
+
+        return currlist;
+    }
+
+    @Override
+    public List<ProEconStationPower> getlist1(String Station, Date begindate) {
+        QueryWrapper<ProEconStationPower> qw = null;
+
+        // 获取当前日期
+        Calendar calendar = Calendar.getInstance();
+        Date currentDate = calendar.getTime();
+
+        // 设置为当前月份的最后一天
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+        calendar.set(Calendar.HOUR_OF_DAY, calendar.getActualMaximum(Calendar.HOUR_OF_DAY));
+        calendar.set(Calendar.MINUTE, calendar.getActualMaximum(Calendar.MINUTE));
+        calendar.set(Calendar.SECOND, calendar.getActualMaximum(Calendar.SECOND));
+        Date endOfDayOfLastDayOfMonth = calendar.getTime();
+        //当前数据
+        List<ProEconStationPower> currlist = new ArrayList<>();
+
+        qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(Station)) {
+            qw.lambda().eq(ProEconStationPower::getWindpowerstationId, Station);
+        }
+        qw.lambda().between(ProEconStationPower::getRecordDate, DateUtils.getMonthFirst(begindate), endOfDayOfLastDayOfMonth);
+        qw.lambda().orderByDesc(ProEconStationPower::getRecordDate);
+
+        currlist = baseMapper.selectList(qw);
+
+        return currlist;
+    }
+}