From b32a960138ccd3785e4477f9f3d98325f6f70ea2 Mon Sep 17 00:00:00 2001 From: huangxin Date: Wed, 22 Apr 2020 10:25:43 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E4=BF=AE=E6=AD=A3=E8=99=9A?= =?UTF-8?q?=E6=8B=9F=E5=A4=84=E7=BD=AE=E8=AE=BE=E5=A4=87=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dispose/impl/VirtualDeviceImpl.java | 5 +++++ .../vo/information/DeviceCapacityData.java | 6 ++++-- .../service/impl/DisposeNodeManagerImpl.java | 19 +++++-------------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/dispose/dispose/impl/VirtualDeviceImpl.java b/src/main/java/com/dispose/dispose/impl/VirtualDeviceImpl.java index 77f1d056..bcc9f467 100644 --- a/src/main/java/com/dispose/dispose/impl/VirtualDeviceImpl.java +++ b/src/main/java/com/dispose/dispose/impl/VirtualDeviceImpl.java @@ -63,11 +63,16 @@ public class VirtualDeviceImpl implements DisposeEntryManager { capList.add(DisposeDeviceCapacity.builder() .capacity(ConstValue.DeviceCapacity.CLEANUP.getCode()) + .protectIpV4(new String[] {"192.168.1.1", "192.168.1.2"}) + .protectIpV6(new String[]{}) .tolFlowCapacity(1024) .build()); capList.add(DisposeDeviceCapacity.builder() .capacity(ConstValue.DeviceCapacity.DETECIVE.getCode()) + .protectIpV4(new String[] {"192.168.2.1", "192.168.2.2"}) + .protectIpV6(new String[]{}) + .tolFlowCapacity(0) .build()); return capList; diff --git a/src/main/java/com/dispose/pojo/vo/information/DeviceCapacityData.java b/src/main/java/com/dispose/pojo/vo/information/DeviceCapacityData.java index 812bd98f..9792de00 100644 --- a/src/main/java/com/dispose/pojo/vo/information/DeviceCapacityData.java +++ b/src/main/java/com/dispose/pojo/vo/information/DeviceCapacityData.java @@ -39,8 +39,10 @@ public class DeviceCapacityData extends IDReturnStatus { } cpList.forEach(v -> { - String ipAddrs = String.join(",", Arrays.asList(v.getProtectIpV4())) - + "," + String.join(",", Arrays.asList(v.getProtectIpV6()) + String ipAddrs = String.join(",", + Arrays.asList(v.getProtectIpV4() != null ? v.getProtectIpV4() : new String[] {})) + + "," + String.join(",", + Arrays.asList(v.getProtectIpV6() != null ? v.getProtectIpV6() : new String[] {}) ); if (ipAddrs.endsWith(",")) { diff --git a/src/main/java/com/dispose/service/impl/DisposeNodeManagerImpl.java b/src/main/java/com/dispose/service/impl/DisposeNodeManagerImpl.java index 225ad79d..2cb6b817 100644 --- a/src/main/java/com/dispose/service/impl/DisposeNodeManagerImpl.java +++ b/src/main/java/com/dispose/service/impl/DisposeNodeManagerImpl.java @@ -44,12 +44,11 @@ public class DisposeNodeManagerImpl implements DisposeNodeManager { DisposeEntryManager dp = DeviceRouter.deviceRouterFactory(v.getType(), v.getIpAddr(), ConstValue.IPAddrType.getIpAddrType(v.getIpAddr())); - if (dp != null) { - v.setLinkStatus(dp.getDeviceLinkStatus() ? 1 : 0); - v.setVersion(dp.getVersion()); - v.setDevInfo(dp.getDeviceInfo()); - v.setDevCaps(dp.getDeviceCapacity()); - } + + v.setLinkStatus(dp.getDeviceLinkStatus() ? 1 : 0); + v.setVersion(dp.getVersion()); + v.setDevInfo(dp.getDeviceInfo()); + v.setDevCaps(dp.getDeviceCapacity()); disposeDevMap.put(v.getIpAddr(), v); }); @@ -96,10 +95,6 @@ public class DisposeNodeManagerImpl implements DisposeNodeManager { return ErrorCode.ERR_NOSUCHDEVICE; } - if (dp == null) { - return ErrorCode.ERR_NOSUCHTYPE; - } - disposeDeviceMapper.delDisposeDeviceByIp(ipAddr); disposeDevMap.remove(ipAddr); @@ -123,10 +118,6 @@ public class DisposeNodeManagerImpl implements DisposeNodeManager { return new MReturnType<>(ErrorCode.ERR_NOSUCHDEVICE, dev.getIpAddr()); } - if (dp == null) { - return new MReturnType<>(ErrorCode.ERR_NOSUCHTYPE, dev.getIpAddr()); - } - if (disposeDeviceMapper.isDeviceExistsByIp(dev.getIpAddr()) > 0) { return new MReturnType<>(ErrorCode.ERR_DEVICEEXISTS, dev.getIpAddr()); }