project-zsy
/
gasWellWatch
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

This commit is contained in:
qinjie 2024-12-28 13:09:14 +08:00
parent 78be71b699
commit e967f1d9a7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java
View File

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