diff --git a/src/main/java/com/dispose/ability/impl/DpTechBypassAbilityImpl.java b/src/main/java/com/dispose/ability/impl/DpTechBypassAbilityImpl.java index 28d5a712..878ded18 100644 --- a/src/main/java/com/dispose/ability/impl/DpTechBypassAbilityImpl.java +++ b/src/main/java/com/dispose/ability/impl/DpTechBypassAbilityImpl.java @@ -562,22 +562,47 @@ public class DpTechBypassAbilityImpl extends DpTechAbilityImpl { }); // UMC 同步到处置平台 - dpBypassManager.getProtectObject().values().forEach(v -> { - String serviceId = v.getProtectName() + ArrayList protectNames = new ArrayList<>(); + + for (DpProtectObject value : dpBypassManager.getProtectObject().values()) { + protectNames.add(value.getProtectName()); + + } + + for (String protectName : protectNames) { + String serviceId = protectName .replace(objectPrefix + "_", "") .replace("_" + IpAddrType.IPV4.getDescription(), "") .replace("_" + IpAddrType.IPV6.getDescription(), ""); // UMC上面存在对象已经失效 if (disposeServiceGroup.values().stream().noneMatch(k -> serviceId.equals(k.getServiceId()))) { - log.debug("++++Remove UMC Unused Protect Object: {}", v.getProtectName()); - ErrorCode err = removeProtectObject(v.getProtectName()); + log.info("++++Remove UMC Unused Protect Object: {}", protectName); + ErrorCode err = removeProtectObject(protectName); if (err != ErrorCode.ERR_OK) { - log.error("!!!!Remove Protect Object Error: {}", v.getProtectName()); + log.error("!!!!Remove Protect Object Error: {}", protectName); } } - }); + + } + +// dpBypassManager.getProtectObject().values().forEach(v -> { +// String serviceId = v.getProtectName() +// .replace(objectPrefix + "_", "") +// .replace("_" + IpAddrType.IPV4.getDescription(), "") +// .replace("_" + IpAddrType.IPV6.getDescription(), ""); +// +// // UMC上面存在对象已经失效 +// if (disposeServiceGroup.values().stream().noneMatch(k -> serviceId.equals(k.getServiceId()))) { +// log.info("++++Remove UMC Unused Protect Object: {}", v.getProtectName()); +// ErrorCode err = removeProtectObject(v.getProtectName()); +// +// if (err != ErrorCode.ERR_OK) { +// log.error("!!!!Remove Protect Object Error: {}", v.getProtectName()); +// } +// } +// }); } /**