123

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

@@ -21,6 +21,7 @@ import com.yt.zhylplat.moduleMap.mapper.TMapPolygonPropertiesMapper;
 import com.yt.zhylplat.moduleMap.service.TMapGreenSpacePropertyService;
 import com.yt.zhylplat.moduleMap.service.TMapPolygonGeometryService;
 import com.yt.zhylplat.moduleMap.service.TMapPolygonPropertiesService;
+import com.yt.zhylplat.moduleMap.vo.MapEquipmentVo;
 import com.yt.zhylplat.moduleZhjc.entity.*;
 import com.yt.zhylplat.moduleZhjc.mapper.*;
 import com.yt.zhylplat.utils.FileUtil;
@@ -1028,29 +1029,36 @@ public class TMapPolygonPropertiesServiceImpl extends ServiceImpl<TMapPolygonPro
         // 统计
         List<Map<String,Object>> statistics= new ArrayList<>();
         //设施
-        for (TBaseFacilitycategory item:equipmentcategory)
+        Map<String,Object> statisticsMap=new HashMap<>();
+        List<MapEquipmentVo> mapEquipmentVos=new ArrayList<>();
+        for (TBaseFacilityinfo item :equipment)
         {
-            List<TBaseFacilityinfo> Category=equipment.stream().filter(x->x.getFCategoryid().equals
-                    (item.getfCategoryid())).collect(Collectors.toList());
-            if (Category.size()>0)
-            {
-                Map<String,Object> statisticsMap=new HashMap<>();
-                statisticsMap.put("name",item.getfCategoryname());
-                statisticsMap.put("total",Category.size());
-                statisticsMap.put("normal",Category.stream().
-                        filter(x->x.getFStateid()!=null&&x.getFStateid()>0).collect(Collectors.toList()));
-                statisticsMap.put("abnormal",Category.stream().
-                        filter(x->x.getFStateid()!=null&&x.getFStateid().equals(0)).collect(Collectors.toList()));
-                statistics.add(statisticsMap);
-            }
+            MapEquipmentVo vo=new MapEquipmentVo();
+            vo.setCategoryName(item.getFCategoryname());
+            vo.setName(item.getFName());
+            vo.setX(item.getFX());
+            vo.setY(item.getFY());
+            vo.setState(item.getFStateid());
+            mapEquipmentVos.add(vo);
         }
-        //监控
-        Map<String,Object> statisticsMap=new HashMap<>();
-        statisticsMap.put("name","监控");
-        statisticsMap.put("total",Driveinfos.size());
-        statisticsMap.put("normal",Driveinfos.stream().filter(x->x.getfState()!=null&&x.getfState()>0).collect(Collectors.toList()));
-        statisticsMap.put("abnormal",Driveinfos.stream().filter(x->x.getfState()!=null&&x.getfState().equals(0)).collect(Collectors.toList()));
+        for (TBaseDriveinfo item :Driveinfos)
+        {
+            MapEquipmentVo vo=new MapEquipmentVo();
+            vo.setCategoryName(item.getfCategoryname());
+            vo.setName(item.getfName());
+            vo.setX(item.getfX());
+            vo.setY(item.getfY());
+            vo.setState(item.getfState());
+            mapEquipmentVos.add(vo);
+        }
+        statisticsMap.put("data",mapEquipmentVos);
+        statisticsMap.put("total",mapEquipmentVos.size());
+        statisticsMap.put("normal",mapEquipmentVos.stream().
+                filter(x->x.getState()!=null&&x.getState()>0).collect(Collectors.toList()));
+        statisticsMap.put("abnormal",mapEquipmentVos.stream().
+                filter(x->x.getState()!=null&&x.getState().equals(0)).collect(Collectors.toList()));
         statistics.add(statisticsMap);
+
         map.put("statistics",statistics);
 
         //保养
@@ -1059,6 +1067,7 @@ public class TMapPolygonPropertiesServiceImpl extends ServiceImpl<TMapPolygonPro
 
         Map<String,Object> attendance=new HashMap<>();
         attendance.put("dueToArrive",employeeinfos.size());
+        attendance.put("attendance",baseEmployeeinfos);
         attendance.put("present",baseEmployeeinfos.stream().filter(x->x.getfWorktype()==1|| x.getfWorktype()==2|| x.getfWorktype()==3
         ).count() );
         attendance.put("leave",baseEmployeeinfos.stream().filter(x->

src/main/java/com/yt/zhylplat/moduleMap/vo/MapEquipmentVo.java

@@ -0,0 +1,25 @@
+package com.yt.zhylplat.moduleMap.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value="设备情况", description="设备情况")
+public class MapEquipmentVo {
+
+    @ApiModelProperty(value = "分类名称")
+    private String CategoryName;
+    @ApiModelProperty(value = "名称")
+    private String Name;
+    @ApiModelProperty(value = "编号")
+    private String Code;
+    @ApiModelProperty(value = "经度")
+    private String X;
+    @ApiModelProperty(value = "维度")
+    private String Y;
+    @ApiModelProperty(value = "设施状态Id0未连接1已连接2已告警")
+    private Integer State;
+    @ApiModelProperty(value = "最后检查时间")
+    private Data CheckTime;
+}