From 7ea49920bcb89df8dbde35882fba7a66cc426907 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Thu, 24 Jul 2025 17:09:59 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E8=BF=94=E5=9B=9E=E7=82=B9?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TaskManageServiceImpl.java   | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

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<Station> staList = whereJson.getJSONArray("data").toJavaList(Station.class);
-        // 取返回点
-        Station breakPoint = stationService.getOne(
-                new QueryWrapper<Station>().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<Station>().lambda()
+                            .eq(Station::getStation_type, "Breaks")
+            );
+            if (ObjectUtil.isEmpty(breakPoint)) {
+                throw new BadRequestException("请先设置返回点！");
+            }
+            staList.add(breakPoint);
         }
-        staList.add(breakPoint);
 
         // 任务id
         String task_id = "";