bug调整

realtime/generationXK-service/src/main/java/com/gyee/generation/service/StationPower/StationPowerService.java

@@ -3,6 +3,7 @@ package com.gyee.generation.service.StationPower;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
+import com.gyee.common.util.DateUtils;
 import com.gyee.common.util.SortUtils;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.ProBasicPowerstation;
@@ -10,6 +11,7 @@ import com.gyee.generation.model.auto.ProBasicPowerstationPoint;
 import com.gyee.generation.model.auto.ProBasicProject;
 import com.gyee.generation.model.auto.ProEconStationPower;
 import com.gyee.generation.service.auto.impl.ProEconStationPowerServiceImpl;
+import com.gyee.generation.util.math.PowerIntegration;
 import com.gyee.generation.util.math.ShortTermPowerPredictionAccuracyCalculator;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import com.gyee.generation.util.realtimesource.timeseries.ForecastVo;
@@ -29,6 +31,9 @@ public class StationPowerService {
     private ShortTermPowerPredictionAccuracyCalculator shortTermPowerPredictionAccuracyCalculator;
 
     @Resource
+    private PowerIntegration powerIntegration;
+
+    @Resource
     private ProEconStationPowerServiceImpl powerService;
 
     public void predictedPower() throws Exception {
@@ -52,7 +57,7 @@ public class StationPowerService {
         calendar.set(Calendar.MILLISECOND, 0);
 
         // 设置 beginDate 为前一天的0点
-        calendar.add(Calendar.DAY_OF_MONTH, -1);
+        calendar.add(Calendar.DAY_OF_MONTH, -2);
         Date beginDate = calendar.getTime();
 
         // 设置 endDate 为当天的0点
@@ -61,514 +66,523 @@ public class StationPowerService {
 
         String wpId = null;
 
+        for (int g = 0; g <= 14; g++) {
 
-        List<ProBasicProject> pjls = CacheContext.pjls;
+            List<ProBasicProject> pjls = CacheContext.pjls;
 
-        List<ProBasicProject> pjllist = null;
+            List<ProBasicProject> pjllist = null;
 
-        List<ProBasicPowerstation> wplLs = CacheContext.wpls;
-        SortUtils.sort(wplLs, "orderNum", SortUtils.ASC);
+            List<ProBasicPowerstation> wplLs = CacheContext.wpls;
+            SortUtils.sort(wplLs, "orderNum", SortUtils.ASC);
 
-        List<ForecastVo> vos = null;
-        Map<String, Object> map = new LinkedHashMap<>();
-        ProBasicPowerstationPoint ycgl = null;
-        ProBasicPowerstationPoint sjgl = null;
+            List<ForecastVo> vos = null;
+            Map<String, Object> map = new LinkedHashMap<>();
+            ProBasicPowerstationPoint ycgl = null;
+            ProBasicPowerstationPoint sjgl = 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);
+            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);
+                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) {
-                    Map<String, ProBasicPowerstationPoint> propointMap = propointmap.get(wp.getId());
-                    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
-                    ycgl = null;
-                    sjgl = null;
-
-                    if (wpId.endsWith("FDC_STA") && type.equals("F")) {
-                        ycgl = propointMap.get(ContantXk.GLYC);
-                        sjgl = propointMap.get(ContantXk.PJGL15);
-                    }
-                    if (wpId.endsWith("GDC_STA") && type.equals("G")) {
-                        ycgl = propointMap.get(ContantXk.GLYC);
-                        sjgl = propointMap.get(ContantXk.PJGL15);
-                    }
+                if (wpId.contains("GJY") | wpId.contains("TZ_GDC_STA") | wpId.contains("PTZ_FDC_STA") | wpId.contains("NJL") | wpId.contains("SY")) {
+                    for (ProBasicProject wp : pjllist) {
+                        Map<String, ProBasicPowerstationPoint> propointMap = propointmap.get(wp.getId());
+                        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
+                        ycgl = null;
+                        sjgl = null;
+
+                        if (wpId.endsWith("FDC_STA") && type.equals("F")) {
+                            ycgl = propointMap.get(ContantXk.GLYC);
+                            sjgl = propointMap.get(ContantXk.PJGL15);
+                        }
+                        if (wpId.endsWith("GDC_STA") && type.equals("G")) {
+                            ycgl = propointMap.get(ContantXk.GLYC);
+                            sjgl = propointMap.get(ContantXk.PJGL15);
+                        }
 
-                    if (ycgl != null && sjgl != null) {
+                        if (ycgl != null && sjgl != null) {
 
-                        List<PointData> ycglls = edosUtil.getHistoryDatasSnap(ycgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L);
-                        List<PointData> sjglls = edosUtil.getHistoryDatasSnap(sjgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L);
+                            List<PointData> ycglls = edosUtil.getHistoryDatasSnap(ycgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L);
+                            List<PointData> sjglls = edosUtil.getHistoryDatasSnap(sjgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L);
 
 
-                        double temp1 = 0;
-                        double temp2 = 0;
-                        double temp3 = 0;
-                        double temp4 = 0;
-                        double temp5 = 0;
+                            double temp1 = 0;
+                            double temp2 = 0;
+                            double temp3 = 0;
+                            double temp4 = 0;
+                            double temp5 = 0;
 
-                        if (wp.getId().contains("SXJ_KGDL_GJYF01_EG") || wp.getId().equals("SXJ_KGDL_GJYF03_EG")) {
-                            for (int i = 0; i < ycglls.size(); i++) {
-                                ForecastVo vo = new ForecastVo();
+                            if (wp.getId().contains("SXJ_KGDL_GJYF01_EG") || wp.getId().equals("SXJ_KGDL_GJYF03_EG")) {
+                                for (int i = 0; i < ycglls.size(); i++) {
+                                    ForecastVo vo = new ForecastVo();
 //
-                                vo.setSjgl(0.0); //实际功率
-                                vo.setYcgl(0.0); //功率预测
+                                    vo.setSjgl(0.0); //实际功率
+                                    vo.setYcgl(0.0); //功率预测
 //
-                                vo.setHours(2023L);  //时间戳
-                                vo.setName(wpId);
+                                    vo.setHours(2023L);  //时间戳
+                                    vo.setName(wpId);
 
-                                vo.setHours(ycglls.get(i).getPointTime());
-                                vo.setName("平鲁高家堰风电场");
+                                    vo.setHours(ycglls.get(i).getPointTime());
+                                    vo.setName("平鲁高家堰风电场");
 
-                                vo.setId(wpId);
+                                    vo.setId(wpId);
 
-                                if (ycglls != null && !ycglls.isEmpty() && i < ycglls.size() && ycglls.get(i).getPointName() != null) {
-                                    temp3 = ycglls.get(i).getPointValueInDouble();
-                                    vo.setYcgl(StringUtils.round(temp3, 2));
-                                }
-                                if (sjglls != null && !sjglls.isEmpty() && i < sjglls.size() && sjglls.get(i).getPointName() != null) {
-                                    temp4 = sjglls.get(i).getPointValueInDouble();
-                                    vo.setSjgl(StringUtils.round(temp4 / 1000, 2));
-                                }
+                                    if (ycglls != null && !ycglls.isEmpty() && i < ycglls.size() && ycglls.get(i).getPointName() != null) {
+                                        temp3 = ycglls.get(i).getPointValueInDouble();
+                                        vo.setYcgl(StringUtils.round(temp3, 2));
+                                    }
+                                    if (sjglls != null && !sjglls.isEmpty() && i < sjglls.size() && sjglls.get(i).getPointName() != null) {
+                                        temp4 = sjglls.get(i).getPointValueInDouble();
+                                        vo.setSjgl(StringUtils.round(temp4 / 1000, 2));
+                                    }
 
-                                vos1.add(vo);
+                                    vos1.add(vo);
+                                }
                             }
-                        }
-                        else if (wp.getId().contains("SXJ_KGDL_GJYF02_EG")) {
-                            for (int i = 0; i < ycglls.size(); i++) {
-                                ForecastVo vo = new ForecastVo();
+                            else if (wp.getId().contains("SXJ_KGDL_GJYF02_EG")) {
+                                for (int i = 0; i < ycglls.size(); i++) {
+                                    ForecastVo vo = new ForecastVo();
 
-                                vo.setSjgl(0.0); //实际功率
-                                vo.setYcgl(0.0); //功率预测
-                                vo.setHours(2023L);  //时间戳
-                                vo.setName(wpId);
+                                    vo.setSjgl(0.0); //实际功率
+                                    vo.setYcgl(0.0); //功率预测
+                                    vo.setHours(2023L);  //时间戳
+                                    vo.setName(wpId);
 
-                                vo.setHours(ycglls.get(i).getPointTime());
-                                vo.setName("平鲁高家堰风电场");
+                                    vo.setHours(ycglls.get(i).getPointTime());
+                                    vo.setName("平鲁高家堰风电场");
 
-                                vo.setId(wpId);
+                                    vo.setId(wpId);
 
 
-                                if (ycglls != null && !ycglls.isEmpty() && i < ycglls.size() && ycglls.get(i).getPointName() != null) {
-                                    temp3 = ycglls.get(i).getPointValueInDouble();
-                                    vo.setYcgl(StringUtils.round(temp3, 2));
-                                }
-                                if (sjglls != null && !sjglls.isEmpty() && i < sjglls.size() && sjglls.get(i).getPointName() != null) {
-                                    temp4 = sjglls.get(i).getPointValueInDouble();
-                                    vo.setSjgl(StringUtils.round(temp4 / 1000, 2));
-                                }
+                                    if (ycglls != null && !ycglls.isEmpty() && i < ycglls.size() && ycglls.get(i).getPointName() != null) {
+                                        temp3 = ycglls.get(i).getPointValueInDouble();
+                                        vo.setYcgl(StringUtils.round(temp3, 2));
+                                    }
+                                    if (sjglls != null && !sjglls.isEmpty() && i < sjglls.size() && sjglls.get(i).getPointName() != null) {
+                                        temp4 = sjglls.get(i).getPointValueInDouble();
+                                        vo.setSjgl(StringUtils.round(temp4 / 1000, 2));
+                                    }
 
-                                vos1.add(vo);
+                                    vos1.add(vo);
+                                }
                             }
-                        }
 
-                        if (wp.getId().contains("SXJ_KGDL_TZG01_EG") || wp.getId().contains("SXJ_KGDL_TZG05_EG")) {
-                            for (int i = 0; i < ycglls.size(); i++) {
-                                ForecastVo vo2 = new ForecastVo();
+                            if (wp.getId().contains("SXJ_KGDL_TZG01_EG") || wp.getId().contains("SXJ_KGDL_TZG05_EG")) {
+                                for (int i = 0; i < ycglls.size(); i++) {
+                                    ForecastVo vo2 = new ForecastVo();
 
-                                vo2.setSjgl(0.0); //实际功率
-                                vo2.setYcgl(0.0); //功率预测
+                                    vo2.setSjgl(0.0); //实际功率
+                                    vo2.setYcgl(0.0); //功率预测
 
-                                vo2.setHours(2023L);  //时间戳
-                                vo2.setName(wpId);
+                                    vo2.setHours(2023L);  //时间戳
+                                    vo2.setName(wpId);
 
-                                vo2.setHours(ycglls.get(i).getPointTime());
-                                vo2.setName("天镇电站");
-                                vo2.setId(wpId);
+                                    vo2.setHours(ycglls.get(i).getPointTime());
+                                    vo2.setName("天镇电站");
+                                    vo2.setId(wpId);
 
 
-                                if (ycglls != null && !ycglls.isEmpty() && i < ycglls.size() && ycglls.get(i).getPointName() != null) {
-                                    temp3 = ycglls.get(i).getPointValueInDouble();
-                                    vo2.setYcgl(StringUtils.round(temp3, 2));
-                                }
+                                    if (ycglls != null && !ycglls.isEmpty() && i < ycglls.size() && ycglls.get(i).getPointName() != null) {
+                                        temp3 = ycglls.get(i).getPointValueInDouble();
+                                        vo2.setYcgl(StringUtils.round(temp3, 2));
+                                    }
 
-                                if (sjglls != null && !sjglls.isEmpty() && i < sjglls.size() && sjglls.get(i).getPointName() != null) {
-                                    temp4 = sjglls.get(i).getPointValueInDouble();
-                                    vo2.setSjgl(StringUtils.round(temp4 / 1000, 2));
-                                }
+                                    if (sjglls != null && !sjglls.isEmpty() && i < sjglls.size() && sjglls.get(i).getPointName() != null) {
+                                        temp4 = sjglls.get(i).getPointValueInDouble();
+                                        vo2.setSjgl(StringUtils.round(temp4 / 1000, 2));
+                                    }
 
 
-                                vos2.add(vo2);
-                            }
-                        }else if (wpId.contains("TZ_GDC_STA")) {
-                            for (int i = 0; i < ycglls.size(); i++) {
-                                ForecastVo vo2 = new ForecastVo();
+                                    vos2.add(vo2);
+                                }
+                            }else if (wpId.contains("TZ_GDC_STA")) {
+                                for (int i = 0; i < ycglls.size(); i++) {
+                                    ForecastVo vo2 = new ForecastVo();
 
-                                vo2.setSjgl(0.0); //实际功率
-                                vo2.setYcgl(0.0); //功率预测
-                                vo2.setHours(2023L);  //时间戳
-                                vo2.setName(wpId);
+                                    vo2.setSjgl(0.0); //实际功率
+                                    vo2.setYcgl(0.0); //功率预测
+                                    vo2.setHours(2023L);  //时间戳
+                                    vo2.setName(wpId);
 
-                                vo2.setHours(ycglls.get(i).getPointTime());
-                                vo2.setName("天镇电站");
-                                vo2.setId(wpId);
+                                    vo2.setHours(ycglls.get(i).getPointTime());
+                                    vo2.setName("天镇电站");
+                                    vo2.setId(wpId);
 
 
-                                if (ycglls != null && !ycglls.isEmpty() && i < ycglls.size() && ycglls.get(i).getPointName() != null) {
-                                    temp3 = ycglls.get(i).getPointValueInDouble();
-                                    vo2.setYcgl(StringUtils.round(temp3, 2));
-                                }
+                                    if (ycglls != null && !ycglls.isEmpty() && i < ycglls.size() && ycglls.get(i).getPointName() != null) {
+                                        temp3 = ycglls.get(i).getPointValueInDouble();
+                                        vo2.setYcgl(StringUtils.round(temp3, 2));
+                                    }
 
-                                if (sjglls != null && !sjglls.isEmpty() && i < sjglls.size() && sjglls.get(i).getPointName() != null) {
-                                    temp4 = sjglls.get(i).getPointValueInDouble();
-                                    vo2.setSjgl(StringUtils.round(temp4 / 1000, 2));
-                                }
+                                    if (sjglls != null && !sjglls.isEmpty() && i < sjglls.size() && sjglls.get(i).getPointName() != null) {
+                                        temp4 = sjglls.get(i).getPointValueInDouble();
+                                        vo2.setSjgl(StringUtils.round(temp4 / 1000, 2));
+                                    }
 
 
 
-                                vos2.add(vo2);
+                                    vos2.add(vo2);
+                                }
                             }
-                        }
 
-                        if (wpId.contains("PTZ_FDC_STA")) {
-                            for (int i = 0; i < ycglls.size(); i++) {
-                                ForecastVo vo3 = new ForecastVo();
+                            if (wpId.contains("PTZ_FDC_STA")) {
+                                for (int i = 0; i < ycglls.size(); i++) {
+                                    ForecastVo vo3 = new ForecastVo();
 
-                                vo3.setSjgl(0.0); //实际功率
-                                vo3.setYcgl(0.0); //功率预测
-                                vo3.setHours(2023L);  //时间戳
-                                vo3.setName(wpId);
+                                    vo3.setSjgl(0.0); //实际功率
+                                    vo3.setYcgl(0.0); //功率预测
+                                    vo3.setHours(2023L);  //时间戳
+                                    vo3.setName(wpId);
 
-                                vo3.setHours(ycglls.get(i).getPointTime());
+                                    vo3.setHours(ycglls.get(i).getPointTime());
 
-                                vo3.setName("寿阳平头镇风电场");
+                                    vo3.setName("寿阳平头镇风电场");
 
-                                vo3.setId(wpId);
+                                    vo3.setId(wpId);
 
 
-                                if (ycglls != null && !ycglls.isEmpty() && i < ycglls.size() && ycglls.get(i).getPointName() != null) {
-                                    temp3 = ycglls.get(i).getPointValueInDouble();
-                                    vo3.setYcgl(StringUtils.round(temp3, 2));
-                                }
-                                if (sjglls != null && !sjglls.isEmpty() && i < sjglls.size() && sjglls.get(i).getPointName() != null) {
-                                    temp4 = sjglls.get(i).getPointValueInDouble();
-                                    vo3.setSjgl(StringUtils.round(temp4 / 1000, 2));
-                                }
+                                    if (ycglls != null && !ycglls.isEmpty() && i < ycglls.size() && ycglls.get(i).getPointName() != null) {
+                                        temp3 = ycglls.get(i).getPointValueInDouble();
+                                        vo3.setYcgl(StringUtils.round(temp3, 2));
+                                    }
+                                    if (sjglls != null && !sjglls.isEmpty() && i < sjglls.size() && sjglls.get(i).getPointName() != null) {
+                                        temp4 = sjglls.get(i).getPointValueInDouble();
+                                        vo3.setSjgl(StringUtils.round(temp4 / 1000, 2));
+                                    }
 
-                                vos3.add(vo3);
+                                    vos3.add(vo3);
+                                }
                             }
-                        }
 
-                        if (wpId.contains("NJL")) {
-                            for (int i = 0; i < ycglls.size(); i++) {
-                                ForecastVo vo4 = new ForecastVo();
+                            if (wpId.contains("NJL")) {
+                                for (int i = 0; i < ycglls.size(); i++) {
+                                    ForecastVo vo4 = new ForecastVo();
 
-                                vo4.setSjgl(0.0); //实际功率
-                                vo4.setYcgl(0.0); //功率预测
-                                vo4.setHours(2023L);  //时间戳
-                                vo4.setName(wpId);
+                                    vo4.setSjgl(0.0); //实际功率
+                                    vo4.setYcgl(0.0); //功率预测
+                                    vo4.setHours(2023L);  //时间戳
+                                    vo4.setName(wpId);
 
-                                vo4.setHours(ycglls.get(i).getPointTime());
+                                    vo4.setHours(ycglls.get(i).getPointTime());
 
-                                vo4.setName("朔城牛家岭风电场");
+                                    vo4.setName("朔城牛家岭风电场");
 
-                                vo4.setId(wpId);
+                                    vo4.setId(wpId);
 
-                                if (ycglls != null && !ycglls.isEmpty() && i < ycglls.size() && ycglls.get(i).getPointName() != null) {
-                                    temp3 = ycglls.get(i).getPointValueInDouble();
-                                    vo4.setYcgl(StringUtils.round(temp3, 2));
-                                }
+                                    if (ycglls != null && !ycglls.isEmpty() && i < ycglls.size() && ycglls.get(i).getPointName() != null) {
+                                        temp3 = ycglls.get(i).getPointValueInDouble();
+                                        vo4.setYcgl(StringUtils.round(temp3, 2));
+                                    }
 
-                                if (sjglls != null && !sjglls.isEmpty() && i < sjglls.size() && sjglls.get(i).getPointName() != null) {
-                                    temp4 = sjglls.get(i).getPointValueInDouble();
-                                    vo4.setSjgl(StringUtils.round(temp4 / 1000, 2));
-                                }
+                                    if (sjglls != null && !sjglls.isEmpty() && i < sjglls.size() && sjglls.get(i).getPointName() != null) {
+                                        temp4 = sjglls.get(i).getPointValueInDouble();
+                                        vo4.setSjgl(StringUtils.round(temp4 / 1000, 2));
+                                    }
 
 
-                                vos4.add(vo4);
+                                    vos4.add(vo4);
+                                }
                             }
-                        }
 
-                        if (wpId.contains("SY")) {
-                            for (int i = 0; i < ycglls.size(); i++) {
-                                ForecastVo vo5 = new ForecastVo();
+                            if (wpId.contains("SY")) {
+                                for (int i = 0; i < ycglls.size(); i++) {
+                                    ForecastVo vo5 = new ForecastVo();
 
-                                vo5.setSjgl(0.0); //实际功率
-                                vo5.setYcgl(0.0); //功率预测
-                                vo5.setHours(2023L);  //时间戳
-                                vo5.setName(wpId);
+                                    vo5.setSjgl(0.0); //实际功率
+                                    vo5.setYcgl(0.0); //功率预测
+                                    vo5.setHours(2023L);  //时间戳
+                                    vo5.setName(wpId);
 
-                                vo5.setHours(ycglls.get(i).getPointTime());
-                                vo5.setName("山阴电站");
-                                vo5.setId(wpId);
+                                    vo5.setHours(ycglls.get(i).getPointTime());
+                                    vo5.setName("山阴电站");
+                                    vo5.setId(wpId);
 
-                                if (ycglls != null && !ycglls.isEmpty() && i < ycglls.size() && ycglls.get(i).getPointName() != null) {
-                                    temp3 = ycglls.get(i).getPointValueInDouble();
-                                    vo5.setYcgl(StringUtils.round(temp3, 2));
-                                }
-                                if (sjglls != null && !sjglls.isEmpty() && i < sjglls.size() && sjglls.get(i).getPointName() != null) {
-                                    temp4 = sjglls.get(i).getPointValueInDouble();
-                                    vo5.setSjgl(StringUtils.round(temp4 / 1000, 2));
-                                }
+                                    if (ycglls != null && !ycglls.isEmpty() && i < ycglls.size() && ycglls.get(i).getPointName() != null) {
+                                        temp3 = ycglls.get(i).getPointValueInDouble();
+                                        vo5.setYcgl(StringUtils.round(temp3, 2));
+                                    }
+                                    if (sjglls != null && !sjglls.isEmpty() && i < sjglls.size() && sjglls.get(i).getPointName() != null) {
+                                        temp4 = sjglls.get(i).getPointValueInDouble();
+                                        vo5.setSjgl(StringUtils.round(temp4 / 1000, 2));
+                                    }
 
-                                vos5.add(vo5);
+                                    vos5.add(vo5);
+                                }
                             }
-                        }
 
 
-                        if (wpId.contains("GJY")) {
-                            if (map.containsKey("SXJ_KGDL_GJY_FDC_STA")) {
-                                List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_GJY_FDC_STA");
-                                List<ForecastVo> currentVos1 = vos1; // 新建一个currentVos1列表来保存当前数据
-
-                                if (previousVos1.size() != currentVos1.size()) {
-                                    int sizeDiff = Math.abs(previousVos1.size() - currentVos1.size());
-                                    if (previousVos1.size() > currentVos1.size()) {
-                                        // 如果previousVos1.size()大于currentVos1.size()
-                                        // 添加缺失的currentVo1对象到currentVos1列表中
-                                        for (int i = 0; i < sizeDiff; i++) {
-                                            currentVos1.add(null);
-                                        }
-                                    } else {
-                                        // 如果previousVos1.size()小于currentVos1.size()
-                                        // 添加缺失的previousVo1对象到previousVos1列表中
-                                        for (int i = 0; i < sizeDiff; i++) {
-                                            previousVos1.add(null);
+                            if (wpId.contains("GJY")) {
+                                if (map.containsKey("SXJ_KGDL_GJY_FDC_STA")) {
+                                    List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_GJY_FDC_STA");
+                                    List<ForecastVo> currentVos1 = vos1; // 新建一个currentVos1列表来保存当前数据
+
+                                    if (previousVos1.size() != currentVos1.size()) {
+                                        int sizeDiff = Math.abs(previousVos1.size() - currentVos1.size());
+                                        if (previousVos1.size() > currentVos1.size()) {
+                                            // 如果previousVos1.size()大于currentVos1.size()
+                                            // 添加缺失的currentVo1对象到currentVos1列表中
+                                            for (int i = 0; i < sizeDiff; i++) {
+                                                currentVos1.add(null);
+                                            }
+                                        } else {
+                                            // 如果previousVos1.size()小于currentVos1.size()
+                                            // 添加缺失的previousVo1对象到previousVos1列表中
+                                            for (int i = 0; i < sizeDiff; i++) {
+                                                previousVos1.add(null);
+                                            }
                                         }
                                     }
-                                }
 
-                                for (int i = 0; i < previousVos1.size(); i++) {
-                                    ForecastVo previousVo1 = previousVos1.get(i);
-                                    ForecastVo currentVo1 = currentVos1.get(i);
-                                    if (previousVo1 != null && currentVo1 != null) {
-                                        if (previousVo1.getSjgl() != null && currentVo1.getSjgl() != null) {
-                                            currentVo1.setSjgl(StringUtils.round(previousVo1.getSjgl() + currentVo1.getSjgl(),2));
-                                        }
-                                        if (previousVo1.getYcgl() != null && currentVo1.getYcgl() != null) {
-                                            currentVo1.setYcgl(StringUtils.round(previousVo1.getYcgl() + currentVo1.getYcgl(),2));
+                                    for (int i = 0; i < previousVos1.size(); i++) {
+                                        ForecastVo previousVo1 = previousVos1.get(i);
+                                        ForecastVo currentVo1 = currentVos1.get(i);
+                                        if (previousVo1 != null && currentVo1 != null) {
+                                            if (previousVo1.getSjgl() != null && currentVo1.getSjgl() != null) {
+                                                currentVo1.setSjgl(StringUtils.round(previousVo1.getSjgl() + currentVo1.getSjgl(),2));
+                                            }
+                                            if (previousVo1.getYcgl() != null && currentVo1.getYcgl() != null) {
+                                                currentVo1.setYcgl(StringUtils.round(previousVo1.getYcgl() + currentVo1.getYcgl(),2));
+                                            }
                                         }
                                     }
                                 }
-                            }
-                        } else if (wpId.contains("TZ_GDC_STA")) {
-                            if (map.containsKey("SXJ_KGDL_TZ_GDC_STA")) {
-                                List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_TZ_GDC_STA");
-                                List<ForecastVo> currentVos1 = vos2; // 新建一个currentVos1列表来保存当前数据
-
-                                if (previousVos1.size() != currentVos1.size()) {
-                                    int sizeDiff = Math.abs(previousVos1.size() - currentVos1.size());
-                                    if (previousVos1.size() > currentVos1.size()) {
-                                        // 如果previousVos1.size()大于currentVos1.size()
-                                        // 添加缺失的currentVo1对象到currentVos1列表中
-                                        for (int i = 0; i < sizeDiff; i++) {
-                                            currentVos1.add(null);
-                                        }
-                                    } else {
-                                        // 如果previousVos1.size()小于currentVos1.size()
-                                        // 添加缺失的previousVo1对象到previousVos1列表中
-                                        for (int i = 0; i < sizeDiff; i++) {
-                                            previousVos1.add(null);
+                            } else if (wpId.contains("TZ_GDC_STA")) {
+                                if (map.containsKey("SXJ_KGDL_TZ_GDC_STA")) {
+                                    List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_TZ_GDC_STA");
+                                    List<ForecastVo> currentVos1 = vos2; // 新建一个currentVos1列表来保存当前数据
+
+                                    if (previousVos1.size() != currentVos1.size()) {
+                                        int sizeDiff = Math.abs(previousVos1.size() - currentVos1.size());
+                                        if (previousVos1.size() > currentVos1.size()) {
+                                            // 如果previousVos1.size()大于currentVos1.size()
+                                            // 添加缺失的currentVo1对象到currentVos1列表中
+                                            for (int i = 0; i < sizeDiff; i++) {
+                                                currentVos1.add(null);
+                                            }
+                                        } else {
+                                            // 如果previousVos1.size()小于currentVos1.size()
+                                            // 添加缺失的previousVo1对象到previousVos1列表中
+                                            for (int i = 0; i < sizeDiff; i++) {
+                                                previousVos1.add(null);
+                                            }
                                         }
                                     }
-                                }
 
-                                for (int i = 0; i < previousVos1.size(); i++) {
-                                    ForecastVo previousVo1 = previousVos1.get(i);
-                                    ForecastVo currentVo1 = currentVos1.get(i);
-                                    if (previousVo1 != null && currentVo1 != null) {
+                                    for (int i = 0; i < previousVos1.size(); i++) {
+                                        ForecastVo previousVo1 = previousVos1.get(i);
+                                        ForecastVo currentVo1 = currentVos1.get(i);
+                                        if (previousVo1 != null && currentVo1 != null) {
 
-                                        if (previousVo1.getSjgl() != null && currentVo1.getSjgl() != null) {
-                                            currentVo1.setSjgl(StringUtils.round(previousVo1.getSjgl() + currentVo1.getSjgl(),2));
-                                        }
-                                        if (previousVo1.getYcgl() != null && currentVo1.getYcgl() != null) {
-                                            currentVo1.setYcgl(StringUtils.round(previousVo1.getYcgl() + currentVo1.getYcgl(),2));
-                                        }
+                                            if (previousVo1.getSjgl() != null && currentVo1.getSjgl() != null) {
+                                                currentVo1.setSjgl(StringUtils.round(previousVo1.getSjgl() + currentVo1.getSjgl(),2));
+                                            }
+                                            if (previousVo1.getYcgl() != null && currentVo1.getYcgl() != null) {
+                                                currentVo1.setYcgl(StringUtils.round(previousVo1.getYcgl() + currentVo1.getYcgl(),2));
+                                            }
 
+                                        }
                                     }
                                 }
-                            }
-                        } else if (wpId.contains("SY")) {
-                            if (map.containsKey("SXJ_KGDL_SY_GDC_STA")) {
-                                List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_SY_GDC_STA");
-                                for (int i = 0; i < vos5.size(); i++) {
-                                    ForecastVo previousVo1 = previousVos1.get(i);
-                                    ForecastVo currentVo1 = vos5.get(i);
-                                    if (previousVo1 != null && currentVo1 != null) {
-
-                                        if (previousVo1.getSjgl() != null && currentVo1.getSjgl() != null) {
-                                            currentVo1.setSjgl(StringUtils.round(previousVo1.getSjgl() + currentVo1.getSjgl(),2));
-                                        }
-                                        if (previousVo1.getYcgl() != null && currentVo1.getYcgl() != null) {
-                                            currentVo1.setYcgl(StringUtils.round(previousVo1.getYcgl() + currentVo1.getYcgl(),2));
-                                        }
+                            } else if (wpId.contains("SY")) {
+                                if (map.containsKey("SXJ_KGDL_SY_GDC_STA")) {
+                                    List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_SY_GDC_STA");
+                                    for (int i = 0; i < vos5.size(); i++) {
+                                        ForecastVo previousVo1 = previousVos1.get(i);
+                                        ForecastVo currentVo1 = vos5.get(i);
+                                        if (previousVo1 != null && currentVo1 != null) {
+
+                                            if (previousVo1.getSjgl() != null && currentVo1.getSjgl() != null) {
+                                                currentVo1.setSjgl(StringUtils.round(previousVo1.getSjgl() + currentVo1.getSjgl(),2));
+                                            }
+                                            if (previousVo1.getYcgl() != null && currentVo1.getYcgl() != null) {
+                                                currentVo1.setYcgl(StringUtils.round(previousVo1.getYcgl() + currentVo1.getYcgl(),2));
+                                            }
 
+                                        }
                                     }
                                 }
-                            }
-                        } else if (wpId.contains("NJL")) {
-                            if (map.containsKey("SXJ_KGDL_NJL_FDC_STA")) {
-                                List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_NJL_FDC_STA");
-                                for (int i = 0; i < vos4.size(); i++) {
-                                    ForecastVo previousVo1 = previousVos1.get(i);
-                                    ForecastVo currentVo1 = vos4.get(i);
-                                    if (previousVo1 != null && currentVo1 != null) {
-
-                                        if (previousVo1.getSjgl() != null && currentVo1.getSjgl() != null) {
-                                            currentVo1.setSjgl(StringUtils.round(previousVo1.getSjgl() + currentVo1.getSjgl(),2));
-                                        }
-                                        if (previousVo1.getYcgl() != null && currentVo1.getYcgl() != null) {
-                                            currentVo1.setYcgl(StringUtils.round(previousVo1.getYcgl() + currentVo1.getYcgl(),2));
-                                        }
+                            } else if (wpId.contains("NJL")) {
+                                if (map.containsKey("SXJ_KGDL_NJL_FDC_STA")) {
+                                    List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_NJL_FDC_STA");
+                                    for (int i = 0; i < vos4.size(); i++) {
+                                        ForecastVo previousVo1 = previousVos1.get(i);
+                                        ForecastVo currentVo1 = vos4.get(i);
+                                        if (previousVo1 != null && currentVo1 != null) {
+
+                                            if (previousVo1.getSjgl() != null && currentVo1.getSjgl() != null) {
+                                                currentVo1.setSjgl(StringUtils.round(previousVo1.getSjgl() + currentVo1.getSjgl(),2));
+                                            }
+                                            if (previousVo1.getYcgl() != null && currentVo1.getYcgl() != null) {
+                                                currentVo1.setYcgl(StringUtils.round(previousVo1.getYcgl() + currentVo1.getYcgl(),2));
+                                            }
 
+                                        }
                                     }
                                 }
-                            }
-                        } else if (wpId.contains("PTZ_FDC_STA")) {
-                            if (map.containsKey("SXJ_KGDL_PTZ_FDC_STA")) {
-                                List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_PTZ_FDC_STA");
-                                for (int i = 0; i < vos3.size(); i++) {
-                                    ForecastVo previousVo1 = previousVos1.get(i);
-                                    ForecastVo currentVo1 = vos3.get(i);
-                                    if (previousVo1 != null && currentVo1 != null) {
-                                        if (previousVo1.getSjgl() != null && currentVo1.getSjgl() != null) {
-                                            currentVo1.setSjgl(StringUtils.round(previousVo1.getSjgl() + currentVo1.getSjgl(),2));
-                                        }
-                                        if (previousVo1.getYcgl() != null && currentVo1.getYcgl() != null) {
-                                            currentVo1.setYcgl(StringUtils.round(previousVo1.getYcgl() + currentVo1.getYcgl(),2));
-                                        }
+                            } else if (wpId.contains("PTZ_FDC_STA")) {
+                                if (map.containsKey("SXJ_KGDL_PTZ_FDC_STA")) {
+                                    List<ForecastVo> previousVos1 = (List<ForecastVo>) map.get("SXJ_KGDL_PTZ_FDC_STA");
+                                    for (int i = 0; i < vos3.size(); i++) {
+                                        ForecastVo previousVo1 = previousVos1.get(i);
+                                        ForecastVo currentVo1 = vos3.get(i);
+                                        if (previousVo1 != null && currentVo1 != null) {
+                                            if (previousVo1.getSjgl() != null && currentVo1.getSjgl() != null) {
+                                                currentVo1.setSjgl(StringUtils.round(previousVo1.getSjgl() + currentVo1.getSjgl(),2));
+                                            }
+                                            if (previousVo1.getYcgl() != null && currentVo1.getYcgl() != null) {
+                                                currentVo1.setYcgl(StringUtils.round(previousVo1.getYcgl() + currentVo1.getYcgl(),2));
+                                            }
 
+                                        }
                                     }
                                 }
                             }
-                        }
 
-                        if (wpId.contains("GJY")) {
-                            map.put("SXJ_KGDL_GJY_FDC_STA", vos1);
+                            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("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("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("TZ_GDC_STA")) {
+                                map.put("SXJ_KGDL_TZ_GDC_STA", vos2);
+                            }
 
-                        if (wpId.contains("SY")) {
-                            map.put("SXJ_KGDL_SY_GDC_STA", vos5);
-                        }
+                            if (wpId.contains("SY")) {
+                                map.put("SXJ_KGDL_SY_GDC_STA", vos5);
+                            }
 
+                        }
                     }
-                }
 
-            } else {
-                for (ProBasicPowerstation wp : station) {
-                    vos = new ArrayList<>();
+                } else {
+                    for (ProBasicPowerstation wp : station) {
+                        vos = new ArrayList<>();
 
-                    Map<String, ProBasicPowerstationPoint> proBasicWppointMap = wppointmap.get(wp.getId());
-                    ProBasicPowerstationPoint ycgl1 = null;
-                    ProBasicPowerstationPoint sjgl1 = null;
+                        Map<String, ProBasicPowerstationPoint> proBasicWppointMap = wppointmap.get(wp.getId());
+                        ProBasicPowerstationPoint ycgl1 = null;
+                        ProBasicPowerstationPoint sjgl1 = null;
 
-                    if (wpId.endsWith("FDC_STA") && type.equals("F")) {
-                        ycgl1 = proBasicWppointMap.get( ContantXk.GLYC);
-                        sjgl1 = proBasicWppointMap.get(ContantXk.PJGL15);
-                    }
-                    if (wpId.endsWith("GDC_STA") && type.equals("G")) {
-                        ycgl1 = proBasicWppointMap.get(ContantXk.GLYC);
-                        sjgl1 = proBasicWppointMap.get(ContantXk.PJGL15);
-                    }
-                    if (ycgl1 != null && sjgl1 != null) {
+                        if (wpId.endsWith("FDC_STA") && type.equals("F")) {
+                            ycgl1 = proBasicWppointMap.get( ContantXk.GLYC);
+                            sjgl1 = proBasicWppointMap.get(ContantXk.PJGL15);
+                        }
+                        if (wpId.endsWith("GDC_STA") && type.equals("G")) {
+                            ycgl1 = proBasicWppointMap.get(ContantXk.GLYC);
+                            sjgl1 = proBasicWppointMap.get(ContantXk.PJGL15);
+                        }
+                        if (ycgl1 != null && sjgl1 != null) {
+
+                            List<PointData> ycglls = edosUtil.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L);
+                            List<PointData> sjglls = edosUtil.getHistoryDatasSnap(sjgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L);
+                            double temp1 = 0;
+                            double temp2 = 0;
+                            double temp3 = 0;
+                            double temp4 = 0;
+                            double temp5 = 0;
+                            for (int i = 0; i < ycglls.size(); i++) {
+
+                                ForecastVo vo = new ForecastVo();
+                                vo.setSjgl(0.0); //实际功率
+                                vo.setYcgl(0.0); //功率预测
 
-                        List<PointData> ycglls = edosUtil.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L);
-                        List<PointData> sjglls = edosUtil.getHistoryDatasSnap(sjgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L);
-                        double temp1 = 0;
-                        double temp2 = 0;
-                        double temp3 = 0;
-                        double temp4 = 0;
-                        double temp5 = 0;
-                        for (int i = 0; i < ycglls.size(); i++) {
+                                vo.setHours(2023L);  //时间戳
+                                vo.setName(wpId);
 
-                            ForecastVo vo = new ForecastVo();
-                            vo.setSjgl(0.0); //实际功率
-                            vo.setYcgl(0.0); //功率预测
 
-                            vo.setHours(2023L);  //时间戳
-                            vo.setName(wpId);
+                                if (ycglls != null && !ycglls.isEmpty() && i < ycglls.size() && ycglls.get(i).getPointName() != null) {
+                                    temp3 = ycglls.get(i).getPointValueInDouble();
+                                    vo.setYcgl(StringUtils.round(temp3, 2));
+                                }
+                                if (sjglls != null && !sjglls.isEmpty() && i < sjglls.size() && sjglls.get(i).getPointName() != null) {
+                                    temp4 = sjglls.get(i).getPointValueInDouble();
+                                    vo.setSjgl(StringUtils.round(temp4 / 1000, 2));
+                                }
+                                vo.setHours(ycglls.get(i).getPointTime());
 
+                                vo.setName(wp.getAname());
+                                vo.setId(wpId);
 
-                            if (ycglls != null && !ycglls.isEmpty() && i < ycglls.size() && ycglls.get(i).getPointName() != null) {
-                                temp3 = ycglls.get(i).getPointValueInDouble();
-                                vo.setYcgl(StringUtils.round(temp3, 2));
+                                vos.add(vo);
                             }
-                            if (sjglls != null && !sjglls.isEmpty() && i < sjglls.size() && sjglls.get(i).getPointName() != null) {
-                                temp4 = sjglls.get(i).getPointValueInDouble();
-                                vo.setSjgl(StringUtils.round(temp4 / 1000, 2));
-                            }
-                            vo.setHours(ycglls.get(i).getPointTime());
-
-                            vo.setName(wp.getAname());
-                            vo.setId(wpId);
+                            map.put(wp.getId(), vos);
 
-                            vos.add(vo);
                         }
-                        map.put(wp.getId(), vos);
-
                     }
                 }
             }
-        }
 
-        List<ProEconStationPower> stringList = new ArrayList<>();
-        Date currenttime = new Date();
-        for (Map.Entry<String, Object> entry : map.entrySet()) {
-            String key = entry.getKey();
-
-            List<ProBasicPowerstation> powerstations = CacheContext.wpls;
-            for (ProBasicPowerstation p1 : powerstations){
-                if (key.equals(p1.getId())) {
-                    ArrayList<ForecastVo> forecastVos = (ArrayList<ForecastVo>) entry.getValue();
-
-                    double[] sjglarr=new double[forecastVos.size()];
-                    double[] ycglarr=new double[forecastVos.size()];
-                    double dlycTotal = 0.0; // 累加的总值
-                    for (int i=0;i< forecastVos.size();i++) {
-                        ForecastVo forecastVo=forecastVos.get(i);
-                        sjglarr[i]=forecastVo.getSjgl();
-                        ycglarr[i]=forecastVo.getYcgl();
-                        double dlyc = 24.0 * forecastVo.getYcgl() / forecastVos.size(); // 每次循环的值
-                        dlycTotal += dlyc; // 累加每次循环的值
-                    }
+            List<ProEconStationPower> stringList = new ArrayList<>();
+//        Date currenttime = new Date();
+            for (Map.Entry<String, Object> entry : map.entrySet()) {
+                String key = entry.getKey();
+
+                List<ProBasicPowerstation> powerstations = CacheContext.wpls;
+                for (ProBasicPowerstation p1 : powerstations){
+                    if (key.equals(p1.getId())) {
+                        ArrayList<ForecastVo> forecastVos = (ArrayList<ForecastVo>) entry.getValue();
+
+                        Map<Integer,Double> gl = new TreeMap<>();
+                        double[] sjglarr=new double[forecastVos.size()];
+                        double[] ycglarr=new double[forecastVos.size()];
+                        double dlycTotal = 0.0; // 累加的总值
+                        for (int i=0;i< forecastVos.size();i++) {
+                            ForecastVo forecastVo=forecastVos.get(i);
+                            sjglarr[i]=forecastVo.getSjgl();
+                            ycglarr[i]=forecastVo.getYcgl();
+
+                            gl.put(i,forecastVo.getYcgl());
+                            double dlyc = 24.0 * forecastVo.getYcgl() / forecastVos.size(); // 每次循环的值
+                            dlycTotal += dlyc; // 累加每次循环的值
+                        }
+                        double energy = powerIntegration.calculateEnergy(gl, 0.25);
 
-                    double Capacity = p1.getJrwindCapacity();
+                        double Capacity = p1.getJrwindCapacity();
 
 
-                    double accuracy = shortTermPowerPredictionAccuracyCalculator.calculateAccuracy(ycglarr,sjglarr, Capacity);
+                        double accuracy = shortTermPowerPredictionAccuracyCalculator.calculateAccuracy(ycglarr,sjglarr, Capacity);
 
-                    ProEconStationPower power = new ProEconStationPower();
-                    power.setId(StringUtils.getUUID());
-                    power.setPowerAccuracy(BigDecimal.valueOf(accuracy));
-                    power.setWindpowerstationId(p1.getId());
-                    power.setRecordDate(beginDate);
-                    power.setDayPowerForecast(BigDecimal.valueOf(dlycTotal));
-                    stringList.add(power);
-                    powerService.batchAdd(stringList);
+                        ProEconStationPower power = new ProEconStationPower();
+                        power.setId(StringUtils.getUUID());
+                        power.setPowerAccuracy(BigDecimal.valueOf(accuracy));
+                        power.setWindpowerstationId(p1.getId());
+                        power.setRecordDate(beginDate);
+                        power.setDayPowerForecast(BigDecimal.valueOf(energy));
+                        stringList.add(power);
+                        powerService.batchAdd(stringList);
+                    }
                 }
             }
+            beginDate = DateUtils.addDays(beginDate, -1);
+            calendar.add(Calendar.DAY_OF_MONTH, -1);
+            endDate = calendar.getTime();
         }
     }
 }

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

@@ -46,4 +46,28 @@ public class ElectricityController {
         }
 
     }
+
+
+    @GetMapping("/coulometric")
+    @ResponseBody
+    @ApiOperation(value = "电量分析", notes = "电量分析")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "场站编号", required = true, dataType = "string", paramType = "query")
+    })
+
+    public AjaxResult coulometricgf(String wpId) throws Exception {
+
+
+        Map<String, Object> resultList = new LinkedHashMap<>();
+        if (StringUtils.notEmp(wpId)) {
+            resultList = electricityservice.coulometric(wpId);
+        }
+
+        if (null != resultList) {
+            return AjaxResult.successData(200, resultList);
+        } else {
+            return AjaxResult.error(500, "操作失败");
+        }
+
+    }
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Electricity/Electricityservice.java

@@ -266,4 +266,124 @@ public class Electricityservice {
 
     }
 
+    public    Map<String, Object>  coulometric(String wpId) throws Exception {
+
+        List<ProBasicPowerstation> wplsG = CacheContext.wplsG.stream().filter(g->wpId.equals(g.getId())).collect(Collectors.toList());
+        List<ElectricityVo> vos = new ArrayList<ElectricityVo>();
+        Map<String, Object> map = new LinkedHashMap<>();
+
+        int day = 0;
+        //当前年份
+        Calendar cal = Calendar.getInstance();
+        int currentyear = cal.get(Calendar.YEAR);//本年
+
+
+        //当月第一天0点值
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+
+        Date yearHour = calendar.getTime();
+
+        // 获取当前日期
+        Calendar calendar2 = Calendar.getInstance();
+        calendar2.setTime(new Date());
+
+        // 设置为本年一月一号0点
+        calendar2.set(Calendar.MONTH, Calendar.JANUARY); // 0表示一月
+        calendar2.set(Calendar.DAY_OF_MONTH, 1);
+        calendar2.set(Calendar.HOUR_OF_DAY, 0);
+        calendar2.set(Calendar.MINUTE, 0);
+        calendar2.set(Calendar.SECOND, 0);
+        calendar2.set(Calendar.MILLISECOND, 0);
+        Date firstDayZeroHour = calendar2.getTime();
+
+
+        int currentYear = calendar2.get(Calendar.YEAR);
+        int currentMonth = calendar2.get(Calendar.MONTH) + 1;
+
+//        int daysInMonth = calendar3.getActualMaximum(Calendar.DAY_OF_MONTH);
+
+        for (int i = 1; i <= 12; i++) {
+
+            //本月计划电量
+            double byjhdlsum = 0.0;
+
+            //年电量
+            double yeardlsum = 0.0;
+
+            //本月实际电量合计
+            double bysjdlhjsum = 0.0;
+
+            //本月日照强度合计
+            double byrzqdhjsum = 0.0;
+
+            BigDecimal dqzqlsum = null;
+            BigDecimal rfdlyclsum = null;
+
+            day = i;
+            for (ProBasicPowerstation wpls : wplsG) {
+
+                //计划电量-循环所有场站当前月集合
+                List<ProBasicProjectPlan> currentls = proBasicProjectPlanService.getmonthList(String.valueOf(day));
+
+                List<ProBasicProjectPlan> yearls = proBasicProjectPlanService.getList(String.valueOf(currentyear));
+                List<ProBasicProjectPlan> yearjh = yearls.stream().filter(wp -> wp.getWindpowerstationId().equals(wpls.getId()))
+                        .collect(Collectors.toList()); //当前场站1-12月所有集合
+
+                yeardlsum += yearjh.stream().mapToDouble(ProBasicProjectPlan::getGeneratingCapacity).sum(); //本年计划电量合
+
+
+                //当前场站循环当前月
+                List<ProBasicProjectPlan> currentjh = currentls.stream().filter(wp -> wp.getWindpowerstationId().equals(wpls.getId())).collect(Collectors.toList());
+                byjhdlsum += currentjh.stream().mapToDouble(ProBasicProjectPlan::getGeneratingCapacity).sum(); //本月计划电量合
+
+
+                //当前场站循环月实际电量
+                List<ProEconPowerstationInfoDay5> sjdlls = proEconPowerstationInfoDay5Service.getmax(wpls.getId(),firstDayZeroHour);
+                if (!sjdlls.isEmpty() && sjdlls !=null) {
+                    bysjdlhjsum += sjdlls.get(0).getYfdldb().doubleValue();
+                }
+
+                //当前场站循环月日照强度
+                List<ProEconPowerstationInfoDay1> rzqdls = proEconPowerstationInfoDay1Service.getmax(wpls.getId(),firstDayZeroHour);
+                if (!rzqdls.isEmpty() && rzqdls !=null) {
+                    byrzqdhjsum += rzqdls.get(0).getYpjfs().doubleValue();
+                }
+
+            }
+
+//            int ts = daysInMonth;
+
+            ElectricityVo vo = new ElectricityVo();
+
+            //添加计划电量
+            vo.setJhdl(StringUtils.round(byjhdlsum, 2));
+            vo.setHours(i);
+            //添加实际电量
+            vo.setSjdl(StringUtils.round(bysjdlhjsum /10000,2));
+
+
+            //添加当月占比
+            vo.setDyzb(StringUtils.round(((bysjdlhjsum / 10000)/byjhdlsum ) *100,0));
+
+//            //添加全年占比
+//            vo.setQnzb(StringUtils.round(((bysjdlhjsum / 10000) / yeardlsum) *100,0));
+
+            //添加日发电量预测
+            vo.setRfdlyc(BigDecimal.valueOf(byrzqdhjsum));
+
+            firstDayZeroHour = DateUtils.addMonths(firstDayZeroHour, +1);
+
+            vos.add(vo);
+            SortUtils.sort(vos, "hours", SortUtils.ASC);
+            map.put("value",vos);
+        }
+        return map;
+    }
+
     }

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

@@ -110,15 +110,12 @@ public class ProEconPowerstationInfoDay5ServiceImpl extends ServiceImpl<ProEconP
 
         Date endOfDayOfLastDayOfMonth = calendar.getTime();
 
-// 获取当前日期的年份和月份
+        // 获取当前日期的年份和月份
         int currentYear = Calendar.getInstance().get(Calendar.YEAR);
         int currentMonth = Calendar.getInstance().get(Calendar.MONTH)+1;
 
-//// 获取指定日期的年份和月份
-//        int specifiedYear = calendar.get(Calendar.YEAR);
-//        int specifiedMonth = calendar.get(Calendar.MONTH);
 
-// 判断指定日期是否是当前月份
+        // 判断指定日期是否是当前月份
         if (currentYear == specifiedYear && currentMonth == specifiedMonth) {
             // 如果是当前月份，则将endOfDayOfLastDayOfMonth减去一天
             Calendar calendar2 = Calendar.getInstance();  // 创建 Calendar 对象，表示当前时间

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MonitorService.java

@@ -2022,7 +2022,54 @@ public class MonitorService {
             BigDecimal gfnf =null;
             BigDecimal gfyf =null;
 
-
+            // 获取当前日期 暂时
+            Date currentDate5 = new Date();
+
+            // 创建 Calendar 对象，并设置为当前日期
+            Calendar calendar5 = Calendar.getInstance();
+            calendar5.setTime(currentDate5);
+
+            // 设置 beginDate 为前一天的早上六点
+            calendar5.add(Calendar.DAY_OF_MONTH, -1);
+            calendar5.set(Calendar.HOUR_OF_DAY, 6);
+            calendar5.set(Calendar.MINUTE, 0);
+            calendar5.set(Calendar.SECOND, 0);
+            calendar5.set(Calendar.MILLISECOND, 0);
+            Date beginDate = calendar5.getTime();
+
+            // 设置 endDate 为当天的23点59分59秒
+            calendar5.set(Calendar.HOUR_OF_DAY, 23);
+            calendar5.set(Calendar.MINUTE, 59);
+            calendar5.set(Calendar.SECOND, 59);
+            calendar5.set(Calendar.MILLISECOND, 999);
+            Date endDate = calendar5.getTime();
+
+
+            Calendar calendar6 = Calendar.getInstance();
+            calendar6.setTime(currentDate5);
+
+            // 设置 beginDate 为前一天的早上六点
+            calendar6.add(Calendar.DAY_OF_MONTH, 0);
+            calendar6.set(Calendar.HOUR_OF_DAY, 6);
+            calendar6.set(Calendar.MINUTE, 0);
+            calendar6.set(Calendar.SECOND, 0);
+            calendar6.set(Calendar.MILLISECOND, 0);
+            Date beginDate1 = calendar6.getTime();
+
+            // 设置 endDate 为当天的23点59分59秒
+            calendar6.set(Calendar.HOUR_OF_DAY, 23);
+            calendar6.set(Calendar.MINUTE, 59);
+            calendar6.set(Calendar.SECOND, 59);
+            calendar6.set(Calendar.MILLISECOND, 999);
+            Date endDate1 = calendar6.getTime();
+
+            List<ProEconPowerstationInfoDay5> qwt3 = null;
+
+            QueryWrapper<ProEconPowerstationInfoDay5> qw3 = new QueryWrapper<>();
+
+            qw3.lambda().eq(ProEconPowerstationInfoDay5::getForeignKeyId, wpId);
+            qw3.lambda().between(ProEconPowerstationInfoDay5::getRecordDate, beginDate, endDate);
+            qwt3 = proEconPowerstationInfoDay5Service.list(qw3);
 
             if (wpId.endsWith(QS) || wpId.endsWith(FD) || wpId.endsWith(GF)) {
 
@@ -2061,47 +2108,6 @@ public class MonitorService {
                 qwt = proEconTargetdataFristService.list(qw);
 
 
-                // 获取当前日期 暂时
-                Date currentDate5 = new Date();
-
-                // 创建 Calendar 对象，并设置为当前日期
-                Calendar calendar5 = Calendar.getInstance();
-                calendar5.setTime(currentDate5);
-
-                // 设置 beginDate 为前一天的早上六点
-                calendar5.add(Calendar.DAY_OF_MONTH, -1);
-                calendar5.set(Calendar.HOUR_OF_DAY, 6);
-                calendar5.set(Calendar.MINUTE, 0);
-                calendar5.set(Calendar.SECOND, 0);
-                calendar5.set(Calendar.MILLISECOND, 0);
-                Date beginDate = calendar5.getTime();
-
-                // 设置 endDate 为当天的23点59分59秒
-                calendar5.set(Calendar.HOUR_OF_DAY, 23);
-                calendar5.set(Calendar.MINUTE, 59);
-                calendar5.set(Calendar.SECOND, 59);
-                calendar5.set(Calendar.MILLISECOND, 999);
-                Date endDate = calendar5.getTime();
-
-
-                Calendar calendar6 = Calendar.getInstance();
-                calendar6.setTime(currentDate5);
-
-                // 设置 beginDate 为前一天的早上六点
-                calendar6.add(Calendar.DAY_OF_MONTH, 0);
-                calendar6.set(Calendar.HOUR_OF_DAY, 6);
-                calendar6.set(Calendar.MINUTE, 0);
-                calendar6.set(Calendar.SECOND, 0);
-                calendar6.set(Calendar.MILLISECOND, 0);
-                Date beginDate1 = calendar6.getTime();
-
-                // 设置 endDate 为当天的23点59分59秒
-                calendar6.set(Calendar.HOUR_OF_DAY, 23);
-                calendar6.set(Calendar.MINUTE, 59);
-                calendar6.set(Calendar.SECOND, 59);
-                calendar6.set(Calendar.MILLISECOND, 999);
-                Date endDate1 = calendar6.getTime();
-
                 QueryWrapper<ProEconPowerstationInfoDay5> qw1 = new QueryWrapper<>();
 
                 if (wpId.equals("KGDL_FGS0")){
@@ -2167,28 +2173,28 @@ public class MonitorService {
                             .sum();
                 }
 
-//                if (wpId.endsWith(QS)) {
-//                    fdstr = str.substring(0, str.indexOf("0")) + "-1";
-//                    gfstr = str.substring(0, str.indexOf("0")) + "-2";
-//                    ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(fdstr, ContantXk.RFDL);
-//                    rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
-//                    //月发电量
-//                    ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(fdstr, ContantXk.YFDL);
-//                    yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
-//                    //年发电量
-//                    ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(fdstr, ContantXk.NFDL);
-//                    nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
-//
-//                    ProBasicPowerstationPoint gfrfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(gfstr, ContantXk.RFDL);
-//                    gfrfdlsj = edosUtil.getRealData(gfrfdlvalue).getPointValueInDouble();
-//                    //月发电量
-//                    ProBasicPowerstationPoint gfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(gfstr, ContantXk.YFDL);
-//                    gfyfdlsj = edosUtil.getRealData(gfdlvalue).getPointValueInDouble();
-//                    //年发电量
-//                    ProBasicPowerstationPoint gfnfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(gfstr, ContantXk.NFDL);
-//                    gfnfdlsj = edosUtil.getRealData(gfnfdlvalue).getPointValueInDouble();
-//
-//                    if (fdrlr != 0 && fdylr != 0 && fdnlr != 0 && gfrlr != 0 && gfylr != 0 && gfnlr != 0) {
+                if (wpId.endsWith(QS)) {
+                    fdstr = str.substring(0, str.indexOf("0")) + "-1";
+                    gfstr = str.substring(0, str.indexOf("0")) + "-2";
+                    ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(fdstr, ContantXk.RFDL);
+                    rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
+                    //月发电量
+                    ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(fdstr, ContantXk.YFDL);
+                    yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
+                    //年发电量
+                    ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(fdstr, ContantXk.NFDL);
+                    nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
+
+                    ProBasicPowerstationPoint gfrfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(gfstr, ContantXk.RFDL);
+                    gfrfdlsj = edosUtil.getRealData(gfrfdlvalue).getPointValueInDouble();
+                    //月发电量
+                    ProBasicPowerstationPoint gfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(gfstr, ContantXk.YFDL);
+                    gfyfdlsj = edosUtil.getRealData(gfdlvalue).getPointValueInDouble();
+                    //年发电量
+                    ProBasicPowerstationPoint gfnfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(gfstr, ContantXk.NFDL);
+                    gfnfdlsj = edosUtil.getRealData(gfnfdlvalue).getPointValueInDouble();
+
+                    if (fdrlr != 0 && fdylr != 0 && fdnlr != 0 && gfrlr != 0 && gfylr != 0 && gfnlr != 0) {
 //                        fd_r_sjdl = fd_r_sjdl + fdrlr * 10000;
 //                        fd_y_sjdl = fd_y_sjdl + fdylr * 10000;
 //                        fd_n_sjdl = fd_n_sjdl + fdnlr * 10000;
@@ -2196,32 +2202,36 @@ public class MonitorService {
 //                        gf_r_sjdl = gf_r_sjdl + gfrlr * 10000;
 //                        gf_y_sjdl = gf_y_sjdl + gfylr * 10000;
 //                        gf_n_sjdl = gf_n_sjdl + gfnlr * 10000;
-//                    } else {
+
+                    } else {
 //                        fd_r_sjdl = fd_r_sjdl + rfdlsj;
 //                        fd_y_sjdl = fd_y_sjdl + yfdlsj;
 //                        fd_n_sjdl = fd_n_sjdl + nfdlsj;
-//
+
 //                        gf_r_sjdl = gf_r_sjdl + gfrfdlsj;
 //                        gf_y_sjdl = gf_y_sjdl + gfyfdlsj;
 //                        gf_n_sjdl = gf_n_sjdl + gfnfdlsj;
-//                    }
-//                } else if (wpId.endsWith(FD) || wpId.endsWith(GF)) {
-//                    ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.RFDL);
-//
-//                    rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
-//
-//                    //月发电量
-//                    ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.YFDL);
-//
-//                    yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
-//
-//
-//                    //年发电量
-//                    ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.NFDL);
-//
-//                    nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
-//
-//                    if (fdrlr != 0 && fdylr != 0 && fdnlr != 0 && gfrlr != 0 && gfylr != 0 && gfnlr != 0) {
+
+                        fd_r_sjdl1 = BigDecimal.valueOf(rfdlsj);
+                        gf_r_sjdl1 = BigDecimal.valueOf(gfrfdlsj);
+                    }
+                } else if (wpId.endsWith(FD) || wpId.endsWith(GF)) {
+                    ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.RFDL);
+
+                    rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
+
+                    //月发电量
+                    ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.YFDL);
+
+                    yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
+
+
+                    //年发电量
+                    ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.NFDL);
+
+                    nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
+
+                    if (fdrlr != 0 && fdylr != 0 && fdnlr != 0 && gfrlr != 0 && gfylr != 0 && gfnlr != 0) {
 //                        fd_r_sjdl = fd_r_sjdl + fdrlr * 10000;
 //                        fd_y_sjdl = fd_y_sjdl + fdylr * 10000;
 //                        fd_n_sjdl = fd_n_sjdl + fdnlr * 10000;
@@ -2229,7 +2239,7 @@ public class MonitorService {
 //                        gf_r_sjdl = gf_r_sjdl + gfrlr * 10000;
 //                        gf_y_sjdl = gf_y_sjdl + gfylr * 10000;
 //                        gf_n_sjdl = gf_n_sjdl + gfnlr * 10000;
-//                    } else {
+                    } else {
 //                        fd_r_sjdl = fd_r_sjdl + rfdlsj;
 //                        fd_y_sjdl = fd_y_sjdl + yfdlsj;
 //                        fd_n_sjdl = fd_n_sjdl + nfdlsj;
@@ -2237,8 +2247,11 @@ public class MonitorService {
 //                        gf_r_sjdl = gf_r_sjdl + rfdlsj;
 //                        gf_y_sjdl = gf_y_sjdl + yfdlsj;
 //                        gf_n_sjdl = gf_n_sjdl + nfdlsj;
-//                    }
-//                }
+
+                        fd_r_sjdl1 = BigDecimal.valueOf(rfdlsj);
+                        gf_r_sjdl1 = BigDecimal.valueOf(rfdlsj);
+                    }
+                }
 
                 for ( ProEconPowerstationInfoDay5 fdsj : qwt1){
                     if (fdsj.getForeignKeyId().equals("SXJ_KGDL_FLFD_ZGS0")){
@@ -2256,25 +2269,25 @@ public class MonitorService {
                     }
                 }
 
-                for ( ProEconPowerstationInfoDay5 fdsj : qwt2){
-                    if (fdsj.getForeignKeyId().equals("SXJ_KGDL_FLFD_ZGS0")){
-                        fd_r_sjdl1 = fdsj.getRfdldb();
-                    } else if (fdsj.getForeignKeyId().equals("SXJ_KGDL_GFFD_ZGS0")) {
-                        gf_r_sjdl1 = fdsj.getRfdldb();
-                    }else if (fdsj.getForeignKeyId().equals("SXJ_RGN-2")) {
-                        gf_r_sjdl1 = fdsj.getRfdldb();
-                    } else if (fdsj.getForeignKeyId().equals("SXJ_RGN-1")) {
-                        fd_r_sjdl1 = fdsj.getRfdldb();
-                    }
-                }
+//                for ( ProEconPowerstationInfoDay5 fdsj : qwt2){
+//                    if (fdsj.getForeignKeyId().equals("SXJ_KGDL_FLFD_ZGS0")){
+//                        fd_r_sjdl1 = fdsj.getRfdldb();
+//                    } else if (fdsj.getForeignKeyId().equals("SXJ_KGDL_GFFD_ZGS0")) {
+//                        gf_r_sjdl1 = fdsj.getRfdldb();
+//                    }else if (fdsj.getForeignKeyId().equals("SXJ_RGN-2")) {
+//                        gf_r_sjdl1 = fdsj.getRfdldb();
+//                    } else if (fdsj.getForeignKeyId().equals("SXJ_RGN-1")) {
+//                        fd_r_sjdl1 = fdsj.getRfdldb();
+//                    }
+//                }
                 if (wpId.endsWith("0") ||wpId.endsWith("-1")) {
-                    fd_r_sjdl1 = fd_r_sjdl1;
+//                    fd_r_sjdl1 = fd_r_sjdl1;
                     fd_y_sjdl1 = fdyf.add(fd_r_sjdl1);
                     fd_n_sjdl1 = fdnf.add(fd_r_sjdl1);
                 }
 
                 if (wpId.endsWith("0") ||wpId.endsWith("-2")) {
-                    gf_r_sjdl1 = gf_r_sjdl1;
+//                    gf_r_sjdl1 = gf_r_sjdl1;
                     gf_y_sjdl1 = gfyf.add(gf_r_sjdl1);
                     gf_n_sjdl1 = gfnf.add(gf_r_sjdl1);
                 }
@@ -2305,16 +2318,28 @@ public class MonitorService {
                         //日发电量
                         ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.RFDL);
                         rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
-                        //月发电量
-                        ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.YFDL);
-                        yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
-                        //年发电量
-                        ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.NFDL);
-                        nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
+//                        //月发电量
+//                        ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.YFDL);
+//                        yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
+//                        //年发电量
+//                        ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.NFDL);
+//                        nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
+
+
+                        BigDecimal yfdl2 = null;
+                        BigDecimal nfdl2 = null;
+                        for (ProEconPowerstationInfoDay5 dla :qwt3){
+                            yfdl2 = dla.getYfdldb();
+                            nfdl2 = dla.getNfdldb();
+                        }
 
                         fd_r_sjdl1 = BigDecimal.valueOf(rfdlsj);
-                        fd_y_sjdl1 = BigDecimal.valueOf(yfdlsj);
-                        fd_n_sjdl1 = BigDecimal.valueOf(nfdlsj);
+                        fd_y_sjdl1 = yfdl2.add(BigDecimal.valueOf(rfdlsj));
+                        fd_n_sjdl1 = nfdl2.add(BigDecimal.valueOf(rfdlsj));
+
+//                        fd_r_sjdl1 = BigDecimal.valueOf(rfdlsj);
+//                        fd_y_sjdl1 = BigDecimal.valueOf(yfdlsj);
+//                        fd_n_sjdl1 = BigDecimal.valueOf(nfdlsj);
                     }
                     fd_r_jhdl = fd_r_jhdl + yfdljh / 30;
                     fd_y_jhdl = fd_y_jhdl + yfdljh;
@@ -2327,17 +2352,28 @@ public class MonitorService {
                         //日发电量
                         ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.RFDL);
                         rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
-                        //月发电量
-                        ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.YFDL);
-                        yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
-
-                        //年发电量
-                        ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.NFDL);
-                        nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
+//                        //月发电量
+//                        ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.YFDL);
+//                        yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
+//
+//                        //年发电量
+//                        ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.NFDL);
+//                        nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
+//
+//                        gf_r_sjdl1 = BigDecimal.valueOf(rfdlsj);
+//                        gf_y_sjdl1 = BigDecimal.valueOf(yfdlsj);
+//                        gf_n_sjdl1 = BigDecimal.valueOf(nfdlsj);
+
+                        BigDecimal yfdl2 = null;
+                        BigDecimal nfdl2 = null;
+                        for (ProEconPowerstationInfoDay5 dla :qwt3){
+                            yfdl2 = dla.getYfdldb();
+                            nfdl2 = dla.getNfdldb();
+                        }
 
                         gf_r_sjdl1 = BigDecimal.valueOf(rfdlsj);
-                        gf_y_sjdl1 = BigDecimal.valueOf(yfdlsj);
-                        gf_n_sjdl1 = BigDecimal.valueOf(nfdlsj);
+                        gf_y_sjdl1 = yfdl2.add(BigDecimal.valueOf(rfdlsj));
+                        gf_n_sjdl1 = nfdl2.add(BigDecimal.valueOf(rfdlsj));
                     }
                     gf_r_jhdl = gf_r_jhdl + yfdljh / 30;
                     gf_y_jhdl = gf_y_jhdl + yfdljh;

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/StationMonitorService.java

@@ -214,18 +214,18 @@ public class StationMonitorService {
         double rfdl = realData.get(21).getPointValueInDouble();
         rfdl = new BigDecimal(rfdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
 
-        rfdl1 = rfdl1.divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP);
+//        rfdl1 = rfdl1.divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP);
 
-//        resultMap.put("rfdl", rfdl);
-        resultMap.put("rfdl",rfdl1 );
+        resultMap.put("rfdl", rfdl);
+//        resultMap.put("rfdl",rfdl1 );
         double yfdl = realData.get(22).getPointValueInDouble();
         yfdl = new BigDecimal(yfdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
         yfdl1 = yfdl1.divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP);
-        resultMap.put("yfdl", yfdl1.add(rfdl1));
+        resultMap.put("yfdl", yfdl1.add(BigDecimal.valueOf(rfdl)));
         double nfdl = realData.get(23).getPointValueInDouble();
         nfdl = new BigDecimal(nfdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
         nfdl1 = nfdl1.divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP);
-        resultMap.put("nfdl", nfdl1.add(rfdl1));
+        resultMap.put("nfdl", nfdl1.add(BigDecimal.valueOf(rfdl)));
         resultMap.put("sspjfsgzd", realData.get(24).getPointValueInDouble());
         resultMap.put("yggl", MathUtil.twoBit(realData.get(25).getPointValueInDouble() /1000));
         resultMap.put("fhl", (proBasicPowerstation.getJrwindCapacity() + proBasicPowerstation.getJrCapacity()) != 0 ? realData.get(25).getPointValueInDouble() / (proBasicPowerstation.getJrwindCapacity() + proBasicPowerstation.getJrCapacity()) * 100 : 0);