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-05-14 17:47:21 +08:00
parent 44e3c6e284
commit 41029fd9c3
2 changed files with 85 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
src/main/java/com/dispose/controller/DisposeNodeInfoController.java
View File

@ -59,12 +59,6 @@ public class DisposeNodeInfoController {
@Resource @Resource
private TaskService taskService; private TaskService taskService;
/**
* The Object mapper.
*/
@Resource
private ObjectMapper objectMapper;
/** /**
* The Dispose node manager. * The Dispose node manager.
*/ */
@ -102,8 +96,7 @@ public class DisposeNodeInfoController {
List<DisposeDevice> devs = disposeNodeManager.getAllDisposeDevice(); List<DisposeDevice> devs = disposeNodeManager.getAllDisposeDevice();
if (devs != null && devs.size() > 0) { if (devs != null && devs.size() > 0) {
devs.forEach(v -> linkStatusListRsp.getItems() devs.forEach(v -> linkStatusListRsp.getItems().add(LinkStatusRsp.builder()
.add(LinkStatusRsp.builder()
.online(v.getLinkStatus()) .online(v.getLinkStatus())
.id(v.getId().toString()) .id(v.getId().toString())
.status(ErrorCode.ERR_OK.getCode()) .status(ErrorCode.ERR_OK.getCode())
@ -113,23 +106,20 @@ public class DisposeNodeInfoController {
} else { } else {
for (String v : reqInfo.getId()) { for (String v : reqInfo.getId()) {
DisposeDevice dev = disposeNodeManager.getDisposeDeviceById(Long.valueOf(v)); DisposeDevice dev = disposeNodeManager.getDisposeDeviceById(Long.valueOf(v));
if (dev != null && dev.getId() if (dev != null && dev.getId().equals(Long.valueOf(v))) {
.equals(Long.valueOf(v))) { linkStatusListRsp.getItems().add(LinkStatusRsp.builder()
linkStatusListRsp.getItems()
.add(LinkStatusRsp.builder()
.online(dev.getLinkStatus()) .online(dev.getLinkStatus())
.id(dev.getId().toString()) .id(dev.getId().toString())
.status(ErrorCode.ERR_OK.getCode()) .status(ErrorCode.ERR_OK.getCode())
.message(ErrorCode.ERR_OK.getMsg()) .message(ErrorCode.ERR_OK.getMsg())
.build()); .build());
} else { } else {
linkStatusListRsp.getItems() linkStatusListRsp.getItems().add(LinkStatusRsp.builder()
.add(LinkStatusRsp.builder()
.online(0) .online(0)
.id(v) .id(v)
.status(ErrorCode.ERR_NOSUCHDEVICE.getCode()) .status(ErrorCode.ERR_NOSUCHDEVICE.getCode())
.message(ErrorCode.ERR_NOSUCHDEVICE.getMsg()). .message(ErrorCode.ERR_NOSUCHDEVICE.getMsg())
build()); .build());
} }
} }
} }
@ -158,7 +148,6 @@ public class DisposeNodeInfoController {
} }
IDArrayReq reqInfo = mr.getRequestObject(IDArrayReq.class); IDArrayReq reqInfo = mr.getRequestObject(IDArrayReq.class);
List<VersionRsp> rspInfo = new ArrayList<>();
VersionListRsp versionListRsp = new VersionListRsp(); VersionListRsp versionListRsp = new VersionListRsp();
versionListRsp.setItems(new ArrayList<>()); versionListRsp.setItems(new ArrayList<>());
@ -166,8 +155,7 @@ public class DisposeNodeInfoController {
List<DisposeDevice> devList = disposeNodeManager.getAllDisposeDevice(); List<DisposeDevice> devList = disposeNodeManager.getAllDisposeDevice();
if (devList != null && devList.size() > 0) { if (devList != null && devList.size() > 0) {
devList.forEach(v -> versionListRsp.getItems() devList.forEach(v -> versionListRsp.getItems().add(VersionRsp.builder()
.add(VersionRsp.builder()
.id(v.getId().toString()) .id(v.getId().toString())
.version(v.getVersion()) .version(v.getVersion())
.status(ErrorCode.ERR_OK.getCode()) .status(ErrorCode.ERR_OK.getCode())
@ -177,19 +165,15 @@ public class DisposeNodeInfoController {
} else { } else {
for (String v : reqInfo.getId()) { for (String v : reqInfo.getId()) {
DisposeDevice dev = disposeNodeManager.getDisposeDeviceById(Long.valueOf(v)); DisposeDevice dev = disposeNodeManager.getDisposeDeviceById(Long.valueOf(v));
VersionRsp ver; if (dev != null && dev.getId().equals(Long.valueOf(v))) {
if (dev != null && dev.getId() versionListRsp.getItems().add(VersionRsp.builder()
.equals(Long.valueOf(v))) {
versionListRsp.getItems()
.add(VersionRsp.builder()
.id(dev.getId().toString()) .id(dev.getId().toString())
.version(dev.getVersion()) .version(dev.getVersion())
.status(ErrorCode.ERR_OK.getCode()) .status(ErrorCode.ERR_OK.getCode())
.message(ErrorCode.ERR_OK.getMsg()) .message(ErrorCode.ERR_OK.getMsg())
.build()); .build());
} else { } else {
versionListRsp.getItems() versionListRsp.getItems().add(VersionRsp.builder()
.add(VersionRsp.builder()
.id(v) .id(v)
.status(ErrorCode.ERR_NOSUCHDEVICE.getCode()) .status(ErrorCode.ERR_NOSUCHDEVICE.getCode())
.message(ErrorCode.ERR_NOSUCHDEVICE.getMsg()) .message(ErrorCode.ERR_NOSUCHDEVICE.getMsg())
@ -231,68 +215,38 @@ public class DisposeNodeInfoController {
List<DisposeDevice> devList = disposeNodeManager.getAllDisposeDevice(); List<DisposeDevice> devList = disposeNodeManager.getAllDisposeDevice();
if (devList != null && devList.size() > 0) { if (devList != null && devList.size() > 0) {
devList.forEach(v -> rspInfo.getItems() devList.forEach(v -> rspInfo.getItems().add(new DeviceInfoData(
.add(new DeviceInfoData( v.getId().toString(),
v.getId() v.getDevInfo().getVendor(),
.toString(), v.getDevInfo().getModel(),
v.getDevInfo() v.getDevInfo().getFirmware(),
.getVendor(), v.getDevInfo().getOs(),
v.getDevInfo() v.getDevInfo().getKernel(),
.getModel(), v.getDevInfo().getArch(),
v.getDevInfo() v.getDevInfo().getMemory(),
.getFirmware(), v.getDevInfo().getFreeMemory(),
v.getDevInfo() v.getDevInfo().getCpuUsed(),
.getOs(),
v.getDevInfo()
.getKernel(),
v.getDevInfo()
.getArch(),
v.getDevInfo()
.getMemory(),
v.getDevInfo()
.getFreeMemory(),
v.getDevInfo()
.getCpuUsed(),
ErrorCode.ERR_OK ErrorCode.ERR_OK
))); )));
} }
} else { } else {
for (String v : reqInfo.getId()) { for (String v : reqInfo.getId()) {
DisposeDevice dev = disposeNodeManager.getDisposeDeviceById(Long.valueOf(v)); DisposeDevice dev = disposeNodeManager.getDisposeDeviceById(Long.valueOf(v));
if (dev != null if (dev != null && dev.getId().equals(Long.valueOf(v)) && dev.getDevInfo() != null) {
&& dev.getId() rspInfo.getItems().add(new DeviceInfoData(dev.getId().toString(),
.equals(Long.valueOf(v)) dev.getDevInfo().getVendor(),
&& dev.getDevInfo() != null) { dev.getDevInfo().getModel(),
rspInfo.getItems() dev.getDevInfo().getFirmware(),
.add(new DeviceInfoData( dev.getDevInfo().getOs(),
dev.getId() dev.getDevInfo().getKernel(),
.toString(), dev.getDevInfo().getArch(),
dev.getDevInfo() dev.getDevInfo().getMemory(),
.getVendor(), dev.getDevInfo().getFreeMemory(),
dev.getDevInfo() dev.getDevInfo().getCpuUsed(),
.getModel(),
dev.getDevInfo()
.getFirmware(),
dev.getDevInfo()
.getOs(),
dev.getDevInfo()
.getKernel(),
dev.getDevInfo()
.getArch(),
dev.getDevInfo()
.getMemory(),
dev.getDevInfo()
.getFreeMemory(),
dev.getDevInfo()
.getCpuUsed(),
ErrorCode.ERR_OK ErrorCode.ERR_OK
)); ));
} else { } else {
rspInfo.getItems() rspInfo.getItems().add(new DeviceInfoData(v, ErrorCode.ERR_NOSUCHDEVICE));
.add(new DeviceInfoData(
v,
ErrorCode.ERR_NOSUCHDEVICE
));
} }
} }
} }
@ -332,39 +286,33 @@ public class DisposeNodeInfoController {
if (devList != null && devList.size() > 0) { if (devList != null && devList.size() > 0) {
devList.forEach(v -> { devList.forEach(v -> {
DeviceCapacityData cpData = new DeviceCapacityData(v.getDevCaps()); DeviceCapacityData cpData = new DeviceCapacityData(v.getDevCaps());
cpData.setId(v.getId() cpData.setId(v.getId().toString());
.toString());
cpData.setStatus(ErrorCode.ERR_OK.getCode()); cpData.setStatus(ErrorCode.ERR_OK.getCode());
cpData.setMessage(ErrorCode.ERR_OK.getMsg()); cpData.setMessage(ErrorCode.ERR_OK.getMsg());
rspInfo.getItems() rspInfo.getItems().add(cpData);
.add(cpData);
}); });
} }
} else { } else {
for (String v : reqInfo.getId()) { for (String v : reqInfo.getId()) {
DisposeDevice dev = disposeNodeManager.getDisposeDeviceById(Long.valueOf(v)); DisposeDevice dev = disposeNodeManager.getDisposeDeviceById(Long.valueOf(v));
if (dev != null && dev.getId() if (dev != null && dev.getId().equals(Long.valueOf(v))) {
.equals(Long.valueOf(v))) {
DeviceCapacityData cpData = new DeviceCapacityData(dev.getDevCaps()); DeviceCapacityData cpData = new DeviceCapacityData(dev.getDevCaps());
cpData.setId(dev.getId() cpData.setId(dev.getId().toString());
.toString());
cpData.setStatus(ErrorCode.ERR_OK.getCode()); cpData.setStatus(ErrorCode.ERR_OK.getCode());
cpData.setMessage(ErrorCode.ERR_OK.getMsg()); cpData.setMessage(ErrorCode.ERR_OK.getMsg());
rspInfo.getItems() rspInfo.getItems().add(cpData);
.add(cpData);
} else { } else {
DeviceCapacityData cpData = new DeviceCapacityData(); DeviceCapacityData cpData = new DeviceCapacityData();
cpData.setId(v); cpData.setId(v);
cpData.setStatus(ErrorCode.ERR_NOSUCHDEVICE.getCode()); cpData.setStatus(ErrorCode.ERR_NOSUCHDEVICE.getCode());
cpData.setMessage(ErrorCode.ERR_NOSUCHDEVICE.getMsg()); cpData.setMessage(ErrorCode.ERR_NOSUCHDEVICE.getMsg());
rspInfo.getItems() rspInfo.getItems().add(cpData);
.add(cpData);
} }
} }
} }
String rspMessage = String rspMessage = new ObjectMapper()
new ObjectMapper().writerWithView(DisposeCapacity.CapacityView.class) .writerWithView(DisposeCapacity.CapacityView.class)
.writeValueAsString(rspInfo); .writeValueAsString(rspInfo);
return ProtocolRespDTO.result(ErrorCode.ERR_OK, rspMessage, ConstValue.Protocol.CRYPTO_NONE); return ProtocolRespDTO.result(ErrorCode.ERR_OK, rspMessage, ConstValue.Protocol.CRYPTO_NONE);
@ -402,39 +350,32 @@ public class DisposeNodeInfoController {
if (devList != null && devList.size() > 0) { if (devList != null && devList.size() > 0) {
devList.forEach(v -> { devList.forEach(v -> {
DeviceCapacityData cpData = new DeviceCapacityData(v.getDevCaps()); DeviceCapacityData cpData = new DeviceCapacityData(v.getDevCaps());
cpData.setId(v.getId() cpData.setId(v.getId().toString());
.toString());
cpData.setStatus(ErrorCode.ERR_OK.getCode()); cpData.setStatus(ErrorCode.ERR_OK.getCode());
cpData.setMessage(ErrorCode.ERR_OK.getMsg()); cpData.setMessage(ErrorCode.ERR_OK.getMsg());
rspInfo.getItems() rspInfo.getItems().add(cpData);
.add(cpData);
}); });
} }
} else { } else {
for (String v : reqInfo.getId()) { for (String v : reqInfo.getId()) {
DisposeDevice dev = disposeNodeManager.getDisposeDeviceById(Long.valueOf(v)); DisposeDevice dev = disposeNodeManager.getDisposeDeviceById(Long.valueOf(v));
if (dev != null && dev.getId() if (dev != null && dev.getId().equals(Long.valueOf(v))) {
.equals(Long.valueOf(v))) {
DeviceCapacityData cpData = new DeviceCapacityData(dev.getDevCaps()); DeviceCapacityData cpData = new DeviceCapacityData(dev.getDevCaps());
cpData.setId(dev.getId() cpData.setId(dev.getId().toString());
.toString());
cpData.setStatus(ErrorCode.ERR_OK.getCode()); cpData.setStatus(ErrorCode.ERR_OK.getCode());
cpData.setMessage(ErrorCode.ERR_OK.getMsg()); cpData.setMessage(ErrorCode.ERR_OK.getMsg());
rspInfo.getItems() rspInfo.getItems().add(cpData);
.add(cpData);
} else { } else {
DeviceCapacityData cpData = new DeviceCapacityData(); DeviceCapacityData cpData = new DeviceCapacityData();
cpData.setId(v); cpData.setId(v);
cpData.setStatus(ErrorCode.ERR_NOSUCHDEVICE.getCode()); cpData.setStatus(ErrorCode.ERR_NOSUCHDEVICE.getCode());
cpData.setMessage(ErrorCode.ERR_NOSUCHDEVICE.getMsg()); cpData.setMessage(ErrorCode.ERR_NOSUCHDEVICE.getMsg());
rspInfo.getItems() rspInfo.getItems().add(cpData);
.add(cpData);
} }
} }
} }
String rspMessage = String rspMessage = new ObjectMapper().writerWithView(DisposeCapacity.DependIpView.class)
new ObjectMapper().writerWithView(DisposeCapacity.DependIpView.class)
.writeValueAsString(rspInfo); .writeValueAsString(rspInfo);
return ProtocolRespDTO.result(ErrorCode.ERR_OK, rspMessage, ConstValue.Protocol.CRYPTO_NONE); return ProtocolRespDTO.result(ErrorCode.ERR_OK, rspMessage, ConstValue.Protocol.CRYPTO_NONE);
@ -488,30 +429,25 @@ public class DisposeNodeInfoController {
.ip(v.getIpAddr()) .ip(v.getIpAddr())
.build(); .build();
dpData.setId(v.getId() dpData.setId(v.getId().toString());
.toString());
dpData.setStatus(ErrorCode.ERR_OK.getCode()); dpData.setStatus(ErrorCode.ERR_OK.getCode());
dpData.setMessage(ErrorCode.ERR_OK.getMsg()); dpData.setMessage(ErrorCode.ERR_OK.getMsg());
rspInfo.getItems() rspInfo.getItems().add(dpData);
.add(dpData);
}); });
} }
} else { } else {
for (String v : reqInfo.getId()) { for (String v : reqInfo.getId()) {
DisposeDevice dev = disposeNodeManager.getDisposeDeviceById(Long.valueOf(v)); DisposeDevice dev = disposeNodeManager.getDisposeDeviceById(Long.valueOf(v));
if (dev != null && dev.getId() if (dev != null && dev.getId().equals(Long.valueOf(v))) {
.equals(Long.valueOf(v))) {
DisposeNodeData dpData = DisposeNodeData.builder() DisposeNodeData dpData = DisposeNodeData.builder()
.type(dev.getType()) .type(dev.getType())
.name(dev.getName()) .name(dev.getName())
.ip(dev.getIpAddr()) .ip(dev.getIpAddr())
.build(); .build();
dpData.setId(dev.getId() dpData.setId(dev.getId().toString());
.toString());
dpData.setStatus(ErrorCode.ERR_OK.getCode()); dpData.setStatus(ErrorCode.ERR_OK.getCode());
dpData.setMessage(ErrorCode.ERR_OK.getMsg()); dpData.setMessage(ErrorCode.ERR_OK.getMsg());
rspInfo.getItems() rspInfo.getItems().add(dpData);
.add(dpData);
} else { } else {
DisposeNodeData dpData = new DisposeNodeData(); DisposeNodeData dpData = new DisposeNodeData();
dpData.setId(v); dpData.setId(v);
@ -565,19 +501,16 @@ public class DisposeNodeInfoController {
v.getReadme(), v.getReadme(),
v.getDevCaps() v.getDevCaps()
); );
dpData.setId(v.getId() dpData.setId(v.getId().toString());
.toString());
dpData.setStatus(ErrorCode.ERR_OK.getCode()); dpData.setStatus(ErrorCode.ERR_OK.getCode());
dpData.setMessage(ErrorCode.ERR_OK.getMsg()); dpData.setMessage(ErrorCode.ERR_OK.getMsg());
rspInfo.getItems() rspInfo.getItems().add(dpData);
.add(dpData);
}); });
} }
} else { } else {
for (String v : reqInfo.getId()) { for (String v : reqInfo.getId()) {
DisposeDevice dev = disposeNodeManager.getDisposeDeviceById(Long.valueOf(v)); DisposeDevice dev = disposeNodeManager.getDisposeDeviceById(Long.valueOf(v));
if (dev != null && dev.getId() if (dev != null && dev.getId().equals(Long.valueOf(v))) {
.equals(Long.valueOf(v))) {
DisposeNodeData dpData = new DisposeNodeData( DisposeNodeData dpData = new DisposeNodeData(
dev.getType(), dev.getType(),
dev.getName(), dev.getName(),
@ -589,19 +522,16 @@ public class DisposeNodeInfoController {
dev.getReadme(), dev.getReadme(),
dev.getDevCaps() dev.getDevCaps()
); );
dpData.setId(dev.getId() dpData.setId(dev.getId().toString());
.toString());
dpData.setStatus(ErrorCode.ERR_OK.getCode()); dpData.setStatus(ErrorCode.ERR_OK.getCode());
dpData.setMessage(ErrorCode.ERR_OK.getMsg()); dpData.setMessage(ErrorCode.ERR_OK.getMsg());
rspInfo.getItems() rspInfo.getItems().add(dpData);
.add(dpData);
} else { } else {
DisposeNodeData dpData = new DisposeNodeData(); DisposeNodeData dpData = new DisposeNodeData();
dpData.setId(v); dpData.setId(v);
dpData.setStatus(ErrorCode.ERR_NOSUCHDEVICE.getCode()); dpData.setStatus(ErrorCode.ERR_NOSUCHDEVICE.getCode());
dpData.setMessage(ErrorCode.ERR_NOSUCHDEVICE.getMsg()); dpData.setMessage(ErrorCode.ERR_NOSUCHDEVICE.getMsg());
rspInfo.getItems() rspInfo.getItems().add(dpData);
.add(dpData);
} }
} }
} }
@ -634,8 +564,7 @@ public class DisposeNodeInfoController {
List<DisposeDevice> valuableData = disposeNodeManager.getAllDisposeDevice() List<DisposeDevice> valuableData = disposeNodeManager.getAllDisposeDevice()
.stream() .stream()
.filter(v -> reqInfo.getId().length == 0 .filter(v -> reqInfo.getId().length == 0
|| Arrays.stream(reqInfo.getId()) || Arrays.stream(reqInfo.getId()).anyMatch(s -> s.equals(v.getId().toString())))
.anyMatch(s -> s.equals(v.getId().toString())))
.collect(Collectors.toList()); .collect(Collectors.toList());
valuableData.forEach(v -> { valuableData.forEach(v -> {
@ -712,9 +641,7 @@ public class DisposeNodeInfoController {
List<DisposeDevice> valuableData = disposeNodeManager.getAllDisposeDevice() List<DisposeDevice> valuableData = disposeNodeManager.getAllDisposeDevice()
.stream() .stream()
.filter(v -> reqInfo.getId().length == 0 .filter(v -> reqInfo.getId().length == 0
|| Arrays.stream(reqInfo.getId()) || Arrays.stream(reqInfo.getId()).anyMatch(s -> s.equals(v.getId().toString())))
.anyMatch(s -> s.equals(v.getId()
.toString())))
.collect(Collectors.toList()); .collect(Collectors.toList());
valuableData.forEach(v -> { valuableData.forEach(v -> {

9
src/main/java/com/dispose/controller/DisposeTaskController.java
View File

@ -5,7 +5,6 @@ import com.dispose.common.ErrorCode;
import com.dispose.common.FlowDirection; import com.dispose.common.FlowDirection;
import com.dispose.common.Helper; import com.dispose.common.Helper;
import com.dispose.manager.TaskCacheManager; import com.dispose.manager.TaskCacheManager;
import com.dispose.mapper.DisposeTaskMapper;
import com.dispose.pojo.dto.ProtocolReqDTO; import com.dispose.pojo.dto.ProtocolReqDTO;
import com.dispose.pojo.dto.ProtocolRespDTO; import com.dispose.pojo.dto.ProtocolRespDTO;
import com.dispose.pojo.entity.DisposeDevice; import com.dispose.pojo.entity.DisposeDevice;
@ -77,12 +76,6 @@ public class DisposeTaskController {
@Resource @Resource
private UserAccountService userAccountService; private UserAccountService userAccountService;
/**
* The Dispose task manager.
*/
@Resource
private DisposeTaskMapper disposeTaskMapper;
/** /**
* Task start protocol resp dto. * Task start protocol resp dto.
* *
@ -229,7 +222,7 @@ public class DisposeTaskController {
rspInfo.getItems().add(taskData); rspInfo.getItems().add(taskData);
} else { } else {
ret.forEach(k -> { ret.forEach(k -> {
if(k.getFirstParam() == ErrorCode.ERR_OK) { if (k.getFirstParam() == ErrorCode.ERR_OK) {
ErrorCode retError = k.getFirstParam(); ErrorCode retError = k.getFirstParam();
TaskInfoDetail taskInfo = k.getSecondParam(); TaskInfoDetail taskInfo = k.getSecondParam();
taskData.setId(String.valueOf(taskInfo.getDeviceId())); taskData.setId(String.valueOf(taskInfo.getDeviceId()));