lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

/getHistoryWarning接口：添加筛选条件(暴雨和雷雨大风，红色和橙色)。

master
ForwithyNew 2024-06-11 11:51:46 +08:00
parent 27dbfbb722
commit d134d847dc
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/whdc/controller/QXWarnController.java
View File

@ -509,6 +509,8 @@ public class QXWarnController {
} }
} }
List<QXWarningVO> dataList2 = warnList.stream().sorted(Comparator.comparing(QXWarningVO::getPublishTime).reversed()).collect(Collectors.toList()); List<QXWarningVO> 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){ if(dataList2.size()>=(pageNumber-1)*pageSize&&dataList2.size()>=pageNumber*pageSize){
for(int i=(pageNumber-1)*pageSize;i<pageNumber*pageSize;i++){ for(int i=(pageNumber-1)*pageSize;i<pageNumber*pageSize;i++){
QXWarningVO qxWarningVO = dataList2.get(i); QXWarningVO qxWarningVO = dataList2.get(i);
@ -578,6 +580,8 @@ public class QXWarnController {
} }
} }
List<QXWarningVO> dataList2 = warnList.stream().sorted(Comparator.comparing(QXWarningVO::getPublishTime).reversed()).collect(Collectors.toList()); List<QXWarningVO> 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){ if(dataList2.size()>=10){
for(int i=0;i<10;i++){ for(int i=0;i<10;i++){
// System.out.println("时间："+dataList2.get(i).getPublishTime()); // System.out.println("时间："+dataList2.get(i).getPublishTime());