泰和-升压站-箱变-实时运行数据 测点显示及排序

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

@@ -226,7 +226,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         });
         Collator instance = Collator.getInstance(Locale.CHINA);
         if (needDisplayDisplayNameSystemType.contains(systemType) && needDisplayDisplayNameFrontModule.contains(frontModule)) {
-           result.sort(Comparator.comparing(ESEquipments::getTraceId,Comparator.comparingInt(Integer::parseInt)));
+            result.sort(Comparator.comparing(ESEquipments::getTraceId, Comparator.comparingInt(Integer::parseInt)));
         } else {
             Collections.sort(result, (e1, e2) -> {
                 return instance.compare(e1.getEquipmentIndexName(), e2.getEquipmentIndexName());
@@ -837,11 +837,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         if (null != equipNum) {
             queryCondtion.put(CommonConstans.QueryStringEquipmentNumberKeyword, Arrays.asList(equipNum));
         }
-
         Map<String, String> likeMap = new HashMap<>();
         likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, frontModule);
         List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
-
         List<Map<String, Object>> statusMaps = new ArrayList<>();
         for (ESEquipments listDatum : indicatorsDtoList) {
             Map<String, Object> statusMap = new HashMap<>();
@@ -858,7 +856,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             statusMap.put("data", data);
             statusMap.put("state", listDatum.getValue().equals("false") ? 0 : 1);
             statusMap.put("status", listDatum.getValue().equals("false") ? 0 : 1);
-            statusMap.put("title", listDatum.getValue().equals("false") ? "通" : "断");
+            statusMap.put("title", !listDatum.getValue().equals("false") ? "通" : "断");
             statusMaps.add(statusMap);
         }
 
@@ -1321,7 +1319,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 stringStringHashMap.put("value1", "0.0");
                 stringStringHashMap.put("value2", "0.0");
                 stringStringHashMap.put("value3", "0.0");
-                if(!map.get("boosterName").toString().equals("35kVⅠ母PT")){
+                if (!map.get("boosterName").toString().equals("35kVⅠ母PT")) {
                     listData.forEach(item -> {
 
                         if (item.getDisplayName().equals("Ia")) {
@@ -1334,7 +1332,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                             stringStringHashMap.put("value3", item.getValueF() == null ? "0" : keepTwoDecimalPlaces(item.getValueF().toString()));
                         }
                     });
-                }else{
+                } else {
                     stringStringHashMap.put("value1", "");
                     stringStringHashMap.put("value2", "");
                     stringStringHashMap.put("value3", "");