diff --git a/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java b/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java index 941ccb5..e78fb14 100644 --- a/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java +++ b/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java @@ -51,9 +51,9 @@ public class SummaryServiceImpl implements SummaryService { if(onlineMap.isEmpty()){ return getPieSummaryVOS(); } - List deviceIdList = onlineMap.keySet().stream().map(Long::parseLong).toList(); +// List deviceIdList = onlineMap.keySet().stream().map(Long::parseLong).toList(); - List deviceVOList = deviceService.getDeviceVOByIds(deviceIdList); + List deviceVOList = deviceService.getDeviceVOByIds(null); //将所有设备按不同的设备品牌进行分组 Map> deviceGroup = new HashMap<>(); @@ -81,9 +81,8 @@ public class SummaryServiceImpl implements SummaryService { Integer onLineCount = 0; Integer offLineCount = 0; - List allDeviceVOList = deviceService.getDeviceVOByIds(null); - for(DeviceVO deviceVO : allDeviceVOList){ + for(DeviceVO deviceVO : deviceVOList){ if("true".equalsIgnoreCase(onlineMap.get(deviceVO.getId().toString()))){ onLineCount++; }else {