From f9347935f4031edc7c11f2d981433949f168a60f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Fri, 21 Mar 2025 08:03:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E4=B9=9F=E4=B8=8D=E7=9F=A5=E9=81=93?= =?UTF-8?q?=E6=94=B9=E4=BA=86=E4=BB=80=E4=B9=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java b/src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java index c5f41ec..b97b6a3 100644 --- a/src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java +++ b/src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java @@ -37,7 +37,6 @@ import java.util.concurrent.TimeUnit; public class SprayTaskExecutor { private final WebSocketService webSocketService; private final DeviceCommandService deviceCommandService; - private final SprayTaskPointCollector sprayTaskPointCollector; private final SysSettingsService sysSettingsService; private final DeviceStatus deviceStatus; private final PositionService positionService; @@ -150,6 +149,7 @@ public class SprayTaskExecutor { double cacheYPoint = -1; for (int i = 0; i < sprayTaskStep.getSpraySteps().size(); i++) {//单次喷涂 if (currentStep < reCurrentStep) { + currentStep++; continue; } List sprayStepCommands = sprayTaskStep.getSpraySteps().get(i); @@ -241,7 +241,7 @@ public class SprayTaskExecutor { SprayTask.getInstance().clear(); deviceStatus.setSpraying(false); - deviceStatus.setSuspendable(false); + deviceStatus.setPaused(false); deviceStatus.setSuspendable(false); } catch (InterruptedException e) { deviceStatus.setSuspendable(false); @@ -253,7 +253,7 @@ public class SprayTaskExecutor { webSocketService.pushCMDResponseMsg(FrontResponseGenerator.generateJson(sprayTask.getCmdId(), sprayTask.getCmdCode(), CommandStatus.SPRAY_TASK_FINISH, "喷涂任务结束")); SprayTask.getInstance().clear(); deviceStatus.setSpraying(false); - deviceStatus.setSuspendable(false); + deviceStatus.setPaused(false); deviceStatus.setSuspendable(false); } finally { webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(sprayTask.getCmdId(), sprayTask.getCmdCode(), CommandStatus.SEND, "喷涂任务线程退出"));