Browse Source

实现部分上一步下一步

main
maochaoying 2 years ago
parent
commit
b906e9ba0d
  1. 11
      src/main/java/com/iflytop/nuclear/controller/TaskController.java
  2. 2
      src/main/java/com/iflytop/nuclear/service/TaskService.java
  3. 16
      src/main/java/com/iflytop/nuclear/service/impl/CheckServiceImpl.java
  4. 24
      src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java

11
src/main/java/com/iflytop/nuclear/controller/TaskController.java

@ -115,4 +115,15 @@ public class TaskController {
return ResponseData.success(taskVO); return ResponseData.success(taskVO);
} }
@PostMapping("/next")
public ResponseData getNextCood(@RequestBody Map<String,String> taskInfo) {
String coord = taskInfo.get("coord");
String taskId = taskInfo.get("taskId");
String direction = taskInfo.get("direction");
String result = taskService.nextCoordString(coord, taskId, direction);
JSONObject jo = new JSONObject();
jo.put("result", result);
return ResponseData.success(jo);
}
} }

2
src/main/java/com/iflytop/nuclear/service/TaskService.java

@ -16,4 +16,6 @@ public interface TaskService extends IService<Task> {
List<TaskVO> getTaskInfoByUsername(String username, String user_role); List<TaskVO> getTaskInfoByUsername(String username, String user_role);
TaskVO processTask(); TaskVO processTask();
String nextCoordString(String coord, String taskId, String direction);
} }

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

@ -438,4 +438,20 @@ public class CheckServiceImpl implements CheckService {
} }
return ""; return "";
} }
/**
* 传入当前检查的坐标点
* @return 获取上一个坐标点
*/
public String getPreCoord(String current, int order){
if (current == null ) {
return null;
}
String[] split = current.split("-");
int mainLine = Integer.parseInt(split[0]);
int minorLine = Integer.parseInt(split[1]);
if (order == 0) {}
if (order == 1) {}
return null;
}
} }

24
src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java

@ -7,6 +7,7 @@ import com.iflytop.nuclear.model.*;
import com.iflytop.nuclear.service.*; import com.iflytop.nuclear.service.*;
import com.iflytop.nuclear.vo.TaskVO; import com.iflytop.nuclear.vo.TaskVO;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
@ -27,6 +28,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
NuclearStationService nuclearStationService; NuclearStationService nuclearStationService;
@Autowired @Autowired
AccountService accountService; AccountService accountService;
@Lazy
@Autowired
CheckServiceImpl checkServiceImpl;
@Override @Override
public List<TaskVO> getTaskInfoByUsername(String username, String user_role) { public List<TaskVO> getTaskInfoByUsername(String username, String user_role) {
@ -112,4 +117,23 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
} }
return null; return null;
} }
@Override
public String nextCoordString(String coord, String taskId, String direction) {
// 根据taskId查询order 规则的下一个已经写好需要再写一个上一个
Task task = this.getById(taskId);
int checkOrder = task.getCheckOrder();
if ("1".equals(direction)) {
if (coord.equals("finish")) {
return null;
}
return checkServiceImpl.getNextCoord(coord, checkOrder);
}else {
if (coord.equals("start")) {
return null;
}
return checkServiceImpl.getPreCoord(coord, checkOrder);
}
return null;
}
} }
Loading…
Cancel
Save