diff --git a/src/main/java/com/dispose/controller/DisposeTaskController.java b/src/main/java/com/dispose/controller/DisposeTaskController.java index 3c9c7a88..7bddbdb2 100644 --- a/src/main/java/com/dispose/controller/DisposeTaskController.java +++ b/src/main/java/com/dispose/controller/DisposeTaskController.java @@ -103,19 +103,6 @@ public class DisposeTaskController { } StartTaskReq reqInfo = mr.getRequestObject(StartTaskReq.class); - - if (reqInfo.getDisposeIp().length() == 0 || reqInfo.getDisposeIp().equals("null")) { - return ProtocolRespDTO.result(ErrorCode.ERR_PARAMEXCEPTION); - } - - if (reqInfo.getId() == null || reqInfo.getType() == null || String.valueOf(reqInfo.getType()).length() == 0) { - return ProtocolRespDTO.result(ErrorCode.ERR_PARAMEXCEPTION); - } - - if (reqInfo.getDisposeTime() == null || reqInfo.getDisposeTime() < 0 || String.valueOf(reqInfo.getDisposeTime()).length() == 0) { - return ProtocolRespDTO.result(ErrorCode.ERR_PARAMEXCEPTION); - } - StartTaskRsp rspInfo = new StartTaskRsp(); TaskInfoDetail task = TaskInfoDetail.builder() @@ -167,11 +154,6 @@ public class DisposeTaskController { } IDArrayReq reqInfo = mr.getRequestObject(IDArrayReq.class); - - if (reqInfo.getTaskId() == null || reqInfo.getTaskId().length == 0) { - return ProtocolRespDTO.result(ErrorCode.ERR_PARAMEXCEPTION); - } - TaskInfoRsp rspInfo = new TaskInfoRsp(); Arrays.stream(reqInfo.getTaskId()).forEach(v -> { @@ -221,7 +203,7 @@ public class DisposeTaskController { public ProtocolRespDTO taskStopByIp(@RequestBody ProtocolReqDTO mr, @RequestHeader HttpHeaders headers) throws JsonProcessingException { - String regex = "\\A(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z"; + ErrorCode err = mr.verifyRequest(headers); if (err != ErrorCode.ERR_OK) { @@ -229,24 +211,6 @@ public class DisposeTaskController { } StopTaskReq reqInfo = mr.getRequestObject(StopTaskReq.class); - List item = reqInfo.getItems(); - for (StopTaskData stopTaskData : item - ) { - if (stopTaskData.getId() == null || stopTaskData.getId().length() == 0) { - return ProtocolRespDTO.result(ErrorCode.ERR_PARAMEXCEPTION); - } - - if (stopTaskData.getDisposeIp() == null || stopTaskData.getDisposeIp().length() == 0) { - return ProtocolRespDTO.result(ErrorCode.ERR_PARAMEXCEPTION); - } else if (!stopTaskData.getDisposeIp().matches(regex)) { - return ProtocolRespDTO.result(ErrorCode.ERR_PARAMEXCEPTION); - } - - if (String.valueOf(stopTaskData.getType()).length() == 0 || stopTaskData.getType() == null) { - return ProtocolRespDTO.result(ErrorCode.ERR_PARAMEXCEPTION); - } - } - TaskInfoRsp rspInfo = new TaskInfoRsp(); reqInfo.getItems().forEach(v -> { @@ -303,24 +267,10 @@ public class DisposeTaskController { } StopTaskReq reqInfo = mr.getRequestObject(StopTaskReq.class); - - List item = reqInfo.getItems(); - for (StopTaskData stopTaskData : item - ) { - if (stopTaskData.getId() == null || stopTaskData.getId().length() == 0) { - return ProtocolRespDTO.result(ErrorCode.ERR_PARAMEXCEPTION); - } - - if (String.valueOf(stopTaskData.getType()).length() == 0 || stopTaskData.getType() == null) { - return ProtocolRespDTO.result(ErrorCode.ERR_PARAMEXCEPTION); - } - } - TaskInfoRsp rspInfo = new TaskInfoRsp(); reqInfo.getItems().forEach(v -> { TaskInfoData taskData = TaskInfoData.builder().type(v.getType()).build(); - List> ret = taskService.stopTaskByDisposeNode(Long.parseLong(v.getId()), v.getType()); if (ret.size() == 0) { @@ -373,14 +323,8 @@ public class DisposeTaskController { } StopTaskData reqInfo = mr.getRequestObject(StopTaskData.class); - - if (reqInfo.getType() == null || String.valueOf(reqInfo.getType()).length() == 0) { - return ProtocolRespDTO.result(ErrorCode.ERR_PARAMEXCEPTION); - } - TaskInfoRsp rspInfo = new TaskInfoRsp(); - List> ret = taskService.stopTaskByType(reqInfo.getType()); if (ret.size() == 0) {