|
@@ -183,7 +183,7 @@ public class MonitorDataServiceImpl implements MonitorDataService , Initializing
|
|
|
if(deviceIds.size() ==0){break;}
|
|
|
|
|
|
//查询需要补充数据的设备数据信息
|
|
|
- hourDatas = lastHourDataMap.values().stream().filter(d -> !deviceIdsIsExit.contains(d.getDeviceId())).collect(Collectors.toList());
|
|
|
+ hourDatas = lastHourDataMap.values().stream().filter(d -> !deviceIdsIsExit.contains(d.getDeviceId().intValue())).collect(Collectors.toList());
|
|
|
|
|
|
lastHourDatas = getMonitorDataGroupByHour(dateTime.plusHours(-1), deviceIds);
|
|
|
lastHourDataMap = lastHourDatas.stream().collect(Collectors.toMap(DayReportEntity::getMapkey, a -> a, (k1, k2) -> k1));
|