风机修改

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,7 @@ 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() / 1000));
+        columnMap.put("有功功率", String.format("%.2f", result1.get(0).getValueF()));
 
         String num = monitorFanIndicator.getEquipCount(gatewayId, "FDZ");
         columnMap.put("风机台数", num);

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -1554,7 +1554,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         for (String value : values) {
             mean += Double.parseDouble(value);
         }
-        mean = Double.parseDouble(String.format("%.2f", mean / values.size()));
+        mean = Double.parseDouble(String.format(CommonConstans.Twodecimalplaces, mean / values.size()));
+        max = Double.parseDouble(String.format(CommonConstans.Twodecimalplaces, max));
+        min = Double.parseDouble(String.format(CommonConstans.Twodecimalplaces, min));
 
         List<Map<String, Object>> seriesData = new ArrayList<>();