cmhi
/
dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OCT 

REM:
1. 修正节点信息接口，统计reserveNetflow字段为null时异常问题
This commit is contained in:
HuangXin 2020-09-15 09:35:42 +08:00
parent 4735ca7a4b
commit 28f7af5789
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/dispose/service/impl/AreaCodeManagerServiceImpl.java
View File

@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -56,11 +57,12 @@ public class AreaCodeManagerServiceImpl implements AreaCodeManagerService {
public int getAreaCodeGroupReserveNetflow(Integer areaCode) { public int getAreaCodeGroupReserveNetflow(Integer areaCode) {
List<DisposeDevice> disposeDevices = disposeDeviceManagerService.getAllDisposeDevice(); List<DisposeDevice> disposeDevices = disposeDeviceManagerService.getAllDisposeDevice();
return disposeDevices.stream() return disposeDevices.stream()
.filter(v -> v.getAreaCode().equals(areaCode)) .filter(v -> v.getAreaCode().equals(areaCode))
.mapToInt(v -> v.getDevCapacity().stream() .mapToInt(v -> v.getDevCapacity().stream()
.filter(k -> k.getCapacityType() == DisposeCapacityType.CLEANUP) .filter(k -> k.getCapacityType() == DisposeCapacityType.CLEANUP)
.mapToInt(DisposeCapacity::getReserveNetflow).sum()) .mapToInt(m -> Optional.ofNullable(m.getReserveNetflow()).orElse(0))
.sum(); .sum())
.sum();
} }
/** /**
@ -73,11 +75,11 @@ public class AreaCodeManagerServiceImpl implements AreaCodeManagerService {
public int getAreaCodeOnlineDeviceNum(Integer areaCode) { public int getAreaCodeOnlineDeviceNum(Integer areaCode) {
List<DisposeDevice> disposeDevices = disposeDeviceManagerService.getAllDisposeDevice(); List<DisposeDevice> disposeDevices = disposeDeviceManagerService.getAllDisposeDevice();
return (int) disposeDevices.stream() return (int) disposeDevices.stream()
.filter(v -> v.getAreaCode().equals(areaCode)) .filter(v -> v.getAreaCode().equals(areaCode))
.filter(k -> disposeAbilityRouterService.getAbilityDevice(k.getId()) .filter(k -> disposeAbilityRouterService.getAbilityDevice(k.getId())
.getDb() .getDb()
.getDeviceLinkStatus()) .getDeviceLinkStatus())
.count(); .count();
} }
/** /**
@ -90,10 +92,10 @@ public class AreaCodeManagerServiceImpl implements AreaCodeManagerService {
public DisposeCapacityType[] getAreaCodeSupportCapacity(Integer areaCode) { public DisposeCapacityType[] getAreaCodeSupportCapacity(Integer areaCode) {
List<DisposeDevice> disposeDevices = disposeDeviceManagerService.getAllDisposeDevice(); List<DisposeDevice> disposeDevices = disposeDeviceManagerService.getAllDisposeDevice();
return disposeDevices.stream() return disposeDevices.stream()
.filter(v -> v.getAreaCode().equals(areaCode)) .filter(v -> v.getAreaCode().equals(areaCode))
.flatMap(k -> k.getDevCapacity().stream() .flatMap(k -> k.getDevCapacity().stream()
.map(DisposeCapacity::getCapacityType)) .map(DisposeCapacity::getCapacityType))
.distinct() .distinct()
.toArray(DisposeCapacityType[]::new); .toArray(DisposeCapacityType[]::new);
} }
} }