大屏计算bug修复

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -1634,7 +1634,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         }
         // 统计货架里数量
         List<Map> xbkValidList = stockInfoService.getXbkCountByShelves(paramMap);
-        xbkValidList = xbkValidList.stream().filter(item->item.containsKey("cnt") && (long)item.get("cnt")<3).collect(Collectors.toList());
+        xbkValidList = xbkValidList.stream().filter(item->item.containsKey("cnt") && (long)item.get("cnt")<2).collect(Collectors.toList());
         if(xbkValidList.size()>0){
             xbkValid = false;
         }
@@ -1960,14 +1960,15 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
                     }
 
                     //获取机床启动程序时间的数据采集
-                    ToolCostomAddressHistory minTool = baseMapper.getMinTool(item.getStartTime(),ip);
 
+                    Optional<ToolCostomAddressHistory> minFirst = minProduct.stream().filter(it -> it.getIp().equals(ip)).findFirst();
                     Optional<ToolCostomAddressHistory> first = maxProduct.stream().filter(it -> it.getIp().equals(ip)).findFirst();
 
 
 
-                    if(minTool!=null && first.isPresent()){
-                        cn.hutool.json.JSONObject jsonObject=new cn.hutool.json.JSONObject(minTool.getValue());
+                    if(minFirst.isPresent() && first.isPresent()){
+                        String minValue = minFirst.get().getValue();
+                        cn.hutool.json.JSONObject jsonObject=new cn.hutool.json.JSONObject(minValue);
                         JSONArray minJsonArray = JSONArray.parseArray(jsonObject.get("values").toString());
                         String min = minJsonArray.get(101).toString();