diff --git a/src/main/java/com/iflytop/nuclear/controller/TaskController.java b/src/main/java/com/iflytop/nuclear/controller/TaskController.java index 883fa73..45c81f1 100644 --- a/src/main/java/com/iflytop/nuclear/controller/TaskController.java +++ b/src/main/java/com/iflytop/nuclear/controller/TaskController.java @@ -126,4 +126,14 @@ public class TaskController { return ResponseData.success(jo); } + @PostMapping("/checkNumber") + public ResponseData checkNumberInPath(@RequestBody Map checkInfo) { + String currentTaskId = checkInfo.get("currentTaskId"); + String checkNumber = checkInfo.get("checkNumber"); + boolean inPath = taskService.checkNumber(currentTaskId, checkNumber); + JSONObject jo = new JSONObject(); + jo.put("result", inPath); + 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 79e781f..7bdf265 100644 --- a/src/main/java/com/iflytop/nuclear/service/TaskService.java +++ b/src/main/java/com/iflytop/nuclear/service/TaskService.java @@ -18,4 +18,6 @@ public interface TaskService extends IService { TaskVO processTask(); String nextCoordString(String coord, String taskId, String direction); + + boolean checkNumber(String currentTaskId, String checkNumber); } 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 d443dd8..b6cda80 100644 --- a/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java +++ b/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java @@ -31,6 +31,9 @@ public class TaskServiceImpl extends ServiceImpl implements Ta @Lazy @Autowired CheckServiceImpl checkServiceImpl; + @Autowired + @Lazy + PathService pathService; @Override @@ -156,4 +159,20 @@ public class TaskServiceImpl extends ServiceImpl implements Ta return checkServiceImpl.getPreCoord(coord, checkOrder, taskId); } } + + @Override + public boolean checkNumber(String currentTaskId, String checkNumber) { + // 查询当前task的路径是否为复杂路径 + Task task = this.getById(currentTaskId); + int checkOrder = task.getCheckOrder(); + if (checkOrder == 2) { + QueryWrapper query = new QueryWrapper<>(); + query.eq("task_id", currentTaskId).eq("coord", checkNumber); + Path one = pathService.getOne(query); + if (one == null) { + return false; + } + } + return true; + } } diff --git a/uploadfiles/xlsx/20230731/template-40.xlsx b/uploadfiles/xlsx/20230731/template-40.xlsx new file mode 100644 index 0000000..1b0a04e Binary files /dev/null and b/uploadfiles/xlsx/20230731/template-40.xlsx differ