cmhi
/
dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OCT 

REM:
1. 修正添加设备接口，设备能力某些字段为空时导致接口异常问题
This commit is contained in:
HuangXin 2020-09-11 02:06:12 +08:00
parent b47ae82bf2
commit ac1eb0cb09
1 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/main/java/com/dispose/controller/DisposeDeviceManagerController.java
View File

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