diff --git a/src/main/java/com/iflytop/nuclear/controller/TaskController.java b/src/main/java/com/iflytop/nuclear/controller/TaskController.java index 3fc25c8..297ce74 100644 --- a/src/main/java/com/iflytop/nuclear/controller/TaskController.java +++ b/src/main/java/com/iflytop/nuclear/controller/TaskController.java @@ -115,4 +115,15 @@ public class TaskController { return ResponseData.success(taskVO); } + @PostMapping("/next") + public ResponseData getNextCood(@RequestBody Map 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); + } + } diff --git a/src/main/java/com/iflytop/nuclear/service/TaskService.java b/src/main/java/com/iflytop/nuclear/service/TaskService.java index 0109ff2..79e781f 100644 --- a/src/main/java/com/iflytop/nuclear/service/TaskService.java +++ b/src/main/java/com/iflytop/nuclear/service/TaskService.java @@ -16,4 +16,6 @@ public interface TaskService extends IService { List getTaskInfoByUsername(String username, String user_role); TaskVO processTask(); + + String nextCoordString(String coord, String taskId, String direction); } 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 cbeea16..a2de0c1 100644 --- a/src/main/java/com/iflytop/nuclear/service/impl/CheckServiceImpl.java +++ b/src/main/java/com/iflytop/nuclear/service/impl/CheckServiceImpl.java @@ -438,4 +438,20 @@ public class CheckServiceImpl implements CheckService { } 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; + } } diff --git a/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java b/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java index 27df59c..dd06cef 100644 --- a/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java +++ b/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.vo.TaskVO; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -27,6 +28,10 @@ public class TaskServiceImpl extends ServiceImpl implements Ta NuclearStationService nuclearStationService; @Autowired AccountService accountService; + @Lazy + @Autowired + CheckServiceImpl checkServiceImpl; + @Override public List getTaskInfoByUsername(String username, String user_role) { @@ -112,4 +117,23 @@ public class TaskServiceImpl extends ServiceImpl implements Ta } 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; + } }