修改有功功率

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -227,7 +227,17 @@ public class MonitorFanIdxController extends BaseController {
         queryCondtion1.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("220kV夏雩线212线路测控装置PCS-9705TA有功功率一次值"));
         queryCondtion1.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getBoosterGatewayId()));
         List<ESEquipments> result1 = commonService.getListDataByCondtions(queryCondtion1, null, ESEquipments.class);
-        columnMap.put("有功功率", String.format("%.2f", result1.get(0).getValueF()));
+
+
+
+        Map<String, List<String>> queryCondtion2 = new HashMap<>();
+        queryCondtion2.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("南瑞光差保护_313P"));
+        queryCondtion2.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getBoosterGatewayId()));
+        List<ESEquipments> result2 = commonService.getListDataByCondtions(queryCondtion2, null, ESEquipments.class);
+
+        
+
+        columnMap.put("有功功率", String.format("%.2f", (result1.get(0).getValueF()+result2.get(0).getValueF())/1000));
 
         String num = monitorFanIndicator.getEquipCount(gatewayId, "FDZ");
         columnMap.put("风机台数", num);