首页统计添加过滤条件避免key为null的错误-liyuchen
This commit is contained in:
parent
908feef7c5
commit
eb9d8526eb
|
@ -197,7 +197,7 @@ implements DisasterInfoService {
|
||||||
private Map<String,Long> disasterCountryProportion(List<DisasterInfo> disasterInfoList){
|
private Map<String,Long> disasterCountryProportion(List<DisasterInfo> disasterInfoList){
|
||||||
Map<String,Long> proportionMap;
|
Map<String,Long> proportionMap;
|
||||||
//根据国家分组统计次数以及总灾害的占比
|
//根据国家分组统计次数以及总灾害的占比
|
||||||
proportionMap = disasterInfoList.stream().collect(Collectors.groupingBy(DisasterInfo::getDisasterCountry,Collectors.counting()));
|
proportionMap = disasterInfoList.stream().filter(data->data.getDisasterCountry()!=null).collect(Collectors.groupingBy(DisasterInfo::getDisasterCountry,Collectors.counting()));
|
||||||
return proportionMap;
|
return proportionMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -207,7 +207,7 @@ implements DisasterInfoService {
|
||||||
*/
|
*/
|
||||||
private Map<String,Long> disasterNumProportion(){
|
private Map<String,Long> disasterNumProportion(){
|
||||||
List<DisasterInfo> disasterInfoList = baseMapper.getAllData();
|
List<DisasterInfo> disasterInfoList = baseMapper.getAllData();
|
||||||
Map<String,Long> proportionMap = disasterInfoList.stream().collect(Collectors.groupingBy(DisasterInfo::getDictValue,Collectors.counting()));
|
Map<String,Long> proportionMap = disasterInfoList.stream().filter(data->data.getDictValue()!=null).collect(Collectors.groupingBy(DisasterInfo::getDictValue,Collectors.counting()));
|
||||||
return proportionMap;
|
return proportionMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue