From 42cbb0760c3a3575ea06c71b905660cf6ad3e60b Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Fri, 29 Jan 2021 18:01:45 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DisposeAbilityRouterServiceImpl.java | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java b/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java index fdf888e0..e292d8dc 100644 --- a/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java @@ -8,14 +8,10 @@ import com.dispose.ability.impl.HuaWeiAbilityImpl; import com.dispose.ability.impl.PengXinAbilityImpl; import com.dispose.ability.impl.VirtualAbilityImpl; import com.dispose.common.DisposeCapacityType; -import com.dispose.common.DisposeConfigValue; -import com.dispose.common.DisposeObjectType; import com.dispose.common.ErrorCode; -import com.dispose.common.Helper; import com.dispose.common.HttpType; import com.dispose.manager.DisposeDeviceManager; import com.dispose.mapper.ServiceGroupMapper; -import com.dispose.pojo.entity.DisposeCapacity; import com.dispose.pojo.entity.DisposeDevice; import com.dispose.pojo.po.AbilityInfo; import com.dispose.service.DisposeAbilityRouterService; @@ -165,37 +161,6 @@ public class DisposeAbilityRouterServiceImpl implements DisposeAbilityRouterServ return ErrorCode.ERR_OK; } - /** - * Is carry ip boolean. - * - * @param disposeIp the dispose ip - * @param ipSegment the ip segment - * @return the boolean - */ - private boolean isCarryIp(String disposeIp, String ipSegment) { - for (String v : ipSegment.split(DisposeConfigValue.SPLIT_CHAR)) { - if (Helper.ipInRange(v, disposeIp)) { - return true; - } - } - return false; - } - - /** - * Is carry dispose object boolean. - * - * @param disposeIp the dispose ip - * @param cfgProtect the cfg protect - * @return the boolean - */ - private boolean isCarryDisposeObject(String disposeIp, List cfgProtect) { - - if (cfgProtect.stream().noneMatch(k -> (k.getObjectType().getValue() & DisposeObjectType.IP.getValue()) != 0)) { - return false; - } - - return cfgProtect.stream().anyMatch(k -> isCarryIp(disposeIp, k.getProtectIp())); - } /** * Verify dispose capacity error code.