系统效率计算修改

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconSystemEfficiencyEquipment.java

@@ -1,5 +1,7 @@
 package com.gyee.generation.model.auto;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -20,6 +22,7 @@ public class ProEconSystemEfficiencyEquipment extends Model {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "id", type = IdType.INPUT)
     private String id;
 
     /**
@@ -100,4 +103,5 @@ public class ProEconSystemEfficiencyEquipment extends Model {
 
     private Integer orderNum;
 
+
 }

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

@@ -56,19 +56,30 @@ public class PVSystemEfficiencyCalculator {
         int dqnf = cal.get(Calendar.YEAR);//本年
 
         // 设置为本年一月一号0点
+//        Calendar calendar1 = Calendar.getInstance();
+//        calendar1.setTime(new Date());
+//        calendar1.set(Calendar.YEAR, currentyear); // 根据当前年份变化
+//        calendar1.set(Calendar.MONTH, Calendar.JANUARY); // 0表示一月
+//        calendar1.set(Calendar.DAY_OF_MONTH, 1);
+//        calendar1.set(Calendar.HOUR_OF_DAY, 0);
+//        calendar1.set(Calendar.MINUTE, 0);
+//        calendar1.set(Calendar.SECOND, 0);
+//        calendar1.set(Calendar.MILLISECOND, 0);
+//        Date firstDayZeroHour = calendar1.getTime();
+
+
         Calendar calendar1 = Calendar.getInstance();
         calendar1.setTime(new Date());
-        calendar1.set(Calendar.YEAR, currentyear); // 根据当前年份变化
-        calendar1.set(Calendar.MONTH, Calendar.JANUARY); // 0表示一月
-        calendar1.set(Calendar.DAY_OF_MONTH, 1);
+        calendar1.add(Calendar.DATE, -1);   // 设置为昨天的日期
         calendar1.set(Calendar.HOUR_OF_DAY, 0);
         calendar1.set(Calendar.MINUTE, 0);
         calendar1.set(Calendar.SECOND, 0);
         calendar1.set(Calendar.MILLISECOND, 0);
         Date firstDayZeroHour = calendar1.getTime();
 
+
         // 初始化初始值
-        Date initialFirstDayZeroHour = (Date) firstDayZeroHour.clone();
+//        Date initialFirstDayZeroHour = (Date) firstDayZeroHour.clone();
         // 获取firstDayZeroHour的月份
         Calendar calFirstDayZeroHour = Calendar.getInstance();
         calFirstDayZeroHour.setTime(firstDayZeroHour);
@@ -79,7 +90,7 @@ public class PVSystemEfficiencyCalculator {
         int currentMonth = calendar.get(Calendar.MONTH);
         currentMonth = currentMonth + 1;
 
-        List<ProBasicPowerstation> wplsG = CacheContext.wpls.stream().filter(w->w.getId().endsWith("GDC_STA")).collect(Collectors.toList());
+        List<ProBasicPowerstation> wplsG = CacheContext.wpls.stream().filter(w -> w.getId().endsWith("GDC_STA")).collect(Collectors.toList());
         List<ProBasicProject> pjlsG = CacheContext.pjls.stream().filter(p -> p.getSpare4().equals("2")).collect(Collectors.toList());
         List<ProBasicLine> lnlsG = CacheContext.lnls.stream().filter(p -> p.getSpare4().equals("2")).collect(Collectors.toList());
 //        List<ProBasicEquipment> wtlsG = CacheContext.wtls.stream().filter(p -> p.getSpare1().equals("IN")).collect(Collectors.toList());
@@ -88,7 +99,7 @@ public class PVSystemEfficiencyCalculator {
 //        计算场站级别
         for (ProBasicPowerstation wp : wplsG) {
 
-            for (int i = 0; i < currentMonth; i++) {
+//            for (int i = 0; i < currentMonth; i++) {
 
                 Date date = null;
                 List<ProEconSystemEfficiency> stringList = new ArrayList<>();
@@ -156,39 +167,40 @@ public class PVSystemEfficiencyCalculator {
                 stringList.add(power);
                 systemEfficiencyService.batchAdd(stringList);
 
-                firstDayZeroHour = DateUtils.addMonths(firstDayZeroHour, 1);
-                calFirstDayZeroHour.setTime(firstDayZeroHour);
-                calFirstMonth = calFirstDayZeroHour.get(Calendar.MONTH) + 1;
-                ts = calFirstDayZeroHour.getActualMaximum(Calendar.DAY_OF_MONTH);
-            }
+//                firstDayZeroHour = DateUtils.addMonths(firstDayZeroHour, 1);
+//                calFirstDayZeroHour.setTime(firstDayZeroHour);
+//                calFirstMonth = calFirstDayZeroHour.get(Calendar.MONTH) + 1;
+//                ts = calFirstDayZeroHour.getActualMaximum(Calendar.DAY_OF_MONTH);
+//            }
             // 恢复初始值
-            firstDayZeroHour = initialFirstDayZeroHour;
+//            firstDayZeroHour = initialFirstDayZeroHour;
         }
 
 //        计算期次级别
         int ts2 = 1; // 设置为本年一月一号0点
 
-        Calendar calendar2 = Calendar.getInstance();
-        calendar2.setTime(new Date());
-        calendar2.set(Calendar.YEAR, currentyear); // 根据当前年份变化
-        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 firstDayZeroHour2 = calendar2.getTime();
+//        Calendar calendar2 = Calendar.getInstance();
+//        calendar2.setTime(new Date());
+//        calendar2.set(Calendar.YEAR, currentyear); // 根据当前年份变化
+//        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 firstDayZeroHour2 = calendar2.getTime();
+
 
         // 初始化初始值
-        Date initialFirstDayZeroHour2 = (Date) firstDayZeroHour2.clone();
+        Date initialFirstDayZeroHour2 = (Date) firstDayZeroHour.clone();
 
         // 获取firstDayZeroHour的月份
         Calendar calFirstDayZeroHour2 = Calendar.getInstance();
-        calFirstDayZeroHour2.setTime(firstDayZeroHour2);
+        calFirstDayZeroHour2.setTime(firstDayZeroHour);
         int calFirstMonth2 = calFirstDayZeroHour2.get(Calendar.MONTH) + 1;
 
         for (ProBasicProject pj : pjlsG) {
-            for (int i = 0; i < currentMonth; i++) {
+//            for (int i = 0; i < currentMonth; i++) {
                 Date date = null;
                 List<ProEconSystemEfficiency> stringList = new ArrayList<>();
 
@@ -201,8 +213,8 @@ public class PVSystemEfficiencyCalculator {
                 }
 
                 double rfdlsj = 0.0;
-                List<ProEconPowerstationInfoDay5> day5List = proEconPowerstationInfoDay5Service.getmax(pj.getId(), firstDayZeroHour2);
-                List<ProEconPowerstationInfoDay1> rzqdls = proEconPowerstationInfoDay1Service.getmax(pj.getId(), firstDayZeroHour2);
+                List<ProEconPowerstationInfoDay5> day5List = proEconPowerstationInfoDay5Service.getmax(pj.getId(), firstDayZeroHour);
+                List<ProEconPowerstationInfoDay1> rzqdls = proEconPowerstationInfoDay1Service.getmax(pj.getId(), firstDayZeroHour);
                 ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(pj.getId(), ContantXk.RFDL);
                 rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
                 double solarRadiationWattsPerSquareMeter = 0.0; // 太阳能辐射，单位为W/m²
@@ -248,41 +260,42 @@ public class PVSystemEfficiencyCalculator {
                 systemEfficiencyService.batchAdd(stringList);
 
 
-                firstDayZeroHour2 = DateUtils.addMonths(firstDayZeroHour2, 1);
-                calFirstDayZeroHour2.setTime(firstDayZeroHour2);
-                calFirstMonth2 = calFirstDayZeroHour2.get(Calendar.MONTH) + 1;
-                ts2 = calFirstDayZeroHour2.getActualMaximum(Calendar.DAY_OF_MONTH);
-            }
-            // 恢复初始值
-            firstDayZeroHour2 = initialFirstDayZeroHour2;
+//                firstDayZeroHour = DateUtils.addMonths(firstDayZeroHour, 1);
+//                calFirstDayZeroHour2.setTime(firstDayZeroHour);
+//                calFirstMonth2 = calFirstDayZeroHour2.get(Calendar.MONTH) + 1;
+//                ts2 = calFirstDayZeroHour2.getActualMaximum(Calendar.DAY_OF_MONTH);
+//            }
+//            // 恢复初始值
+//            firstDayZeroHour = initialFirstDayZeroHour2;
         }
 
 
         //计算线路级别
         int ts3 = 1; // 设置为本年一月一号0点
+//
+//        Calendar calendar3 = Calendar.getInstance();
+//        calendar3.setTime(new Date());
+//        calendar3.set(Calendar.YEAR, currentyear); // 根据当前年份变化
+//        calendar3.set(Calendar.MONTH, Calendar.JANUARY); // 0表示一月
+//        calendar3.set(Calendar.DAY_OF_MONTH, 1);
+//        calendar3.set(Calendar.HOUR_OF_DAY, 0);
+//        calendar3.set(Calendar.MINUTE, 0);
+//        calendar3.set(Calendar.SECOND, 0);
+//        calendar3.set(Calendar.MILLISECOND, 0);
+//        Date firstDayZeroHour3 = calendar3.getTime();
 
-        Calendar calendar3 = Calendar.getInstance();
-        calendar3.setTime(new Date());
-        calendar3.set(Calendar.YEAR, currentyear); // 根据当前年份变化
-        calendar3.set(Calendar.MONTH, Calendar.JANUARY); // 0表示一月
-        calendar3.set(Calendar.DAY_OF_MONTH, 1);
-        calendar3.set(Calendar.HOUR_OF_DAY, 0);
-        calendar3.set(Calendar.MINUTE, 0);
-        calendar3.set(Calendar.SECOND, 0);
-        calendar3.set(Calendar.MILLISECOND, 0);
-        Date firstDayZeroHour3 = calendar3.getTime();
 
         // 初始化初始值
-        Date initialFirstDayZeroHour3 = (Date) firstDayZeroHour3.clone();
+        Date initialFirstDayZeroHour3 = (Date) firstDayZeroHour.clone();
 
         // 获取firstDayZeroHour的月份
         Calendar calFirstDayZeroHour3 = Calendar.getInstance();
-        calFirstDayZeroHour3.setTime(firstDayZeroHour3);
+        calFirstDayZeroHour3.setTime(firstDayZeroHour);
         int calFirstMonth3 = calFirstDayZeroHour3.get(Calendar.MONTH) + 1;
 
         for (ProBasicLine ln : lnlsG) {
-          List<ProBasicProject>  wpid = pjlsG.stream().filter(l->l.getId().equals(ln.getProjectId())).collect(Collectors.toList());
-            for (int i = 0; i < currentMonth; i++) {
+            List<ProBasicProject> wpid = pjlsG.stream().filter(l -> l.getId().equals(ln.getProjectId())).collect(Collectors.toList());
+//            for (int i = 0; i < currentMonth; i++) {
                 Date date = null;
                 List<ProEconSystemEfficiency> stringList = new ArrayList<>();
 
@@ -294,8 +307,8 @@ public class PVSystemEfficiencyCalculator {
                     ts3 = calFirstDayZeroHour3.getActualMaximum(Calendar.DAY_OF_MONTH);
                 }
 
-                List<ProEconPowerstationInfoDay5> day5List = proEconPowerstationInfoDay5Service.getmax(ln.getId(), firstDayZeroHour3);
-                List<ProEconPowerstationInfoDay1> rzqdls = proEconPowerstationInfoDay1Service.getmax(ln.getId(), firstDayZeroHour3);
+                List<ProEconPowerstationInfoDay5> day5List = proEconPowerstationInfoDay5Service.getmax(ln.getId(), firstDayZeroHour);
+                List<ProEconPowerstationInfoDay1> rzqdls = proEconPowerstationInfoDay1Service.getmax(ln.getId(), firstDayZeroHour);
 
                 double solarRadiationWattsPerSquareMeter = 0.0; // 太阳能辐射，单位为W/m²
                 double actualPowerOutputKilowattHours = 0.0; // 实际发电量，单位为千瓦时(kWh)
@@ -335,22 +348,21 @@ public class PVSystemEfficiencyCalculator {
                 power.setRzqd(solarRadiationWattsPerSquareMeter);
                 power.setEfficiency(pr);
                 stringList.add(power);
-                if (date!=null) {
+                if (date != null) {
                     systemEfficiencyService.batchAdd(stringList);
                 }
 
 
-                firstDayZeroHour3 = DateUtils.addMonths(firstDayZeroHour3, 1);
-                calFirstDayZeroHour3.setTime(firstDayZeroHour3);
-                calFirstMonth3 = calFirstDayZeroHour3.get(Calendar.MONTH) + 1;
-                ts3 = calFirstDayZeroHour3.getActualMaximum(Calendar.DAY_OF_MONTH);
-            }
-            // 恢复初始值
-            firstDayZeroHour3 = initialFirstDayZeroHour3;
+//                firstDayZeroHour = DateUtils.addMonths(firstDayZeroHour, 1);
+//                calFirstDayZeroHour3.setTime(firstDayZeroHour);
+//                calFirstMonth3 = calFirstDayZeroHour3.get(Calendar.MONTH) + 1;
+//                ts3 = calFirstDayZeroHour3.getActualMaximum(Calendar.DAY_OF_MONTH);
+//            }
+//            // 恢复初始值
+//            firstDayZeroHour = initialFirstDayZeroHour3;
         }
 
 
-
         //计算设备级别
         int ts4 = 1; // 设置为本年一月一号0点
 
@@ -391,85 +403,83 @@ public class PVSystemEfficiencyCalculator {
         int calFirstMonth4 = calFirstDayZeroHour4.get(Calendar.MONTH) + 1;
         Date date = null;
         List<ProEconSystemEfficiencyEquipment> stringList = new ArrayList<>();
-        for (ProBasicPowerstation wp : CacheContext.wpls.stream().filter(w->w.getId().endsWith("GDC_STA")).collect(Collectors.toList())) {
+        for (ProBasicPowerstation wp : wplsG) {
 
-                List<ProBasicEquipment> wtlsG = CacheContext.wtls.stream().filter(p -> p.getSpare1().equals("IN") && wp.getId().equals(p.getWindpowerstationId())).collect(Collectors.toList());
+            List<ProBasicEquipment> wtlsG = CacheContext.wtls.stream().filter(p -> p.getSpare1().equals("IN") && wp.getId().equals(p.getWindpowerstationId())).collect(Collectors.toList());
 
-                for (ProBasicEquipment wt : wtlsG) {
+            for (ProBasicEquipment wt : wtlsG) {
 
-                    List<ProEconEquipmentmodel> collect = CacheContext.equipmentmodels.stream().filter(w -> wt.getModelId().equals(w.getId())).collect(Collectors.toList());
+                List<ProEconEquipmentmodel> collect = CacheContext.equipmentmodels.stream().filter(w -> wt.getModelId().equals(w.getId())).collect(Collectors.toList());
 
 //            for (int i = 0; i < currentMonth; i++) {
 
 
-                    if (calFirstMonth4 == currentMonth && dqnf == currentyear) {
-                        Calendar calendar5 = Calendar.getInstance();
-                        ts4 = calendar5.get(Calendar.DAY_OF_MONTH);
-                    } else {
-                        // 获取当前月份的天数
-                        ts4 = calFirstDayZeroHour4.getActualMaximum(Calendar.DAY_OF_MONTH);
-                    }
+                if (calFirstMonth4 == currentMonth && dqnf == currentyear) {
+                    Calendar calendar5 = Calendar.getInstance();
+                    ts4 = calendar5.get(Calendar.DAY_OF_MONTH);
+                } else {
+                    // 获取当前月份的天数
+                    ts4 = calFirstDayZeroHour4.getActualMaximum(Calendar.DAY_OF_MONTH);
+                }
 
-                    List<ProEconEquipmentInfoDay1> rzqdls = proEconEquipmentInfoDay1Service.getmax(wt.getId(), firstDayZeroHour4);
+                List<ProEconEquipmentInfoDay1> rzqdls = proEconEquipmentInfoDay1Service.getmax(wt.getId(), firstDayZeroHour4);
 
-                    double solarRadiationWattsPerSquareMeter = 0.0; // 太阳能辐射，单位为W/m²
-                    double actualPowerOutputKilowattHours = 0.0; // 实际发电量，单位为千瓦时(kWh)
-                    double moduleCapacityKilowatts = 0.0; // 光伏模块额定容量，单位为千瓦(kW)
-                    double pr = 0.0;
+                double solarRadiationWattsPerSquareMeter = 0.0; // 太阳能辐射，单位为W/m²
+                double actualPowerOutputKilowattHours = 0.0; // 实际发电量，单位为千瓦时(kWh)
+                double moduleCapacityKilowatts = 0.0; // 光伏模块额定容量，单位为千瓦(kW)
+                double pr = 0.0;
 
-                    if (!rzqdls.isEmpty() && rzqdls != null) {
-                        for (ProEconEquipmentInfoDay1 day : rzqdls) {
-                            actualPowerOutputKilowattHours = day.getYfdl().doubleValue();
-                            solarRadiationWattsPerSquareMeter = day.getYpjfs().doubleValue();
-                            date = day.getRecordDate();
-                        }
+                if (!rzqdls.isEmpty() && rzqdls != null) {
+                    for (ProEconEquipmentInfoDay1 day : rzqdls) {
+                        actualPowerOutputKilowattHours = day.getYfdl().doubleValue();
+                        solarRadiationWattsPerSquareMeter = day.getYpjfs().doubleValue();
+                        date = day.getRecordDate();
                     }
+                }
 
 
-                    moduleCapacityKilowatts = collect.get(0).getPowerProduction();
+                moduleCapacityKilowatts = collect.get(0).getPowerProduction();
 
-                    double expectedPowerOutputKilowattHours = calculateExpectedPowerOutput(solarRadiationWattsPerSquareMeter, moduleCapacityKilowatts, ts4); // 预期发电量（kWh）
-                    pr = calculatePR(actualPowerOutputKilowattHours, expectedPowerOutputKilowattHours); // 计算PR
+                double expectedPowerOutputKilowattHours = calculateExpectedPowerOutput(solarRadiationWattsPerSquareMeter, moduleCapacityKilowatts, ts4); // 预期发电量（kWh）
+                pr = calculatePR(actualPowerOutputKilowattHours, expectedPowerOutputKilowattHours); // 计算PR
 
-                    pr = StringUtils.round(pr, 2);
-                    solarRadiationWattsPerSquareMeter = StringUtils.round(solarRadiationWattsPerSquareMeter, 2);
+                pr = StringUtils.round(pr, 2);
+                solarRadiationWattsPerSquareMeter = StringUtils.round(solarRadiationWattsPerSquareMeter, 2);
 
 
-                    ProEconSystemEfficiencyEquipment power = new ProEconSystemEfficiencyEquipment();
-                    if (date != null) {
-                        power.setId(StringUtils.getUUID());
-                        power.setForeignKeyId(wt.getNemCode());
-                        power.setStationId(wt.getWindpowerstationId());
-                        power.setProjectId(wt.getProjectId());
-                        power.setLineId(wt.getLineId());
-                        power.setEquipmentId(wt.getId());
-                        power.setLocation("wt");
-                        power.setDataDate(date);
-                        power.setPowerGeneration(actualPowerOutputKilowattHours);
-                        power.setLlfdlmax(expectedPowerOutputKilowattHours);
-                        power.setRzqd(solarRadiationWattsPerSquareMeter);
-                        power.setEfficiency(pr);
-                        power.setOrderNum(Integer.valueOf(wt.getOrderNum()));
-                        stringList.add(power);
-                    }
+                ProEconSystemEfficiencyEquipment power = new ProEconSystemEfficiencyEquipment();
+                if (date != null) {
+                    power.setId(StringUtils.getUUID());
+                    power.setForeignKeyId(wt.getNemCode());
+                    power.setStationId(wt.getWindpowerstationId());
+                    power.setProjectId(wt.getProjectId());
+                    power.setLineId(wt.getLineId());
+                    power.setEquipmentId(wt.getId());
+                    power.setLocation("wt");
+                    power.setDataDate(date);
+                    power.setPowerGeneration(actualPowerOutputKilowattHours);
+                    power.setLlfdlmax(expectedPowerOutputKilowattHours);
+                    power.setRzqd(solarRadiationWattsPerSquareMeter);
+                    power.setEfficiency(pr);
+                    power.setOrderNum(Integer.valueOf(wt.getOrderNum()));
+                    stringList.add(power);
+                }
 
 
 //
 //            firstDayZeroHour4 = DateUtils.addMonths(firstDayZeroHour4, 1);
 //            calFirstDayZeroHour4.setTime(firstDayZeroHour4);
 //            calFirstMonth4 = calFirstDayZeroHour4.get(Calendar.MONTH) + 1;
-                    ts4 = calFirstDayZeroHour4.getActualMaximum(Calendar.DAY_OF_MONTH);
+                ts4 = calFirstDayZeroHour4.getActualMaximum(Calendar.DAY_OF_MONTH);
 //        }
-                    // 恢复初始值
+                // 恢复初始值
 //            firstDayZeroHour4 = initialFirstDayZeroHour4;
-                }
+            }
             efficiencyEquipmentService.batchAdd(stringList);
             stringList.clear();
         }
 
 
-
-
     }
 
     // 计算预期发电量的方法

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconSystemEfficiencyEquipmentServiceImpl.java

@@ -3,6 +3,7 @@ package com.gyee.generation.service.auto.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.util.SortUtils;
 import com.gyee.generation.mapper.auto.ProEconSystemEfficiencyEquipmentMapper;
 import com.gyee.generation.model.auto.ProEconSystemEfficiencyEquipment;
 import com.gyee.generation.service.auto.IProEconSystemEfficiencyEquipmentService;
@@ -22,11 +23,13 @@ import java.util.List;
 public class ProEconSystemEfficiencyEquipmentServiceImpl extends ServiceImpl<ProEconSystemEfficiencyEquipmentMapper, ProEconSystemEfficiencyEquipment> implements IProEconSystemEfficiencyEquipmentService {
     @Override
     public boolean batchAdd(List<ProEconSystemEfficiencyEquipment> proEconStationPowers) {
+        SortUtils.sort(proEconStationPowers, "orderNum", SortUtils.ASC);
         try {
             proEconStationPowers.stream().forEach(i -> {
                 QueryWrapper<ProEconSystemEfficiencyEquipment> qw = new QueryWrapper<>();
                 qw.lambda().eq(ProEconSystemEfficiencyEquipment::getDataDate, i.getDataDate());
                 qw.lambda().eq(ProEconSystemEfficiencyEquipment::getForeignKeyId,i.getForeignKeyId());
+                qw.lambda().eq(ProEconSystemEfficiencyEquipment::getStationId,i.getStationId());
                 int count = baseMapper.selectCount(qw);
                 if (count > 0){
                     baseMapper.update(i,qw);