diff --git a/src/main/java/com/dispose/controller/DisposeDeviceManagerController.java b/src/main/java/com/dispose/controller/DisposeDeviceManagerController.java index 63ac5a2d..32366148 100644 --- a/src/main/java/com/dispose/controller/DisposeDeviceManagerController.java +++ b/src/main/java/com/dispose/controller/DisposeDeviceManagerController.java @@ -81,21 +81,21 @@ public class DisposeDeviceManagerController { // 获取请求中的需要添加的设备列表 req.getItems().forEach(v -> { DisposeDevice dev = DisposeDevice.builder() - .ipAddr(v.getIpAddr()) - .ipPort(v.getIpPort()) - .deviceType(CommonEnumHandler.codeOf(DisposeDeviceType.class, - v.getDeviceType())) - .areaCode(v.getAreaCode()) - .deviceName(v.getDeviceName()) - .manufacturer(v.getManufacturer()) - .model(v.getModel()) - .version(v.getVersion()) - .userName(v.getUserName()) - .password(v.getPassword()) - .urlPath(v.getUrlPath()) - .urlType(CommonEnumHandler.codeOf(HttpType.class, v.getUrlType())) - .readme(v.getReadme()) - .build(); + .ipAddr(v.getIpAddr()) + .ipPort(v.getIpPort()) + .deviceType(CommonEnumHandler.codeOf(DisposeDeviceType.class, + v.getDeviceType())) + .areaCode(v.getAreaCode()) + .deviceName(v.getDeviceName()) + .manufacturer(v.getManufacturer()) + .model(v.getModel()) + .version(v.getVersion()) + .userName(v.getUserName()) + .password(v.getPassword()) + .urlPath(v.getUrlPath()) + .urlType(CommonEnumHandler.codeOf(HttpType.class, v.getUrlType())) + .readme(v.getReadme()) + .build(); // 初始化设备能力信息 dev.setDevCapacity(new ArrayList<>()); @@ -103,14 +103,13 @@ public class DisposeDeviceManagerController { v.getCapacity().forEach(k -> { // 添加设备能力 DisposeCapacity cap = DisposeCapacity.builder() - .capacityType(CommonEnumHandler.codeOf(DisposeCapacityType.class, k - .getCapacityType())) - .ipType(CommonEnumHandler.codeOf(IpAddrType.class, k.getIpType())) - .objectType(CommonEnumHandler.codeOf(DisposeObjectType.class, - k.getObjectType())) - .protectIp(k.getProtectIp()) - .reserveNetflow(k.getReserveNetflow()) - .build(); + .capacityType(CommonEnumHandler.codeOf(DisposeCapacityType.class, k.getCapacityType())) + .ipType(k.getIpType() == null ? IpAddrType.IPV4 : + CommonEnumHandler.codeOf(IpAddrType.class, k.getIpType())) + .objectType(CommonEnumHandler.codeOf(DisposeObjectType.class, k.getObjectType())) + .protectIp(k.getProtectIp() == null ? "" : k.getProtectIp()) + .reserveNetflow(k.getReserveNetflow()) + .build(); dev.getDevCapacity().add(cap); }); @@ -145,9 +144,9 @@ public class DisposeDeviceManagerController { ret.forEach(v -> { DisposeDevice dev = v.getSecondParam(); AddDeviceRet rsp = AddDeviceRet.builder() - .ipAddr(dev.getIpAddr()) - .ipPort(Helper.ipPortNormalize(dev.getIpPort(), dev.getUrlType())) - .build(); + .ipAddr(dev.getIpAddr()) + .ipPort(Helper.ipPortNormalize(dev.getIpPort(), dev.getUrlType())) + .build(); rsp.setStatus(v.getFirstParam().getCode()); rsp.setMessage(new String[]{v.getFirstParam().getMsg()}); @@ -231,8 +230,8 @@ public class DisposeDeviceManagerController { DisposeDevice dev = v.getSecondParam(); disposeDeviceManagerService.getAllDisposeDevice().parallelStream() - .filter(k -> k.getId().equals(dev.getId())) - .findAny().ifPresent(device -> rsp.setDevStatus(device.getStatus().getValue())); + .filter(k -> k.getId().equals(dev.getId())) + .findAny().ifPresent(device -> rsp.setDevStatus(device.getStatus().getValue())); rsp.setId(String.valueOf(dev.getId())); rsp.setStatus(v.getFirstParam().getCode()); @@ -296,12 +295,12 @@ public class DisposeDeviceManagerController { v.getDevCapacity().forEach(k -> { AddCapacityInfo capInfo = AddCapacityInfo.builder() - .capacityType(k.getCapacityType().getValue()) - .objectType(k.getObjectType().getValue()) - .ipType(k.getIpType().getValue()) - .protectIp(k.getProtectIp()) - .reserveNetflow(k.getReserveNetflow()) - .build(); + .capacityType(k.getCapacityType().getValue()) + .objectType(k.getObjectType().getValue()) + .ipType(k.getIpType().getValue()) + .protectIp(k.getProtectIp()) + .reserveNetflow(k.getReserveNetflow()) + .build(); capList.add(capInfo); });