逆变器分析接口

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/goodness/WindturbinegoodnessService.java

@@ -1127,10 +1127,21 @@ public class WindturbinegoodnessService {
             ia.setInputPower(srgRealDataMap.get(srgEquipmentIdMap.get(epid)));
             ia.setOutputPower(scgRealDataMap.get(scgEquipmentIdMap.get(epid)));
             ia.setInputVoltage(srdRealDataMap.get(srdEquipmentIdMap.get(epid)));
-            if (srgRealDataMap.get(srgEquipmentIdMap.get(epid)) == 0.0) {
+            /*if (srgRealDataMap.get(srgEquipmentIdMap.get(epid)) == null || srgRealDataMap.get(srgEquipmentIdMap.get(epid)) == 0.0) {
                 ia.setConversionRate(0.0);
             } else {
                 ia.setConversionRate(scgRealDataMap.get(scgEquipmentIdMap.get(epid)) / srgRealDataMap.get(srgEquipmentIdMap.get(epid)) * 100);
+            }*/
+            if (!srgEquipmentIdMap.containsKey(epid) || !srgRealDataMap.containsKey(srgEquipmentIdMap.get(epid)) || Objects.equals(srgRealDataMap.get(srgEquipmentIdMap.get(epid)), 0.0)) {
+                ia.setConversionRate(0.0);
+            } else {
+                Double scgRealData = scgRealDataMap.get(srgEquipmentIdMap.get(epid));
+                Double srgRealData = srgRealDataMap.get(srgEquipmentIdMap.get(epid));
+                if (scgRealData == null || srgRealData == null || srgRealData == 0.0) {
+                    ia.setConversionRate(0.0);
+                } else {
+                    ia.setConversionRate((scgRealData / srgRealData) * 100);
+                }
             }
             lias.add(ia);
         }