diff --git a/src/main/java/com/dispose/controller/DisposeTaskController.java b/src/main/java/com/dispose/controller/DisposeTaskController.java index 3a340666..b09c49ee 100644 --- a/src/main/java/com/dispose/controller/DisposeTaskController.java +++ b/src/main/java/com/dispose/controller/DisposeTaskController.java @@ -194,7 +194,7 @@ public class DisposeTaskController { taskData.setType(taskInfo.getType()); taskData.setDisposeIp(taskInfo.getDisposeIp()); taskData.setLeftTime(Math.abs(Helper.getTimestampDiffNow(taskInfo.getBeginTime()) - - Helper.getTimestampDiffNow(taskInfo.getPlanEndTime())) /60 ); + - Helper.getTimestampDiffNow(taskInfo.getPlanEndTime())) / 60); taskData.setStatus(retError.getCode()); taskData.setMessage(retError.getMsg()); @@ -374,7 +374,7 @@ public class DisposeTaskController { StopTaskData reqInfo = mr.getRequestObject(StopTaskData.class); - if(reqInfo.getType() ==null || String.valueOf(reqInfo.getType()).length() == 0){ + if (reqInfo.getType() == null || String.valueOf(reqInfo.getType()).length() == 0) { return ProtocolRespDTO.result(ErrorCode.ERR_PARAMEXCEPTION); } @@ -538,7 +538,7 @@ public class DisposeTaskController { .build(); rspInfo.getItems().add(taskInfoData); - taskInfoData.setId(v.getId().toString()); + taskInfoData.setId(v.getDeviceId().toString()); taskInfoData.setStatus(ErrorCode.ERR_OK.getCode()); taskInfoData.setMessage(ErrorCode.ERR_OK.getMsg()); }); @@ -551,8 +551,8 @@ public class DisposeTaskController { unExists.forEach(v -> { TaskInfoData taskData = new TaskInfoData(); rspInfo.getItems().add(taskData); - taskData.setTaskId("-1"); - taskData.setId(v); + taskData.setTaskId(v); + taskData.setId("-1"); taskData.setStartTime(0); taskData.setDisposeTime(0); taskData.setStatus(ErrorCode.ERR_NOSUCHDEVICE.getCode());