Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

@@ -838,7 +838,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 statusMap.put("data",StringUtils.isEmpty(listDatum.getDisplayName())?listDatum.getEquipmentIndexName():listDatum.getDisplayName());
                 statusMap.put("state",listDatum.getState().equals("true")? 0:1);
                 statusMap.put("status",listDatum.getState().equals("true")? 0:1);
-                statusMap.put("title",listDatum.getState().equals("true")?"断":"通");
+                statusMap.put("title",listDatum.getState().equals("true")?"通":"断");
                 statusMaps.add(statusMap);
             }
         return  statusMaps;
@@ -1085,8 +1085,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                     listData.stream().filter(t -> t.getFrontModule().contains("1主变低压侧")).forEach(item -> {
                         HashMap<String, String> zbMap = new HashMap<>();
                         zbMap.put("title", item.getDisplayName());
-                        zbMap.put("grade1", item.getValue());
-                        zbMap.put("grade2", zbGYC.getOrDefault(item.getDisplayName(), "0.0"));
+                        zbMap.put("grade1", keepTwoDecimalPlaces(item.getValue()));
+                        zbMap.put("grade2", keepTwoDecimalPlaces(zbGYC.getOrDefault(item.getDisplayName(), "0.0")));
                         if (StringUtils.isNotEmpty(item.getUnit())) {
                             zbMap.put("title", String.format("%s(%s)", item.getDisplayName(), item.getUnit()));
                         }
@@ -1109,7 +1109,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                     listData.forEach(item -> {
                         HashMap<String, String> stringStringHashMap = new HashMap<>();
                         stringStringHashMap.put("title", item.getDisplayName());
-                        stringStringHashMap.put("value", item.getValue());
+                        stringStringHashMap.put("value", keepTwoDecimalPlaces(item.getValue()));
                         if (StringUtils.isNotEmpty(item.getUnit())) {
                             stringStringHashMap.put("title", String.format("%s(%s)", item.getDisplayName(), item.getUnit()));
                         }