Browse Source

部分过滤

Newspaper 1 year ago
parent
commit
cbe9e3cb8a

+ 3 - 1
huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagData2ServiceImpl.java

@@ -302,7 +302,9 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
             List<Double> lastTen = list1.subList(size - 10, size);
             Filter filter1 = new Filter(firstPart,0.2);
             List<Double> earTemp1 = filter1.max(20, 200, 30, 40);
-            earTemp1.addAll(lastTen);
+            if (ObjectUtil.isNotEmpty(lastTen)){
+                earTemp1.addAll(lastTen);
+            }
             endMap.put("earTemp1",earTemp1.stream().map(number -> String.format("%.2f", number)).collect(Collectors.toList()));
         }else {
             endMap.put("earTemp1",list1.stream().map(number -> String.format("%.2f", number)).collect(Collectors.toList()));