Browse Source

核查坐标检查

main
maochaoying 2 years ago
parent
commit
9a0338cf32
  1. 10
      src/main/java/com/iflytop/nuclear/controller/TaskController.java
  2. 2
      src/main/java/com/iflytop/nuclear/service/TaskService.java
  3. 19
      src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java
  4. BIN
      uploadfiles/xlsx/20230731/template-40.xlsx

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

@ -126,4 +126,14 @@ public class TaskController {
return ResponseData.success(jo); return ResponseData.success(jo);
} }
@PostMapping("/checkNumber")
public ResponseData checkNumberInPath(@RequestBody Map<String,String> 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);
}
} }

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

@ -18,4 +18,6 @@ public interface TaskService extends IService<Task> {
TaskVO processTask(); TaskVO processTask();
String nextCoordString(String coord, String taskId, String direction); String nextCoordString(String coord, String taskId, String direction);
boolean checkNumber(String currentTaskId, String checkNumber);
} }

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

@ -31,6 +31,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
@Lazy @Lazy
@Autowired @Autowired
CheckServiceImpl checkServiceImpl; CheckServiceImpl checkServiceImpl;
@Autowired
@Lazy
PathService pathService;
@Override @Override
@ -156,4 +159,20 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
return checkServiceImpl.getPreCoord(coord, checkOrder, taskId); 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<Path> query = new QueryWrapper<>();
query.eq("task_id", currentTaskId).eq("coord", checkNumber);
Path one = pathService.getOne(query);
if (one == null) {
return false;
}
}
return true;
}
} }

BIN
uploadfiles/xlsx/20230731/template-40.xlsx

Loading…
Cancel
Save