数据大屏

This commit is contained in:
aikai 2024-03-17 21:59:16 +08:00
parent df9e11beac
commit fc62c664bd

View File

@ -244,7 +244,7 @@ public class ScreenDataServiceImpl implements ScreenDataService {
// 创建 Random 对象 // 创建 Random 对象
Random random = new Random(); Random random = new Random();
// 生成 90 100 之间的随机数包括 90 100 // 生成 90 100 之间的随机数包括 90 100
double randomNumber = random.nextDouble() * 11 + 90; double randomNumber = random.nextDouble() * 11 + 85;
// 将随机数保留两位小数 // 将随机数保留两位小数
randomNumber = Math.round(randomNumber * 100.0) / 100.0; randomNumber = Math.round(randomNumber * 100.0) / 100.0;
if (randomNumber > 100) { if (randomNumber > 100) {
@ -269,10 +269,7 @@ public class ScreenDataServiceImpl implements ScreenDataService {
List<Long> ids = factoryInfos.stream().map(FactoryInfoDO::getId).collect(Collectors.toList()); List<Long> ids = factoryInfos.stream().map(FactoryInfoDO::getId).collect(Collectors.toList());
List<FactoryDataOverviewDO> dos = factoryDataOverviewMapper.selectList(new LambdaQueryWrapperX<FactoryDataOverviewDO>() List<FactoryDataOverviewDO> dos = factoryDataOverviewMapper.selectList(new LambdaQueryWrapperX<FactoryDataOverviewDO>()
.in(FactoryDataOverviewDO::getFactoryId, ids)); .in(FactoryDataOverviewDO::getFactoryId, ids));
Map<Long, List<FactoryDataOverviewDO>> doMaps = dos.stream().collect(Collectors.groupingBy(FactoryDataOverviewDO::getFactoryId)); Map<Long, List<FactoryDataOverviewDO>> doMaps = dos.stream().collect(Collectors.groupingBy(FactoryDataOverviewDO::getFactoryId));
if (factoryId != null) { if (factoryId != null) {
Map<Long, List<FactoryInfoDO>> map = factoryInfos.stream().collect(Collectors.groupingBy(FactoryInfoDO::getId)); Map<Long, List<FactoryInfoDO>> map = factoryInfos.stream().collect(Collectors.groupingBy(FactoryInfoDO::getId));
List<FactoryInfoDO> items = map.get(factoryId); List<FactoryInfoDO> items = map.get(factoryId);
@ -305,12 +302,10 @@ public class ScreenDataServiceImpl implements ScreenDataService {
int randomNumber = random.nextInt(51) + 50; int randomNumber = random.nextInt(51) + 50;
vo.setEmissions(randomNumber); vo.setEmissions(randomNumber);
List<FactoryDataOverviewDO> doItems = doMaps.get(factoryInfo.getId()); List<FactoryDataOverviewDO> doItems = doMaps.get(factoryInfo.getId());
if (CollUtil.isNotEmpty(doItems)) { if (CollUtil.isNotEmpty(doItems) && doItems.get(0).getTruckTotalNum() != null && doItems.get(0).getTruckTotalNum() > 0) {
vo.setForkliftTotal(doItems.get(0).getTruckTotalNum()); vo.setForkliftTotal(doItems.get(0).getTruckTotalNum());
} else { vos.add(vo);
vo.setForkliftTotal(0);
} }
vos.add(vo);
} }
} }
Collections.reverse(vos); Collections.reverse(vos);