部分过滤

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

@@ -295,8 +295,21 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
             list6.add( eartagData2.getBat());
             list7.add( eartagData2.getEarTemp1());
         }
-        Filter filter1 = new Filter(list1,0.2);
-        List<Double> earTemp1 = filter1.max(20, 200, 30, 40);
+        Map endMap = new HashMap();
+        int size = list1.size();
+        if (size > 10){
+            List<Double> firstPart = list1.subList(0, size - 10);
+            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);
+            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()));
+        }
+
+//        Filter filter1 = new Filter(list1,0.2);
+//        List<Double> earTemp1 = filter1.max(20, 200, 30, 40);
 
 //        Filter filter2 = new Filter(list2,0.2);
 //        List<Double> earTemp2 = filter2.max(20, 200, 30, 40);
@@ -304,8 +317,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
 //        Filter filter3 = new Filter(list3,0.2);
 //        List<Double> earTemp3 = filter3.max(20, 200, 10, 40);
 
-        Map endMap = new HashMap();
-        endMap.put("earTemp1",earTemp1.stream().map(number -> String.format("%.2f", number)).collect(Collectors.toList()));
+//        endMap.put("earTemp1",earTemp1.stream().map(number -> String.format("%.2f", number)).collect(Collectors.toList()));
         endMap.put("earTemp2",list2.stream().map(number -> String.format("%.2f", number)).collect(Collectors.toList()));
         endMap.put("getEnvTemp1",list3.stream().map(number -> String.format("%.2f", number)).collect(Collectors.toList()));
         endMap.put("earTemp",list7.stream().map(number -> String.format("%.2f", number)).collect(Collectors.toList()));