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