diff --git a/src/main/java/org/nl/apt15e/apt/taskOperate/service/impl/TaskManageServiceImpl.java b/src/main/java/org/nl/apt15e/apt/taskOperate/service/impl/TaskManageServiceImpl.java index 4e970b3..b3dc1db 100644 --- a/src/main/java/org/nl/apt15e/apt/taskOperate/service/impl/TaskManageServiceImpl.java +++ b/src/main/java/org/nl/apt15e/apt/taskOperate/service/impl/TaskManageServiceImpl.java @@ -72,15 +72,22 @@ public class TaskManageServiceImpl implements TaskManageService { } List staList = whereJson.getJSONArray("data").toJavaList(Station.class); - // 取返回点 - Station breakPoint = stationService.getOne( - new QueryWrapper().lambda() - .eq(Station::getStation_type, "Breaks") - ); - if (ObjectUtil.isEmpty(breakPoint)) { - throw new BadRequestException("请先设置返回点!"); + + // 判断前端参数是否有返回点 + boolean move = staList.stream() + .anyMatch(row -> row.getAction_type().equals("Move")); + if (!move) { + + // 取返回点 + Station breakPoint = stationService.getOne( + new QueryWrapper().lambda() + .eq(Station::getStation_type, "Breaks") + ); + if (ObjectUtil.isEmpty(breakPoint)) { + throw new BadRequestException("请先设置返回点!"); + } + staList.add(breakPoint); } - staList.add(breakPoint); // 任务id String task_id = "";