|
@@ -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()));
|