From fc62c664bd8fe6176c9270cc74f0795883482415 Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Sun, 17 Mar 2024 21:59:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/screendata/ScreenDataServiceImpl.java     | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/screendata/ScreenDataServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/screendata/ScreenDataServiceImpl.java
index 865dfe5e..c3dd04cb 100644
--- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/screendata/ScreenDataServiceImpl.java
+++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/screendata/ScreenDataServiceImpl.java
@@ -244,7 +244,7 @@ public class ScreenDataServiceImpl implements ScreenDataService {
             // 创建 Random 对象
             Random random = new Random();
             // 生成 90 到 100 之间的随机数（包括 90 和 100）
-            double randomNumber = random.nextDouble() * 11 + 90;
+            double randomNumber = random.nextDouble() * 11 + 85;
             // 将随机数保留两位小数
             randomNumber = Math.round(randomNumber * 100.0) / 100.0;
             if (randomNumber > 100) {
@@ -269,10 +269,7 @@ public class ScreenDataServiceImpl implements ScreenDataService {
         List<Long> ids = factoryInfos.stream().map(FactoryInfoDO::getId).collect(Collectors.toList());
         List<FactoryDataOverviewDO> dos = factoryDataOverviewMapper.selectList(new LambdaQueryWrapperX<FactoryDataOverviewDO>()
                 .in(FactoryDataOverviewDO::getFactoryId, ids));
-
         Map<Long, List<FactoryDataOverviewDO>> doMaps = dos.stream().collect(Collectors.groupingBy(FactoryDataOverviewDO::getFactoryId));
-
-
         if (factoryId != null) {
             Map<Long, List<FactoryInfoDO>> map = factoryInfos.stream().collect(Collectors.groupingBy(FactoryInfoDO::getId));
             List<FactoryInfoDO> items = map.get(factoryId);
@@ -305,12 +302,10 @@ public class ScreenDataServiceImpl implements ScreenDataService {
                 int randomNumber = random.nextInt(51) + 50;
                 vo.setEmissions(randomNumber);
                 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());
-                } else {
-                    vo.setForkliftTotal(0);
+                    vos.add(vo);
                 }
-                vos.add(vo);
             }
         }
         Collections.reverse(vos);