diff --git a/src/main/java/com/iflytop/nuclear/entity/CheckResult.java b/src/main/java/com/iflytop/nuclear/entity/CheckResult.java index 2881ced..24c9260 100644 --- a/src/main/java/com/iflytop/nuclear/entity/CheckResult.java +++ b/src/main/java/com/iflytop/nuclear/entity/CheckResult.java @@ -15,8 +15,6 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class CheckResult { - private boolean isFinished; - private String currentTestCoord; private String error; diff --git a/src/main/java/com/iflytop/nuclear/service/impl/CheckServiceImpl.java b/src/main/java/com/iflytop/nuclear/service/impl/CheckServiceImpl.java index 559498c..46a7fd2 100644 --- a/src/main/java/com/iflytop/nuclear/service/impl/CheckServiceImpl.java +++ b/src/main/java/com/iflytop/nuclear/service/impl/CheckServiceImpl.java @@ -60,11 +60,14 @@ public class CheckServiceImpl implements CheckService { UpdateWrapper taskUpdateWrapper = new UpdateWrapper<>(); taskUpdateWrapper.eq("id",taskId); Task task = new Task(); + task.setEndTime(null); + task.setStartTime(null); if (currentCoord != null){ task.setCurrentCoord(currentCoord); } if (updateStartTime) { task.setStartTime(new Date()); + task.setEndTime(null); } if (updateEndTime) { task.setEndTime(new Date()); @@ -179,20 +182,23 @@ public class CheckServiceImpl implements CheckService { this.changeBreakOff(false); this.updateCoordAndStatus(taskId, null, 1, false, false); currentTaskId = taskId; + String nextCoord = ""; if (order == 0) { if (startIndex == null || "".equals(startIndex)) { - this.initCheck("1-6", order, taskId); + nextCoord = this.initCheck("1-6", order, taskId); }else { - this.continueCheck(taskId, order); + nextCoord = this.continueCheck(taskId, order); } }else if (order == 1) { if (startIndex == null || "".equals(startIndex)) { - this.initCheck("6-1", order, taskId); + nextCoord = this.initCheck("6-1", order, taskId); }else { - this.continueCheck(taskId, order); + nextCoord = this.continueCheck(taskId, order); } } - return null; + CheckResult checkResult = new CheckResult(); + checkResult.setCurrentTestCoord(nextCoord); + return checkResult; } @Override