|
@@ -61,7 +61,7 @@ public class DmpDataOverviewServiceImpl extends AbstractCrudService<DmpDataOverv
|
|
|
do {
|
|
|
String dates = DateUtils.format(startTime, format);
|
|
|
Date finalStartTime = startTime;
|
|
|
- list.add(list.stream().filter(dv -> DateUtils.format(dv.getCreatedTime(), format).equals(dates))
|
|
|
+ list.stream().filter(dv -> DateUtils.format(dv.getCreatedTime(), format).equals(dates))
|
|
|
.findAny()
|
|
|
.orElseGet(() -> {
|
|
|
DmpDataOverview dmpDataOverview = new DmpDataOverview();
|
|
@@ -76,8 +76,9 @@ public class DmpDataOverviewServiceImpl extends AbstractCrudService<DmpDataOverv
|
|
|
dmpDataOverviewVO.setJhRadioCount(0.0D);
|
|
|
dmpDataOverviewVO.setHyRadioCount(0.0D);
|
|
|
dmpDataOverview.setDeviceNumber(JSON.toJSONString(dmpDataOverviewVO));
|
|
|
+ list.add(dmpDataOverview);
|
|
|
return dmpDataOverview;
|
|
|
- }));
|
|
|
+ });
|
|
|
startTime = function.apply(startTime);
|
|
|
} while ((startTime.getTime() - endTime.getTime()) <= 0);
|
|
|
}
|