Browse Source

修改线路光伏测点取值

wangb 2 years ago
parent
commit
56b6a5e041

+ 11 - 2
realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/RealtimeService.java

@@ -177,7 +177,15 @@ public class RealtimeService {
 
             proBasicWindturbines.stream().forEach(wt -> {
                 Map<String, ProBasicEquipmentPoint> equipmentPointMap = wtpAimap.get(wt.getId());
-                ProBasicEquipmentPoint ssbfPoint = equipmentPointMap.get(ContantXk.SSBF);
+
+                ProBasicEquipmentPoint ssbfPoint = null;
+                if (wt.getId().contains("_WT_")){
+                    ssbfPoint = equipmentPointMap.get(ContantXk.SSBF);
+                }else if(wt.getId().contains("_IN_")){
+                    ssbfPoint = equipmentPointMap.get(ContantXk.SSBG);
+                }
+
+//                ProBasicEquipmentPoint ssbfPoint = equipmentPointMap.get(ContantXk.SSBF);
                 ProBasicEquipmentPoint ssglPoint = equipmentPointMap.get(ContantXk.CJ_SSGL);
                 //理论功率测点
                 ProBasicEquipmentPoint llglPoint = equipmentPointMap.get(ContantXk.LLGL);
@@ -190,9 +198,10 @@ public class RealtimeService {
                 //可用功率测点
                 ProBasicEquipmentPoint kyglPoint = equipmentPointMap.get(ContantXk.KYGL);
 
+                ProBasicEquipmentPoint finalSsbfPoint = ssbfPoint;
                 zssbf.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getRealData(ssbfPoint).getPointValueInDouble()));
+                        return new Double((double) (v + edosUtil.getRealData(finalSsbfPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }