增加光伏取值判断

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

@@ -340,7 +340,7 @@ public class CacheContext implements CommandLineRunner {
             if(modelMap.containsKey(wt.getModelId()))
             {
                 ProEconEquipmentmodel equipmentmodel = modelMap.get(wt.getModelId());
-                modelpower.put(wt.getId(),equipmentmodel.getPowerProduction().doubleValue());
+                modelpower.put(wt.getModelId(),equipmentmodel.getPowerProduction().doubleValue());
             }
 
 

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

@@ -25,7 +25,7 @@ public class ProEconWtPowerCurveFitting extends Model {
      * 编号
      */
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Integer id;
+    private Long id;
 
     /**
      * 风机编号

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

@@ -779,7 +779,7 @@ public class PowerCurveFittingService {
     private void insertPoints2(Date current, String year, String month, List<PointVo> monthSjglls, List<PointVo> monthZyglls, List<PointVo> daySjglls, List<PointVo> dayZyglls, List<PointVo> yearSjglls, List<PointVo> yearZyglls, String windturbineId) {
 
 
-        List<Integer> wtpcfidls = proEconWtPowerCurveFittingService.list().stream().filter(i -> i.getWindturbineId().equals(windturbineId)).map(ProEconWtPowerCurveFitting::getId).collect(Collectors.toList());
+        List<Long> wtpcfidls = proEconWtPowerCurveFittingService.list().stream().filter(i -> i.getWindturbineId().equals(windturbineId)).map(ProEconWtPowerCurveFitting::getId).collect(Collectors.toList());
 
 
         for (int i = 0; i < wtpcfidls.size(); i++) {

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

@@ -99,7 +99,15 @@ public class AccessStatusService {
             }
             if (wsOptional.isPresent()){
                 Map<String, ProBasicPowerstationPoint> basicPowerstationPointMap = wswppointmap.get(wsOptional.get().getId());
-                ProBasicPowerstationPoint proBasicPowerstationPoint = basicPowerstationPointMap.get(ContantXk.FCCFTWD);
+
+                ProBasicPowerstationPoint proBasicPowerstationPoint = null;
+                if (wp.getSpare4().equals("1")){
+                    proBasicPowerstationPoint = basicPowerstationPointMap.get(ContantXk.FCCFTWD);
+                }else if(wp.getSpare4().equals("2")){
+                    proBasicPowerstationPoint = basicPowerstationPointMap.get(ContantXk.QXZWD);
+                }
+
+//                ProBasicPowerstationPoint proBasicPowerstationPoint = basicPowerstationPointMap.get(ContantXk.FCCFTWD);
                 try {
                     Long pointTime = edosUtil.getRealData(proBasicPowerstationPoint.getNemCode()).getPointTime();
                     if ((currentDate.getTime() - pointTime) / 1000 < Integer.parseInt(second)){

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

@@ -661,12 +661,21 @@ public class CycleCalculationService {
         lnls.stream().forEach(line->{
             List<ProBasicEquipment> proBasicWindturbines = lnwtmap.get(line.getId());
             Map<String, ProBasicPowerstationPoint> proBasicWppointMap = linepointmap.get(line.getId());
-            ProBasicPowerstationPoint wprpjfsPoint = proBasicWppointMap.get(ContantXk.RPJFS);
-            ProBasicPowerstationPoint wpypjfsPoint = proBasicWppointMap.get(ContantXk.YPJFS);
-            ProBasicPowerstationPoint wpnpjfsPoint = proBasicWppointMap.get(ContantXk.NPJFS);
-            ProBasicPowerstationPoint wprpjgzdPoint = proBasicWppointMap.get(ContantXk.RPJGZD);
-            ProBasicPowerstationPoint wpypjgzdPoint = proBasicWppointMap.get(ContantXk.YPJGZD);
-            ProBasicPowerstationPoint wpnpjgzdPoint = proBasicWppointMap.get(ContantXk.NPJGZD);
+            ProBasicPowerstationPoint wprpjfsPoint = null;
+            ProBasicPowerstationPoint wpypjfsPoint = null;
+            ProBasicPowerstationPoint wpnpjfsPoint = null;
+            ProBasicPowerstationPoint wppjfs15Point = null;
+            if (line.getSpare4().equals("1")) {
+                 wprpjfsPoint = proBasicWppointMap.get(ContantXk.RPJFS);
+                 wpypjfsPoint = proBasicWppointMap.get(ContantXk.YPJFS);
+                 wpnpjfsPoint = proBasicWppointMap.get(ContantXk.NPJFS);
+                 wppjfs15Point = proBasicWppointMap.get(ContantXk.PJFS15);
+            }else if (line.getSpare4().equals("2")) {
+                 wprpjfsPoint = proBasicWppointMap.get(ContantXk.RPJGZD);
+                 wpypjfsPoint = proBasicWppointMap.get(ContantXk.YPJGZD);
+                 wpnpjfsPoint = proBasicWppointMap.get(ContantXk.NPJGZD);
+                 wppjfs15Point = proBasicWppointMap.get(ContantXk.PJGZD15);
+            }
             ProBasicPowerstationPoint wprpjglPoint = proBasicWppointMap.get(ContantXk.RPJGL);
             ProBasicPowerstationPoint wpypjglPoint = proBasicWppointMap.get(ContantXk.YPJGL);
             ProBasicPowerstationPoint wpnpjglPoint = proBasicWppointMap.get(ContantXk.NPJGL);
@@ -674,8 +683,6 @@ public class CycleCalculationService {
             ProBasicPowerstationPoint wpyfdlPoint = proBasicWppointMap.get(ContantXk.YFDL);
             ProBasicPowerstationPoint wpnfdlPoint = proBasicWppointMap.get(ContantXk.NFDL);
             ProBasicPowerstationPoint wpfdl15Point = proBasicWppointMap.get(ContantXk.FDL15);
-            ProBasicPowerstationPoint wppjfs15Point = proBasicWppointMap.get(ContantXk.PJFS15);
-            ProBasicPowerstationPoint wppjgzd15Point = proBasicWppointMap.get(ContantXk.PJGZD15);
             ProBasicPowerstationPoint wppjgl15Point = proBasicWppointMap.get(ContantXk.PJGL15);
             ProBasicPowerstationPoint wprkydlPoint = proBasicWppointMap.get(ContantXk.RKYDL);
             ProBasicPowerstationPoint wpykydlPoint = proBasicWppointMap.get(ContantXk.YKYDL);
@@ -1758,12 +1765,21 @@ public class CycleCalculationService {
         pjls.stream().forEach(project->{
             List<ProBasicLine> proBasicLines = prolinemap.get(project.getId());
             Map<String, ProBasicPowerstationPoint> proBasicWppointMap = propointmap.get(project.getId());
-            ProBasicPowerstationPoint wprpjfsPoint = proBasicWppointMap.get(ContantXk.RPJFS);
-            ProBasicPowerstationPoint wpypjfsPoint = proBasicWppointMap.get(ContantXk.YPJFS);
-            ProBasicPowerstationPoint wpnpjfsPoint = proBasicWppointMap.get(ContantXk.NPJFS);
-            ProBasicPowerstationPoint wprpjgzdPoint = proBasicWppointMap.get(ContantXk.RPJGZD);
-            ProBasicPowerstationPoint wpypjgzdPoint = proBasicWppointMap.get(ContantXk.YPJGZD);
-            ProBasicPowerstationPoint wpnpjgzdPoint = proBasicWppointMap.get(ContantXk.NPJGZD);
+            ProBasicPowerstationPoint wprpjfsPoint = null;
+            ProBasicPowerstationPoint wpypjfsPoint = null;
+            ProBasicPowerstationPoint wpnpjfsPoint = null;
+            ProBasicPowerstationPoint wppjfs15Point = null;
+            if (project.getSpare4().equals("1")){
+                 wprpjfsPoint = proBasicWppointMap.get(ContantXk.RPJFS);
+                 wpypjfsPoint = proBasicWppointMap.get(ContantXk.YPJFS);
+                 wpnpjfsPoint = proBasicWppointMap.get(ContantXk.NPJFS);
+                 wppjfs15Point = proBasicWppointMap.get(ContantXk.PJFS15);
+            }else if (project.getSpare4().equals("2")) {
+                 wprpjfsPoint = proBasicWppointMap.get(ContantXk.RPJGZD);
+                 wpypjfsPoint = proBasicWppointMap.get(ContantXk.YPJGZD);
+                 wpnpjfsPoint = proBasicWppointMap.get(ContantXk.NPJGZD);
+                wppjfs15Point = proBasicWppointMap.get(ContantXk.PJGZD15);
+            }
             ProBasicPowerstationPoint wprpjglPoint = proBasicWppointMap.get(ContantXk.RPJGL);
             ProBasicPowerstationPoint wpypjglPoint = proBasicWppointMap.get(ContantXk.YPJGL);
             ProBasicPowerstationPoint wpnpjglPoint = proBasicWppointMap.get(ContantXk.NPJGL);
@@ -1771,8 +1787,8 @@ public class CycleCalculationService {
             ProBasicPowerstationPoint wpyfdlPoint = proBasicWppointMap.get(ContantXk.YFDL);
             ProBasicPowerstationPoint wpnfdlPoint = proBasicWppointMap.get(ContantXk.NFDL);
             ProBasicPowerstationPoint wpfdl15Point = proBasicWppointMap.get(ContantXk.FDL15);
-            ProBasicPowerstationPoint wppjfs15Point = proBasicWppointMap.get(ContantXk.PJFS15);
-            ProBasicPowerstationPoint wppjgzd15Point = proBasicWppointMap.get(ContantXk.PJGZD15);
+//            ProBasicPowerstationPoint wppjfs15Point = proBasicWppointMap.get(ContantXk.PJFS15);
+//            ProBasicPowerstationPoint wppjgzd15Point = proBasicWppointMap.get(ContantXk.PJGZD15);
             ProBasicPowerstationPoint wppjgl15Point = proBasicWppointMap.get(ContantXk.PJGL15);
             ProBasicPowerstationPoint wprkydlPoint = proBasicWppointMap.get(ContantXk.RKYDL);
             ProBasicPowerstationPoint wpykydlPoint = proBasicWppointMap.get(ContantXk.YKYDL);
@@ -2858,12 +2874,21 @@ public class CycleCalculationService {
         wpls.stream().forEach(wp->{
             List<ProBasicProject> proBasicProjects = wppromap.get(wp.getId());
             Map<String, ProBasicPowerstationPoint> proBasicWppointMap = wppointmap.get(wp.getId());
-            ProBasicPowerstationPoint wprpjfsPoint = proBasicWppointMap.get(ContantXk.RPJFS);
-            ProBasicPowerstationPoint wpypjfsPoint = proBasicWppointMap.get(ContantXk.YPJFS);
-            ProBasicPowerstationPoint wpnpjfsPoint = proBasicWppointMap.get(ContantXk.NPJFS);
-            ProBasicPowerstationPoint wprpjgzdPoint = proBasicWppointMap.get(ContantXk.RPJGZD);
-            ProBasicPowerstationPoint wpypjgzdPoint = proBasicWppointMap.get(ContantXk.YPJGZD);
-            ProBasicPowerstationPoint wpnpjgzdPoint = proBasicWppointMap.get(ContantXk.NPJGZD);
+            ProBasicPowerstationPoint wprpjfsPoint = null;
+            ProBasicPowerstationPoint wpypjfsPoint = null;
+            ProBasicPowerstationPoint wpnpjfsPoint = null;
+            ProBasicPowerstationPoint wppjfs15Point = null;
+            if (wp.getSpare4().equals("1")){
+                wprpjfsPoint = proBasicWppointMap.get(ContantXk.RPJFS);
+                wpypjfsPoint = proBasicWppointMap.get(ContantXk.YPJFS);
+                wpnpjfsPoint = proBasicWppointMap.get(ContantXk.NPJFS);
+                wppjfs15Point = proBasicWppointMap.get(ContantXk.PJFS15);
+            }else if (wp.getSpare4().equals("2")) {
+                wprpjfsPoint = proBasicWppointMap.get(ContantXk.RPJGZD);
+                wpypjfsPoint = proBasicWppointMap.get(ContantXk.YPJGZD);
+                wpnpjfsPoint = proBasicWppointMap.get(ContantXk.NPJGZD);
+                wppjfs15Point = proBasicWppointMap.get(ContantXk.PJGZD15);
+            }
             ProBasicPowerstationPoint wprpjglPoint = proBasicWppointMap.get(ContantXk.RPJGL);
             ProBasicPowerstationPoint wpypjglPoint = proBasicWppointMap.get(ContantXk.YPJGL);
             ProBasicPowerstationPoint wpnpjglPoint = proBasicWppointMap.get(ContantXk.NPJGL);
@@ -2871,8 +2896,8 @@ public class CycleCalculationService {
             ProBasicPowerstationPoint wpyfdlPoint = proBasicWppointMap.get(ContantXk.YFDL);
             ProBasicPowerstationPoint wpnfdlPoint = proBasicWppointMap.get(ContantXk.NFDL);
             ProBasicPowerstationPoint wpfdl15Point = proBasicWppointMap.get(ContantXk.FDL15);
-            ProBasicPowerstationPoint wppjfs15Point = proBasicWppointMap.get(ContantXk.PJFS15);
-            ProBasicPowerstationPoint wppjgzd15Point = proBasicWppointMap.get(ContantXk.PJGZD15);
+//            ProBasicPowerstationPoint wppjfs15Point = proBasicWppointMap.get(ContantXk.PJFS15);
+//            ProBasicPowerstationPoint wppjgzd15Point = proBasicWppointMap.get(ContantXk.PJGZD15);
             ProBasicPowerstationPoint wppjgl15Point = proBasicWppointMap.get(ContantXk.PJGL15);
             ProBasicPowerstationPoint wprkydlPoint = proBasicWppointMap.get(ContantXk.RKYDL);
             ProBasicPowerstationPoint wpykydlPoint = proBasicWppointMap.get(ContantXk.YKYDL);