1

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

@@ -947,92 +947,80 @@ public class TMapPolygonPropertiesServiceImpl extends ServiceImpl<TMapPolygonPro
         map.put("PolygonGeometry",effects);
         Map<String,Object> intelligent=new HashMap<>();
         //土壤检测
-        List<ZhjcTrjcBase> trjcs=trjc.stream().filter(x->x.getParkId().
-                equals(map.get("fParkid"))).collect(Collectors.toList());
-        intelligent.put("trjc",trjcs);
+
+        intelligent.put("trjc",trjc);
         //智能喷灌
-        List<ZhjcZnpgBase> znpgs=znpg.stream().filter(x->x.getParkId().
-                equals(map.get("fParkid"))).collect(Collectors.toList());
-        intelligent.put("znpg",znpgs);
+
+        intelligent.put("znpg",znpg);
 
 
         //智慧灯杆
-        List<ZhjcZhdgBase> zndgs=zndg.stream().filter(x->x.getParkId().
-                equals(map.get("fParkid"))).collect(Collectors.toList());
-        intelligent.put("zndg",zndgs);
+
+        intelligent.put("zndg",zndg);
 
         //水质监测
-        List<ZhjcSzjcBase> szjcs=szjc.stream().filter(x->x.getParkId().
-                equals(map.get("fParkid"))).collect(Collectors.toList());
-        intelligent.put("szjc",szjcs);
+
+        intelligent.put("szjc",szjc);
         map.put("equipment",intelligent);
 
 
-        List<Map<String, Object>> personnels=
-                personnel.stream().filter(x->x.get("parkId").equals(map.get("fParkid"))).
-                        collect(Collectors.toList());
-        map.put("personnel",personnels);
-        map.put("personnelCount",personnels.size());
+
+        map.put("personnel",personnel);
+        map.put("personnelCount",personnel.size());
 
         //养护动作
-        List<TWoWorkorderbase> workorder=
-                Worklist.stream().filter(x->x.getfSguserid().equals(map.get("fParkid"))).
-                        collect(Collectors.toList());
-        map.put("workOrder",workorder);
-        map.put("workOrderCount",workorder.size());
+
+        map.put("workOrder",Worklist);
+        map.put("workOrderCount",Worklist.size());
 
 
         //设施
-        List<TBaseFacilityinfo> equipments=
-                equipment.stream().filter(x->x.getFParkid().equals(map.get("fParkid"))).
-                        collect(Collectors.toList());
-        map.put("equipmentMaintenance",equipments);
+
+        map.put("equipmentMaintenance",equipment);
         //监控
-        List<TBaseDriveinfo> Driveinfo=
-                Driveinfos.stream().filter(x->x.getfParkid().equals(map.get("fParkid"))).
-                        collect(Collectors.toList());
-        map.put("driveinfo",Driveinfo);
+
+        map.put("driveinfo",Driveinfos);
 
         Map<String,Object> intelligentEquipment=new HashMap<>();
         //trjcs土壤检测znpgs智能喷灌zndgs智慧灯杆szjcs水质检测
-        int total=trjcs.size()+znpgs.size()+zndgs.size()+szjcs.size();
-        int online= (int) trjcs.stream().filter(x -> x.getStationState().equals(1)).count()
-                + znpgs.size()
-                + (int) zndgs.stream().filter(x -> x.getOnline().equals(1)).count()
-                + (int) szjcs.stream().filter(x -> x.getStationState().equals(1)).count();
+        int total=trjc.size()+znpg.size()+zndg.size()+szjc.size();
+        int online= (int) trjc.stream().filter(x -> x.getStationState().equals(1)).count()
+                + znpg.size()
+                + (int) zndg.stream().filter(x -> x.getOnline().equals(1)).count()
+                + (int) szjc.stream().filter(x -> x.getStationState().equals(1)).count();
         //传感器在线率
         intelligentEquipment.put("online",online+"/"+total);
         //土壤湿度最低区
-        Optional<ZhjcTrjcBase> minHumidity = trjcs.stream()
+        Optional<ZhjcTrjcBase> minHumidity = trjc.stream()
                 .min(Comparator.comparing(ZhjcTrjcBase::getSdValue));
         intelligentEquipment.put("minHumidity",minHumidity);
         //土壤温度最高区
-        Optional<ZhjcTrjcBase> maxTemperature = trjcs.stream()
+        Optional<ZhjcTrjcBase> maxTemperature = trjc.stream()
                 .max(Comparator.comparing(ZhjcTrjcBase::getWdValue));
         intelligentEquipment.put("maxTemperature",maxTemperature);
         //故障传感器
         Map<String,Object> fault=new HashMap<>();
         //土壤检测
-        List<ZhjcTrjcBase> trjcFault=trjcs.stream().filter(x->x.getStationState().equals(0)
+        List<ZhjcTrjcBase> trjcFault=trjc.stream().filter(x->x.getStationState().equals(0)
         ).collect(Collectors.toList());
         fault.put("trjcFault",trjcFault);
         //智慧灯杆
-        List<ZhjcZhdgBase> zndgFault=zndgs.stream().filter(x->x.getOnline().equals(0)
+        List<ZhjcZhdgBase> zndgFault=zndg.stream().filter(x->x.getOnline().equals(0)
         ).collect(Collectors.toList());
         fault.put("zndgFault",zndgFault);
         //水质监测
-        List<ZhjcSzjcBase> szjcFault=szjcs.stream().filter(x->x.getStationState().equals(0))
+        List<ZhjcSzjcBase> szjcFault=szjc.stream().filter(x->x.getStationState().equals(0))
                 .collect(Collectors.toList());
         fault.put("szjcFault",szjcFault);
         map.put("fault",fault);
 
         //土壤湿度趋势
-        List<ZhjcTrjcBase> humidityTrend = trjcs.stream()
+        List<ZhjcTrjcBase> humidityTrend = trjc.stream()
                 .sorted(Comparator.comparing(ZhjcTrjcBase::getSdValue))
                 .collect(Collectors.toList());
         intelligentEquipment.put("humidityTrend",humidityTrend);
         //土壤温度趋势
-        List<ZhjcTrjcBase> temperatureTrend = trjcs.stream()
+        List<ZhjcTrjcBase> temperatureTrend = trjc.stream()
                 .sorted(Comparator.comparing(ZhjcTrjcBase::getWdValue))
                 .collect(Collectors.toList());
         intelligentEquipment.put("temperatureTrend",humidityTrend);
@@ -1042,7 +1030,7 @@ public class TMapPolygonPropertiesServiceImpl extends ServiceImpl<TMapPolygonPro
         //设施
         for (TBaseFacilitycategory item:equipmentcategory)
         {
-            List<TBaseFacilityinfo> Category=equipments.stream().filter(x->x.getFCategoryid().equals
+            List<TBaseFacilityinfo> Category=equipment.stream().filter(x->x.getFCategoryid().equals
                     (item.getfCategoryid())).collect(Collectors.toList());
             if (Category.size()>0)
             {
@@ -1057,9 +1045,9 @@ public class TMapPolygonPropertiesServiceImpl extends ServiceImpl<TMapPolygonPro
         //监控
         Map<String,Object> statisticsMap=new HashMap<>();
         statisticsMap.put("name","监控");
-        statisticsMap.put("total",Driveinfo.size());
-        statisticsMap.put("normal",Driveinfo.stream().filter(x->x.getfState()>0));
-        statisticsMap.put("abnormal",Driveinfo.stream().filter(x->x.getfState().equals(0)));
+        statisticsMap.put("total",Driveinfos.size());
+        statisticsMap.put("normal",Driveinfos.stream().filter(x->x.getfState()>0));
+        statisticsMap.put("abnormal",Driveinfos.stream().filter(x->x.getfState().equals(0)));
         statistics.add(statisticsMap);
         map.put("statistics",statistics);