系统效率部分代码

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

@@ -1,14 +1,18 @@
 package com.gyee.runeconomy.service.Comprehensive;
 
 
+import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.DateUtils;
 import com.gyee.common.util.SortUtils;
 import com.gyee.runeconomy.dto.ComprehensiveVo;
 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.ProEconPowerstationInfoDay5;
+import com.gyee.runeconomy.service.auto.IProBasicPowerstationPointService;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay5Service;
+import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -20,6 +24,12 @@ public class ComprehensiveelectricityService {
     @Resource
     private IProEconPowerstationInfoDay5Service proEconPowerstationInfoDay5Service;
 
+    @Resource
+    private IProBasicPowerstationPointService proBasicPowerstationPointService;
+
+    @Resource
+    private IEdosUtil edosUtil;
+
     public Map<String, Object> Comprehensive(String wpId, String year) throws Exception {
 
         List<ProBasicPowerstation> wpls = CacheContext.wpls.stream().filter(g -> wpId.equals(g.getId())).collect(Collectors.toList());
@@ -46,6 +56,15 @@ public class ComprehensiveelectricityService {
         calendar1.set(Calendar.MILLISECOND, 0);
         Date firstDayZeroHour = calendar1.getTime();
 
+        // 获取firstDayZeroHour的月份
+        Calendar calFirstDayZeroHour = Calendar.getInstance();
+        calFirstDayZeroHour.setTime(firstDayZeroHour);
+        int calFirstMonth = calFirstDayZeroHour.get(Calendar.MONTH) + 1;
+        //当前时间月份
+        Calendar calendar = Calendar.getInstance();
+        int currentMonth = calendar.get(Calendar.MONTH);
+        currentMonth = currentMonth + 1;
+
 
         // 设置为年初一月一号0点，同比计算取值时间(减去一年，比今年计算少一年)
         Calendar calendar3 = Calendar.getInstance();
@@ -111,17 +130,28 @@ public class ComprehensiveelectricityService {
 
             for (ProBasicPowerstation wp : wpls) {
                 //当前场站本年循环所有指标取值集合
+
+                double rfdlsj = 0.0;
                 List<ProEconPowerstationInfoDay5> zbls = proEconPowerstationInfoDay5Service.getmax(wp.getId(), firstDayZeroHour);
                 List<ProEconPowerstationInfoDay5> tbzbls = proEconPowerstationInfoDay5Service.getmax(wp.getId(), tbjssj);
                 List<ProEconPowerstationInfoDay5> hbzbls = proEconPowerstationInfoDay5Service.getmax(wp.getId(), hbjssj);
 
+
+                ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.RFDL);
+                rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
+
                 if (!zbls.isEmpty() && zbls != null) {
                     //综合场用电量取值
                     zhcydl = zbls.get(0).getYzhcydldb().doubleValue() / 10000;
                     zhcydlsum += zhcydl;
                     //发电量取值
-                    sjdl = zbls.get(0).getYfdldb().doubleValue() / 10000;
-                    sjdlsum += sjdl;
+                    if (calFirstMonth == currentMonth && currentyear == dqnf) {
+                        sjdl = (zbls.get(0).getYfdldb().doubleValue() / 10000) + (rfdlsj / 10000);
+                    } else {
+                        sjdl = zbls.get(0).getYfdldb().doubleValue() / 10000;
+                    }
+                        sjdlsum += sjdl;
+
                     //上网电量取值
                     swdl = zbls.get(0).getYswdldb().doubleValue() / 10000;
                     swdlsum += swdl;
@@ -251,6 +281,8 @@ public class ComprehensiveelectricityService {
 
             }
             firstDayZeroHour = DateUtils.addMonths(firstDayZeroHour, 1);
+            calFirstDayZeroHour.setTime(firstDayZeroHour);
+            calFirstMonth = calFirstDayZeroHour.get(Calendar.MONTH) + 1;
             hbjssj = DateUtils.addMonths(hbjssj, 1);
             tbjssj = DateUtils.addMonths(tbjssj, 1);
         }

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

@@ -1,14 +1,17 @@
 package com.gyee.runeconomy.service.Comprehensive;
 
+import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.DateUtils;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.service.auto.IProBasicPowerstationPointService;
 import com.gyee.runeconomy.service.auto.IProEconEquipmentInfoDay1Service;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay1Service;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay5Service;
 import com.gyee.runeconomy.service.auto.impl.ProEconSystemEfficiencyEquipmentServiceImpl;
 import com.gyee.runeconomy.service.auto.impl.ProEconSystemEfficiencyServiceImpl;
+import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -34,6 +37,11 @@ public class PVSystemEfficiencyCalculator {
     @Resource
     private ProEconSystemEfficiencyEquipmentServiceImpl efficiencyEquipmentService;
 
+    @Resource
+    private IProBasicPowerstationPointService proBasicPowerstationPointService;
+
+    @Resource
+    private IEdosUtil edosUtil;
     public void planvalue() throws Exception {
 
         String year = "2023";
@@ -91,10 +99,13 @@ public class PVSystemEfficiencyCalculator {
                     ts = calFirstDayZeroHour.getActualMaximum(Calendar.DAY_OF_MONTH);
                 }
 
+                double rfdlsj = 0.0;
                 List<ProEconPowerstationInfoDay5> day5List = proEconPowerstationInfoDay5Service.getmax(wp.getId(), firstDayZeroHour);
 
                 List<ProEconPowerstationInfoDay1> rzqdls = proEconPowerstationInfoDay1Service.getmax(wp.getId(), firstDayZeroHour);
 
+                ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.RFDL);
+                rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
 
                 double solarRadiationWattsPerSquareMeter = 0.0; // 太阳能辐射，单位为W/m²
                 double actualPowerOutputKilowattHours = 0.0; // 实际发电量，单位为千瓦时(kWh)
@@ -102,7 +113,11 @@ public class PVSystemEfficiencyCalculator {
                 double pr = 0.0;
                 if (!day5List.isEmpty() && day5List != null) {
                     for (ProEconPowerstationInfoDay5 day : day5List) {
-                        actualPowerOutputKilowattHours = day.getYfdldb().doubleValue();
+                        if (calFirstMonth == currentMonth) {
+                            actualPowerOutputKilowattHours = day.getYfdldb().doubleValue() + rfdlsj;
+                        } else {
+                            actualPowerOutputKilowattHours = day.getYfdldb().doubleValue();
+                        }
                         date = day.getRecordDate();
                     }
                 }
@@ -183,9 +198,11 @@ public class PVSystemEfficiencyCalculator {
                     ts2 = calFirstDayZeroHour2.getActualMaximum(Calendar.DAY_OF_MONTH);
                 }
 
+                double rfdlsj = 0.0;
                 List<ProEconPowerstationInfoDay5> day5List = proEconPowerstationInfoDay5Service.getmax(pj.getId(), firstDayZeroHour2);
                 List<ProEconPowerstationInfoDay1> rzqdls = proEconPowerstationInfoDay1Service.getmax(pj.getId(), firstDayZeroHour2);
-
+                ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(pj.getId(), ContantXk.RFDL);
+                rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
                 double solarRadiationWattsPerSquareMeter = 0.0; // 太阳能辐射，单位为W/m²
                 double actualPowerOutputKilowattHours = 0.0; // 实际发电量，单位为千瓦时(kWh)
                 double moduleCapacityKilowatts = 0.0; // 光伏模块额定容量，单位为千瓦(kW)
@@ -193,7 +210,11 @@ public class PVSystemEfficiencyCalculator {
 
                 if (!day5List.isEmpty() && day5List != null) {
                     for (ProEconPowerstationInfoDay5 day : day5List) {
-                        actualPowerOutputKilowattHours = day.getYfdldb().doubleValue();
+                        if (calFirstMonth2 == currentMonth && dqnf == currentyear) {
+                            actualPowerOutputKilowattHours = day.getYfdldb().doubleValue() + rfdlsj;
+                        } else {
+                            actualPowerOutputKilowattHours = day.getYfdldb().doubleValue();
+                        }
                         date = day.getRecordDate();
                     }
                 }

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

@@ -1,5 +1,6 @@
 package com.gyee.runeconomy.service.Electricity;
 
+import com.gyee.common.contant.ContantXk;
 import com.gyee.common.util.DateUtils;
 import com.gyee.common.util.SortUtils;
 import com.gyee.runeconomy.dto.CoulometricVo;
@@ -82,8 +83,8 @@ public class Electricityservice {
                     int day = 0;
 
 //                    // 当前年份
-//                    Calendar cal = Calendar.getInstance();
-//                    int currentyear = cal.get(Calendar.YEAR);
+                    Calendar cal = Calendar.getInstance();
+                    int dqnf = cal.get(Calendar.YEAR);
                     int currentyear = Integer.parseInt(year);
 
                     // 当月第一天0点值
@@ -113,11 +114,20 @@ public class Electricityservice {
 
                     Date firstDayZeroHour = calendar2.getTime();
 
+                    // 获取firstDayZeroHour的月份
+                    Calendar calFirstDayZeroHour = Calendar.getInstance();
+                    calFirstDayZeroHour.setTime(firstDayZeroHour);
+                    int calFirstMonth = calFirstDayZeroHour.get(Calendar.MONTH) + 1;
+                    //当前时间月份
+                    Calendar calendar7 = Calendar.getInstance();
+                    int currentMonth = calendar7.get(Calendar.MONTH);
+                    currentMonth = currentMonth + 1;
 
                     for (int i = 1; i <= 12; i++) {
                         double bnjhdlsum = 0.0;
                         double yeardlsum = 0.0;
                         double bysjdlhjsum = 0.0;
+                        double rfdlsj = 0.0;
                         BigDecimal dqzqlsum = null;
                         BigDecimal rfdlyclsum = null;
                         day = i;
@@ -136,6 +146,8 @@ public class Electricityservice {
                             List<ProBasicProjectPlan> currentjh = currentls.stream().filter(wp -> wp.getWindpowerstationId().equals(wpls.getId())).collect(Collectors.toList());
                             bnjhdlsum += currentjh.stream().mapToDouble(ProBasicProjectPlan::getGeneratingCapacity).sum(); //本月计划电量合
 
+                            ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wpls.getId(), ContantXk.RFDL);
+                            rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
 
                             //实际电量
                             List<ProEconPowerstationInfoDay5> sjdlls = proEconPowerstationInfoDay5Service.getmax(wpls.getId(), firstDayZeroHour);
@@ -171,7 +183,11 @@ public class Electricityservice {
 //                        //添加实际电量
 //                        PointData data = edosUtil.getSectionData(month, endOfDayOfLastDayOfMonth.getTime());
 //                        PointData data = edosUtil.getSectionData(month, date1.getTime());
-                        vo.setSjdl(StringUtils.round(bysjdlhjsum / 10000, 2));
+                        if (calFirstMonth == currentMonth && currentyear == dqnf) {
+                            vo.setSjdl(StringUtils.round((bysjdlhjsum / 10000) + (rfdlsj /10000), 2));
+                        } else {
+                            vo.setSjdl(StringUtils.round(bysjdlhjsum / 10000, 2));
+                        }
 
 
                         //添加当月占比
@@ -195,6 +211,9 @@ public class Electricityservice {
 
                         firstDayZeroHour = DateUtils.addMonths(firstDayZeroHour, +1);
 
+                        calFirstDayZeroHour.setTime(firstDayZeroHour);
+                        calFirstMonth = calFirstDayZeroHour.get(Calendar.MONTH) + 1;
+
                         vos.add(vo);
                         SortUtils.sort(vos, "hours", SortUtils.ASC);
                         map.put("value", vos);
@@ -202,6 +221,7 @@ public class Electricityservice {
 
                     double yeardlsum = 0.0;
                     double bnsjdlhjsum = 0.0;
+                    double rfdlsjhj = 0.0;
                     BigDecimal dqzqlhjsum = null;
                     BigDecimal rfdlychjsum = null;
 
@@ -217,6 +237,10 @@ public class Electricityservice {
 //                        PointData bnsjdlhj = edosUtil.getHistMatrix(nfdl, currentDate.getTime() / 1000);
 //                        bnsjdlhjsum += bnsjdlhj.getPointValueInDouble();
 
+                        ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wpls.getId(), ContantXk.RFDL);
+                        rfdlsjhj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
+
+
                         List<ProEconPowerstationInfoDay5> sjdlls = proEconPowerstationInfoDay5Service.getmax(wpls.getId(), yearHour);
                         if (!sjdlls.isEmpty() && sjdlls != null) {
                             bnsjdlhjsum += sjdlls.get(0).getNfdldb().doubleValue();
@@ -239,7 +263,7 @@ public class Electricityservice {
                         }
                         map.put("bnjhdlhj", MathUtil.twoBit(yeardlsum));
                         map.put("rfdlychj", rfdlychjsum);
-                        map.put("bnsjdlhj", MathUtil.twoBit(bnsjdlhjsum / 10000));
+                        map.put("bnsjdlhj", MathUtil.twoBit((bnsjdlhjsum / 10000) + (rfdlsjhj / 10000)));
                         if (yeardlsum!=0) {
                             map.put("qnzbhj", StringUtils.round(((bnsjdlhjsum / 10000) / yeardlsum) * 100, 0));
                         } else {
@@ -316,6 +340,8 @@ public class Electricityservice {
 
         double bnsjdlhjsum = 0.0;
 
+        double rfdlsjhj = 0.0;
+
         double bnrzqdhjsum = 0.0;
 
         double dxxsssum = 0.0;
@@ -333,6 +359,8 @@ public class Electricityservice {
             //本月可研电量合计
             double bykydlhjsum = 0.0;
 
+            double rfdlsj = 0.0;
+
             if (calFirstMonth == currentMonth && dqnf==currentyear) {
                 Calendar calendar5 = Calendar.getInstance();
                 ts = calendar5.get(Calendar.DAY_OF_MONTH);
@@ -358,6 +386,8 @@ public class Electricityservice {
                 List<ProBasicFeasibilityStudy> currentky = currentkyls.stream().filter(wp -> wp.getWindpowerstationId().equals(wpls.getId())).collect(Collectors.toList());
                 bykydlhjsum = currentky.stream().mapToDouble(ProBasicFeasibilityStudy::getGeneratingCapacity).sum(); //本月可研电量合
 
+                ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wpls.getId(), ContantXk.RFDL);
+                rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
                 //当前场站循环月实际电量
                 List<ProEconPowerstationInfoDay5> sjdlls = proEconPowerstationInfoDay5Service.getmax(wpls.getId(), firstDayZeroHour);
                 if (!sjdlls.isEmpty() && sjdlls != null) {
@@ -381,7 +411,11 @@ public class Electricityservice {
             vo.setJhdl(StringUtils.round(byjhdlsum, 2));
             vo.setHours(i);
             //添加实际电量
-            vo.setSjdl(StringUtils.round(bysjdlhjsum / 10000, 2));
+            if (calFirstMonth == currentMonth && dqnf==currentyear) {
+                vo.setSjdl(StringUtils.round((bysjdlhjsum / 10000) + (rfdlsj / 10000), 2));
+            } else {
+                vo.setSjdl(StringUtils.round(bysjdlhjsum / 10000, 2));
+            }
             vo.setKydl(StringUtils.round(bykydlhjsum,2));
             //添加完成情况
             if (byjhdlsum != 0) {
@@ -421,6 +455,9 @@ public class Electricityservice {
         yeardlsum = yearjh.stream().mapToDouble(ProBasicProjectPlan::getGeneratingCapacity).sum();
         kyyeardlsum = kyyearjh.stream().mapToDouble(ProBasicFeasibilityStudy::getGeneratingCapacity).sum();
 
+        ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.RFDL);
+        rfdlsjhj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
+
         List<ProEconPowerstationInfoDay5> sjdlls = proEconPowerstationInfoDay5Service.getmax(wpId, yearHour);
         if (!sjdlls.isEmpty() && sjdlls != null) {
             bnsjdlhjsum += sjdlls.get(0).getNfdldb().doubleValue();
@@ -433,7 +470,7 @@ public class Electricityservice {
 
         map.put("jhdlhj",yeardlsum);
         map.put("kydlhj",kyyeardlsum);
-        map.put("sjdlhj",StringUtils.round((bnsjdlhjsum / 10000),2));
+        map.put("sjdlhj",StringUtils.round(((bnsjdlhjsum / 10000)) + (rfdlsjhj / 10000),2));
         if (yeardlsum != 0) {
             map.put("wcqkhj", StringUtils.round(((bnsjdlhjsum / 10000) / yeardlsum) * 100, 0));
         }else {

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

@@ -66,7 +66,7 @@ public class AnalysisNewService {
         calendar.set(Calendar.MILLISECOND, 0);
 
         // 设置 beginDate 为前一天的0点
-        calendar.add(Calendar.DAY_OF_MONTH, -1);
+        calendar.add(Calendar.DAY_OF_MONTH, -9);
         Date beginDate = calendar.getTime();
 
         // 设置 endDate 为当天的0点
@@ -77,9 +77,9 @@ public class AnalysisNewService {
         for (ProBasicPowerstation wp : CacheContext.wpls) {
 
 //            补充数据可将其打开
-//            if (wp.getId().equals("SXJ_KGDL_GJY_FDC_STA")) {
-//
-//                for (int g = 0; g <= 52; g++) {
+            if (wp.getId().equals("SXJ_KGDL_GJY_FDC_STA")) {
+
+                for (int g = 0; g <= 45; g++) {
 
             List<ProBasicMeterPoint> meterPoints = proBasicMeterPointService.getBaseMapper().selectList(null);
 
@@ -118,11 +118,13 @@ public class AnalysisNewService {
                     proEconAnalysisSubtableBottomService.batchAdd(stringList);
                 }
             }
-//                    beginDate = DateUtils.addDays(beginDate, -1);
-//                    calendar.add(Calendar.DAY_OF_MONTH, -1);
-//                    endDate = calendar.getTime();
-//                }
-//            }
+                    beginDate = DateUtils.addDays(beginDate, -1);
+                    calendar.add(Calendar.DAY_OF_MONTH, -1);
+                    endDate = calendar.getTime();
+                }
+            }
+
+
         }
     }