增加过滤

neim-biz/src/main/java/com/jiayue/biz/service/impl/ProphaseAnemometryDataServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 import java.sql.Timestamp;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @AllArgsConstructor
@@ -57,33 +58,40 @@ public class ProphaseAnemometryDataServiceImpl extends ServiceImpl<ProphaseAnemo
     }
 
     //查询所有层高风速以及风速标差
-    public  List<ProphaseAnemometryData> selectAveAndSta(String equipmentId, Timestamp startTime, Timestamp endTime) {
-        return baseMapper.selectAveAndSta(equipmentId, startTime, endTime);
+    public List<ProphaseAnemometryData> selectAveAndSta(String equipmentId, Timestamp startTime, Timestamp endTime) {
+        return this.filterData(baseMapper.selectAveAndSta(equipmentId, startTime, endTime));
     }
 
     //查询所有层高风速
     public List<ProphaseAnemometryData> selectWsAve(String equipmentId, Timestamp startTime, Timestamp endTime) {
-        return baseMapper.selectWsAve(equipmentId, startTime, endTime);
+        return this.filterData(baseMapper.selectWsAve(equipmentId, startTime, endTime));
     }
 
     //根据层高和设备编号查询风速
     public List<ProphaseAnemometryData> selectWsAveForHeight(String equipmentId, Timestamp startTime, Timestamp endTime, String height) {
-        return baseMapper.selectWsAveForHeight(equipmentId, startTime, endTime, height);
+        return this.filterData(baseMapper.selectWsAveForHeight(equipmentId, startTime, endTime, height));
     }
 
 
     //根据层高和设备编号查询风向
-    public   List<ProphaseAnemometryData> selectWdAveForHeight(String equipmentId, Timestamp startTime, Timestamp endTime, String height){
+    public List<ProphaseAnemometryData> selectWdAveForHeight(String equipmentId, Timestamp startTime, Timestamp endTime, String height) {
         return baseMapper.selectWdAveForHeight(equipmentId, startTime, endTime, height);
     }
 
     //根据层高和设备编号查询风向、风速、标差
-    public List<ProphaseAnemometryData> selectWdAveAndWdAveAndWsStaForHeight(String equipmentId, Timestamp startTime, Timestamp endTime, String height){
-        return baseMapper.selectWdAveAndWdAveAndWsStaForHeight(equipmentId, startTime, endTime, height);
+    public List<ProphaseAnemometryData> selectWdAveAndWdAveAndWsStaForHeight(String equipmentId, Timestamp startTime, Timestamp endTime, String height) {
+        return this.filterData(baseMapper.selectWdAveAndWdAveAndWsStaForHeight(equipmentId, startTime, endTime, height));
     }
 
     //查询设备编号查询所有层高风向 风速 风速标差
-    public List<ProphaseAnemometryData> selectWdAveAndWdAveAndWsSta(String equipmentId, Timestamp startTime, Timestamp endTime){
-        return baseMapper.selectWdAveAndWdAveAndWsSta(equipmentId, startTime, endTime);
+    public List<ProphaseAnemometryData> selectWdAveAndWdAveAndWsSta(String equipmentId, Timestamp startTime, Timestamp endTime) {
+        return this.filterData(baseMapper.selectWdAveAndWdAveAndWsSta(equipmentId, startTime, endTime));
     }
+
+    //过滤
+    public List<ProphaseAnemometryData> filterData(List<ProphaseAnemometryData> prophaseAnemometryData) {
+
+        return prophaseAnemometryData.stream().filter(p -> p.getWsAve() < 50 && p.getWsSta() < 10).collect(Collectors.toList());
+    }
+
 }