系统效率修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/PhotovoltaicLevel.java

@@ -0,0 +1,8 @@
+package com.gyee.runeconomy.dto;
+
+public class PhotovoltaicLevel {
+    public static final String STABLE = "运行稳定";
+    public static final String GOOD = "运行良好";
+    public static final String NEEDS_IMPROVEMENT = "运行水平有待提高";
+    public static final String MUST_CORRECT = "必须整改";
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/PrAnalysisVo.java

@@ -8,6 +8,35 @@ public class PrAnalysisVo {
     private String wtid;
 
     /**
+     * 运行等级
+     */
+
+    private String level;
+    /**
+     * 容量
+     */
+
+    private Double rl;
+
+    /**
+     * 累计光照
+     */
+
+    private Double ljgzz;
+
+    /**
+     * 发电量
+     */
+
+    private Double fdl;
+
+    /**
+     * 最大理论发电量
+     */
+
+    private Double llfdlmax;
+
+    /**
      * pr值
      */
 
@@ -40,6 +69,10 @@ public class PrAnalysisVo {
 //    private Integer wtidpm;
     private Integer prhbpm;
     private Integer prtbpm;
+
+    private Integer fdlpm;
+    private Integer llfdlmaxpm;
+    private Integer ljgzzpm;
     private Integer prhbzzlpm;
     private Integer prtbzzlpm;
 
@@ -130,4 +163,68 @@ public class PrAnalysisVo {
     public void setPrpm(Integer prpm) {
         this.prpm = prpm;
     }
+
+    public Double getRl() {
+        return rl;
+    }
+
+    public void setRl(Double rl) {
+        this.rl = rl;
+    }
+
+    public Double getFdl() {
+        return fdl;
+    }
+
+    public void setFdl(Double fdl) {
+        this.fdl = fdl;
+    }
+
+    public Double getLlfdlmax() {
+        return llfdlmax;
+    }
+
+    public void setLlfdlmax(Double llfdlmax) {
+        this.llfdlmax = llfdlmax;
+    }
+
+    public Double getLjgzz() {
+        return ljgzz;
+    }
+
+    public void setLjgzz(Double ljgzz) {
+        this.ljgzz = ljgzz;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public Integer getFdlpm() {
+        return fdlpm;
+    }
+
+    public void setFdlpm(Integer fdlpm) {
+        this.fdlpm = fdlpm;
+    }
+
+    public Integer getllfdlmaxpm() {
+        return llfdlmaxpm;
+    }
+
+    public void setllfdlmaxpm(Integer llfdlmaxpm) {
+        this.llfdlmaxpm = llfdlmaxpm;
+    }
+
+    public Integer getljgzzpm() {
+        return ljgzzpm;
+    }
+
+    public void setLjgzzpm(Integer ljgzzpm) {
+        this.ljgzzpm = ljgzzpm;
+    }
 }

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

@@ -421,6 +421,8 @@ public class PVSystemEfficiencyCalculator {
                 power.setEquipmentId(wt.getId());
                 power.setLocation("wt");
                 power.setDataDate(date);
+                power.setPowerGeneration(actualPowerOutputKilowattHours);
+                power.setLlfdlmax(expectedPowerOutputKilowattHours);
                 power.setRzqd(solarRadiationWattsPerSquareMeter);
                 power.setEfficiency(pr);
                 power.setOrderNum(wt.getOrderNum());

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Pranalysis/PrAnalysisService.java

@@ -2,14 +2,22 @@ package com.gyee.runeconomy.service.Pranalysis;
 
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.SortUtils;
+import com.gyee.runeconomy.dto.PhotovoltaicLevel;
 import com.gyee.runeconomy.dto.PrAnalysisVo;
+import com.gyee.runeconomy.init.CacheContext;
+import com.gyee.runeconomy.model.auto.ProBasicEquipment;
+import com.gyee.runeconomy.model.auto.ProEconEquipmentmodel;
 import com.gyee.runeconomy.model.auto.ProEconSystemEfficiencyEquipment;
 import com.gyee.runeconomy.service.auto.impl.ProEconSystemEfficiencyEquipmentServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Service
 public class PrAnalysisService {
@@ -17,7 +25,7 @@ public class PrAnalysisService {
     @Resource
     private ProEconSystemEfficiencyEquipmentServiceImpl efficiencyEquipmentService;
 
-    public   List<PrAnalysisVo>  Comprehensive(String wpId, String month,String target,String sort) throws Exception {
+    public List<PrAnalysisVo> Comprehensive(String wpId, String month, String target, String sort) throws Exception {
 
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM");
         Date date = dateFormat.parse(month);
@@ -29,15 +37,24 @@ public class PrAnalysisService {
         List<ProEconSystemEfficiencyEquipment> hbls = efficiencyEquipmentService.gethb(wpId, date);
         List<ProEconSystemEfficiencyEquipment> tbls = efficiencyEquipmentService.gettb(wpId, date);
 
-        if (bqls!=null && bqls.size()>1){
-            for(ProEconSystemEfficiencyEquipment eq : bqls){
+        if (bqls != null && bqls.size() > 1) {
+            for (ProEconSystemEfficiencyEquipment eq : bqls) {
+                List<ProBasicEquipment> collect1 = CacheContext.wtls.stream().filter(wtt -> eq.getEquipmentId().equals(wtt.getId())).collect(Collectors.toList());
+                List<ProEconEquipmentmodel> collect = CacheContext.equipmentmodels.stream().filter(w -> collect1.get(0).getModelId().equals(w.getId())).collect(Collectors.toList());
+
                 PrAnalysisVo vo = new PrAnalysisVo();
                 vo.setWtid(eq.getForeignKeyId());
+                String level = determinePhotovoltaicLevel(eq.getEfficiency());
+                vo.setLevel(level);
                 vo.setPr(eq.getEfficiency());
+                vo.setRl(collect.get(0).getPowerProduction());
+                vo.setLjgzz(eq.getRzqd());
+                vo.setFdl(eq.getPowerGeneration());
+                vo.setLlfdlmax(eq.getLlfdlmax());
                 vos.add(vo);
             }
         }
-        if (hbls!=null && hbls.size()>1) {
+        if (hbls != null && hbls.size() > 1) {
             vos.stream().forEach(i -> {
                 Optional<ProEconSystemEfficiencyEquipment> optional = hbls.stream()
                         .filter(j -> j.getForeignKeyId().equals(i.getWtid()))
@@ -45,7 +62,7 @@ public class PrAnalysisService {
                 if (optional.isPresent()) {
                     ProEconSystemEfficiencyEquipment tqinfoday = optional.get();
                     i.setPrhb(tqinfoday.getEfficiency());
-                    if (i.getPrhb() !=0) {
+                    if (i.getPrhb() != 0) {
                         i.setPrhbzzl((i.getPr() - i.getPrhb()) / i.getPrhb() * 100);
                     } else {
                         i.setPrhbzzl(0.0);
@@ -56,7 +73,7 @@ public class PrAnalysisService {
             });
         }
 
-        if (tbls!=null && tbls.size()>1) {
+        if (tbls != null && tbls.size() > 1) {
             vos.stream().forEach(i -> {
                 Optional<ProEconSystemEfficiencyEquipment> optional = tbls.stream()
                         .filter(j -> j.getForeignKeyId().equals(i.getWtid()))
@@ -87,6 +104,21 @@ public class PrAnalysisService {
             vos.get(i).setPrhbzzlpm(i + 1);
         }
 
+        SortUtils.sort(vos, "ljgzz", SortUtils.DESC);
+        for (int i = 0; i < vos.size(); i++) {
+            vos.get(i).setLjgzzpm(i + 1);
+        }
+
+        SortUtils.sort(vos, "fdl", SortUtils.DESC);
+        for (int i = 0; i < vos.size(); i++) {
+            vos.get(i).setFdlpm(i + 1);
+        }
+
+        SortUtils.sort(vos, "llfdlmax", SortUtils.DESC);
+        for (int i = 0; i < vos.size(); i++) {
+            vos.get(i).setllfdlmaxpm(i + 1);
+        }
+
         if (tbls.size() > 0) {
             SortUtils.sort(vos, "prtb", SortUtils.DESC);
             for (int i = 0; i < vos.size(); i++) {
@@ -111,4 +143,19 @@ public class PrAnalysisService {
         }
         return vos;
     }
+
+
+    // 根据转换效率确定光伏运行水平
+    private static String determinePhotovoltaicLevel(double efficiency) {
+        if (efficiency >= 90.0) {
+            return PhotovoltaicLevel.STABLE;
+        } else if (efficiency >= 80.0) {
+            return PhotovoltaicLevel.GOOD;
+        } else if (efficiency >= 70.0) {
+            return PhotovoltaicLevel.NEEDS_IMPROVEMENT;
+        } else {
+            return PhotovoltaicLevel.MUST_CORRECT;
+        }
+
+    }
 }