From d134d847dc6746d71e380ab6b658bd0951bd8264 Mon Sep 17 00:00:00 2001 From: ForwithyNew <2008nmj@sina.com> Date: Tue, 11 Jun 2024 11:51:46 +0800 Subject: [PATCH] =?UTF-8?q?/getHistoryWarning=E6=8E=A5=E5=8F=A3=EF=BC=9A?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6(?= =?UTF-8?q?=E6=9A=B4=E9=9B=A8=E5=92=8C=E9=9B=B7=E9=9B=A8=E5=A4=A7=E9=A3=8E?= =?UTF-8?q?=EF=BC=8C=E7=BA=A2=E8=89=B2=E5=92=8C=E6=A9=99=E8=89=B2)?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/whdc/controller/QXWarnController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/whdc/controller/QXWarnController.java b/src/main/java/com/whdc/controller/QXWarnController.java index bb82e3b..a3c24a9 100644 --- a/src/main/java/com/whdc/controller/QXWarnController.java +++ b/src/main/java/com/whdc/controller/QXWarnController.java @@ -509,6 +509,8 @@ public class QXWarnController { } } List dataList2 = warnList.stream().sorted(Comparator.comparing(QXWarningVO::getPublishTime).reversed()).collect(Collectors.toList()); + dataList2 = dataList2.stream().filter(o -> "暴雨".equals(o.getWarnSignalType())||"雷雨大风".equals(o.getWarnSignalType())).collect(Collectors.toList()); + dataList2 = dataList2.stream().filter(o -> "红色".equals(o.getWarnSignalLevel())||"橙色".equals(o.getWarnSignalLevel())).collect(Collectors.toList()); if(dataList2.size()>=(pageNumber-1)*pageSize&&dataList2.size()>=pageNumber*pageSize){ for(int i=(pageNumber-1)*pageSize;i dataList2 = warnList.stream().sorted(Comparator.comparing(QXWarningVO::getPublishTime).reversed()).collect(Collectors.toList()); + dataList2 = dataList2.stream().filter(o -> "暴雨".equals(o.getWarnSignalType())||"雷雨大风".equals(o.getWarnSignalType())).collect(Collectors.toList()); + dataList2 = dataList2.stream().filter(o -> "红色".equals(o.getWarnSignalLevel())||"橙色".equals(o.getWarnSignalLevel())).collect(Collectors.toList()); if(dataList2.size()>=10){ for(int i=0;i<10;i++){ // System.out.println("时间："+dataList2.get(i).getPublishTime());