Browse Source

check result

main
maochaoying 2 years ago
parent
commit
46617b09fb
  1. 2
      src/main/java/com/iflytop/nuclear/entity/CheckResult.java
  2. 16
      src/main/java/com/iflytop/nuclear/service/impl/CheckServiceImpl.java

2
src/main/java/com/iflytop/nuclear/entity/CheckResult.java

@ -15,8 +15,6 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor @AllArgsConstructor
public class CheckResult { public class CheckResult {
private boolean isFinished;
private String currentTestCoord; private String currentTestCoord;
private String error; private String error;

16
src/main/java/com/iflytop/nuclear/service/impl/CheckServiceImpl.java

@ -60,11 +60,14 @@ public class CheckServiceImpl implements CheckService {
UpdateWrapper<Task> taskUpdateWrapper = new UpdateWrapper<>(); UpdateWrapper<Task> taskUpdateWrapper = new UpdateWrapper<>();
taskUpdateWrapper.eq("id",taskId); taskUpdateWrapper.eq("id",taskId);
Task task = new Task(); Task task = new Task();
task.setEndTime(null);
task.setStartTime(null);
if (currentCoord != null){ if (currentCoord != null){
task.setCurrentCoord(currentCoord); task.setCurrentCoord(currentCoord);
} }
if (updateStartTime) { if (updateStartTime) {
task.setStartTime(new Date()); task.setStartTime(new Date());
task.setEndTime(null);
} }
if (updateEndTime) { if (updateEndTime) {
task.setEndTime(new Date()); task.setEndTime(new Date());
@ -179,20 +182,23 @@ public class CheckServiceImpl implements CheckService {
this.changeBreakOff(false); this.changeBreakOff(false);
this.updateCoordAndStatus(taskId, null, 1, false, false); this.updateCoordAndStatus(taskId, null, 1, false, false);
currentTaskId = taskId; currentTaskId = taskId;
String nextCoord = "";
if (order == 0) { if (order == 0) {
if (startIndex == null || "".equals(startIndex)) { if (startIndex == null || "".equals(startIndex)) {
this.initCheck("1-6", order, taskId);
nextCoord = this.initCheck("1-6", order, taskId);
}else { }else {
this.continueCheck(taskId, order);
nextCoord = this.continueCheck(taskId, order);
} }
}else if (order == 1) { }else if (order == 1) {
if (startIndex == null || "".equals(startIndex)) { if (startIndex == null || "".equals(startIndex)) {
this.initCheck("6-1", order, taskId);
nextCoord = this.initCheck("6-1", order, taskId);
}else { }else {
this.continueCheck(taskId, order);
nextCoord = this.continueCheck(taskId, order);
} }
} }
return null;
CheckResult checkResult = new CheckResult();
checkResult.setCurrentTestCoord(nextCoord);
return checkResult;
} }
@Override @Override

Loading…
Cancel
Save