diff --git a/src/main/java/com/dispose/common/DisposeCapacityType.java b/src/main/java/com/dispose/common/DisposeCapacityType.java index 34614f93..f04c9d8a 100644 --- a/src/main/java/com/dispose/common/DisposeCapacityType.java +++ b/src/main/java/com/dispose/common/DisposeCapacityType.java @@ -6,7 +6,6 @@ package com.dispose.common; * @author */ public enum DisposeCapacityType implements BaseEnum { - //1.清洗,2.压制,3.高防 /** * The Cleanup. */ diff --git a/src/main/java/com/dispose/common/DpTechAttackType.java b/src/main/java/com/dispose/common/DpTechAttackType.java index 1eaef32e..199cfcb8 100644 --- a/src/main/java/com/dispose/common/DpTechAttackType.java +++ b/src/main/java/com/dispose/common/DpTechAttackType.java @@ -103,10 +103,13 @@ public enum DpTechAttackType implements BaseEnum { * @return the long */ public static Long formDdosAttackTypeMaks(Long ddosAttackMask) { - return getTypeMaskFromAttackType(DDoSAttackType.maskToDdosAttackType(ddosAttackMask) - .stream() - .flatMap(DpTechAttackType::fromDdosAttackTypeValue) - .distinct().toArray(DpTechAttackType[]::new)); + List dpTechAttackTypes = new ArrayList<>(); + + for(DDoSAttackType a : DDoSAttackType.maskToDdosAttackType(ddosAttackMask)) { + dpTechAttackTypes.addAll(DpTechAttackType.fromDdosAttackTypeValue(a)); + } + + return getTypeMaskFromAttackType(dpTechAttackTypes.stream().distinct().toArray(DpTechAttackType[]::new)); } /** @@ -133,7 +136,7 @@ public enum DpTechAttackType implements BaseEnum { * @param type the type * @return the stream */ - public static Stream fromDdosAttackTypeValue(DDoSAttackType type) { + public static List fromDdosAttackTypeValue(DDoSAttackType type) { List attackList = new ArrayList<>(); switch (type) { @@ -219,7 +222,7 @@ public enum DpTechAttackType implements BaseEnum { break; } - return attackList.stream(); + return attackList; } /**