1

src/main/java/com/yt/zhylplat/moduleMap/service/impl/TMapPolygonPropertiesServiceImpl.java

@@ -992,12 +992,16 @@ public class TMapPolygonPropertiesServiceImpl extends ServiceImpl<TMapPolygonPro
         //传感器在线率
         intelligentEquipment.put("online",online+"/"+total);
         //土壤湿度最低区
-        Optional<ZhjcTrjcBase> minHumidity = trjc.stream()
-                .min(Comparator.comparing(ZhjcTrjcBase::getSdValue));
+        List<ZhjcTrjcBase> minHumidity = trjc.stream()
+                .sorted(Comparator.comparing(ZhjcTrjcBase::getSdValue))
+                .limit(3)
+                .collect(Collectors.toList());
         intelligentEquipment.put("minHumidity",minHumidity);
         //土壤温度最高区
-        Optional<ZhjcTrjcBase> maxTemperature = trjc.stream()
-                .max(Comparator.comparing(ZhjcTrjcBase::getWdValue));
+        List<ZhjcTrjcBase> maxTemperature = trjc.stream()
+                .sorted(Comparator.comparing(ZhjcTrjcBase::getWdValue).reversed())
+                .limit(3)
+                .collect(Collectors.toList());
         intelligentEquipment.put("maxTemperature",maxTemperature);
         //故障传感器
         Map<String,Object> fault=new HashMap<>();
@@ -1012,9 +1016,10 @@ public class TMapPolygonPropertiesServiceImpl extends ServiceImpl<TMapPolygonPro
         //水质监测
         List<ZhjcSzjcBase> szjcFault=szjc.stream().filter(x->x.getStationState().equals(0))
                 .collect(Collectors.toList());
+
         fault.put("szjcFault",szjcFault);
         map.put("fault",fault);
-
+        map.put("faultCount",trjcFault.size()+zndgFault.size()+szjcFault.size());
         //土壤湿度趋势
         List<ZhjcTrjcBase> humidityTrend = trjc.stream()
                 .sorted(Comparator.comparing(ZhjcTrjcBase::getSdValue))