站点增强

fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceServiceImpl.java

@@ -64,7 +64,7 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
      * @param type
      * @return
      */
-    public Long getCount(List<Device> list, Integer deviceStatus, Integer type){
+    public Long getCount(List<Device> list, Integer deviceStatus, String type){
         return list.stream()
                 .filter(device -> Optional.ofNullable(deviceStatus).map(ds -> ds.equals(device.getDeviceStatus())).orElse(true))
                 .filter(device -> Optional.ofNullable(type).map(ds -> ds.equals(device.getDeviceType())).orElse(true))

fiveep-service/src/main/java/com/bizmatics/service/impl/SiteServiceImpl.java

@@ -61,13 +61,9 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     public List<SiteVO> siteAndStatusList(String name) {
         List<SiteVO> list = new ArrayList<>();
         Integer userId = SessionLocal.getUserId();
-        long l = System.currentTimeMillis();
         List<Site> sites = baseMapper.list(SessionLocal.getUserId(), name);
-        long e = System.currentTimeMillis();
-        System.out.println("结束时间"+ (e-l));
-        sites.forEach(site -> list.add(enhanceSite(site,userId)));
-        long es = System.currentTimeMillis();
-        System.out.println("结束时间1"+ (es-e));
+        List<Device> deviceList = deviceMapper.list(userId, null, null, null, null, null);
+        sites.forEach(site -> list.add(enhanceSite(deviceList,site)));
         return list;
     }
 
@@ -78,10 +74,8 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     }
 
 
-    public SiteVO enhanceSite(Site site,Integer userId){
-        long l = System.currentTimeMillis();
+    public SiteVO enhanceSite(List<Device> list,Site site){
         SiteVO siteVo = BeanMapperUtils.map(site, SiteVO.class);
-        List<Device> list = deviceMapper.list(userId, siteVo.getId(), null, null, null, null);
         siteVo.setDeviceCount(list.size());
         long deviceCount = list.stream().filter(device -> DeviceStatusCode.DEVICE.getValue().equals(device.getDeviceStatus())).count();
         long faultCount = list.stream().filter(device -> DeviceStatusCode.FAULT.getValue().equals(device.getDeviceStatus())).count();
@@ -96,8 +90,6 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         }else {
             siteVo.setStatus(DeviceStatusCode.NORMAL.getDescribe());
         }
-        long s = System.currentTimeMillis();
-        System.out.println("循环一次"+(s-l));
         return siteVo;
     }
 }