fix:修复第二次喷涂无法结束的问题

src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java

@@ -198,19 +198,22 @@ public class SprayTaskExecutor {
 
                 webSocketService.pushCMDResponseMsg(FrontResponseGenerator.generateJson(sprayTask.getCmdId(), sprayTask.getCmdCode(), CommandStatus.SUCCESS, "喷涂任务执行成功"));
                 webSocketService.pushCMDResponseMsg(FrontResponseGenerator.generateJson(sprayTask.getCmdId(), sprayTask.getCmdCode(), CommandStatus.SPRAY_TASK_FINISH, "喷涂任务结束"));
+
+                sprayTask.clear();
+                deviceStatus.setSpraying(false);//是否正在进行喷涂
+                deviceStatus.setPaused(false);//是否暂停
             } catch (InterruptedException e) {
                 webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(sprayTask.getCmdId(), sprayTask.getCmdCode(), CommandStatus.SEND, "喷涂任务线程停止"));
             } catch (Exception e) {
                 log.info("喷涂任务失败", e);
                 webSocketService.pushCMDResponseMsg(FrontResponseGenerator.generateJson(sprayTask.getCmdId(), sprayTask.getCmdCode(), CommandStatus.FAIL, "喷涂任务执行失败"));
                 webSocketService.pushCMDResponseMsg(FrontResponseGenerator.generateJson(sprayTask.getCmdId(), sprayTask.getCmdCode(), CommandStatus.SPRAY_TASK_FINISH, "喷涂任务结束"));
+
+                sprayTask.clear();
+                deviceStatus.setSpraying(false);//是否正在进行喷涂
+                deviceStatus.setPaused(false);//是否暂停
             } finally {
                 webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(sprayTask.getCmdId(), sprayTask.getCmdCode(), CommandStatus.SEND, "喷涂任务线程退出"));
-                if(sprayTask.isPaused()){//如果不是暂停状态的话则清空数据
-                    sprayTask.clear();
-                    deviceStatus.setSpraying(false);//是否正在进行喷涂
-                    deviceStatus.setPaused(false);//是否暂停
-                }
                 // 在线程结束后将 taskThread 设置为 null，保证状态一致和资源释放
                 synchronized (this) {
                     taskThread = null;

src/main/java/com/qyft/ms/app/device/status/SprayTask.java

@@ -76,6 +76,7 @@ public class SprayTask {
         cmdId = null;
         cmdCode = null;
         paused = false;
+        close = false;
         spraying = false;
         currentStep = 0;
         sprayTaskParams = null;

src/main/java/com/qyft/ms/app/front/cmd/business/MatrixSprayStop.java

@@ -49,41 +49,43 @@ public class MatrixSprayStop extends BaseCommandHandler {
         webSocketService.pushCMDResponseMsg(FrontResponseGenerator.generateJson(sprayTask.getCmdId(), sprayTask.getCmdCode(), CommandStatus.SPRAY_TASK_FINISH, "喷涂任务结束"));
 
         return runAsync(() -> {
-            sprayTask.setClose(true);
-            sprayTaskExecutor.stopTask();//终止喷涂任务线程
+            try{
+                sprayTask.setClose(true);
+                sprayTaskExecutor.stopTask();//终止喷涂任务线程
 
-            DeviceCommand syringePumpStopCommand = DeviceCommandGenerator.syringePumpStop(); //停止推动注射泵
-            CommandFuture syringePumpStopCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), syringePumpStopCommand);
-            DeviceCommand nozzleValveCloseCommand = DeviceCommandGenerator.nozzleValveClose(); //关闭喷嘴阀
-            CommandFuture nozzleValveCloseCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), nozzleValveCloseCommand);
-            DeviceCommand highVoltageCloseCommand = DeviceCommandGenerator.highVoltageClose(); //关闭高压
-            CommandFuture highVoltageCloseCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), highVoltageCloseCommand);
-            commandWait(syringePumpStopCommandFuture, nozzleValveCloseCommandFuture, highVoltageCloseCommandFuture);
+                DeviceCommand syringePumpStopCommand = DeviceCommandGenerator.syringePumpStop(); //停止推动注射泵
+                CommandFuture syringePumpStopCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), syringePumpStopCommand);
+                DeviceCommand nozzleValveCloseCommand = DeviceCommandGenerator.nozzleValveClose(); //关闭喷嘴阀
+                CommandFuture nozzleValveCloseCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), nozzleValveCloseCommand);
+                DeviceCommand highVoltageCloseCommand = DeviceCommandGenerator.highVoltageClose(); //关闭高压
+                CommandFuture highVoltageCloseCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), highVoltageCloseCommand);
+                commandWait(syringePumpStopCommandFuture, nozzleValveCloseCommandFuture, highVoltageCloseCommandFuture);
 
-            DeviceCommand motorXStopCommand = DeviceCommandGenerator.motorXStop(); //x轴停止移动
-            DeviceCommand motorYStopCommand = DeviceCommandGenerator.motorYStop(); //y轴停止移动
-            DeviceCommand motorZStopCommand = DeviceCommandGenerator.motorZStop(); //z轴停止移动
-            CommandFuture motorXStopCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), motorXStopCommand);
-            CommandFuture motorYStopCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), motorYStopCommand);
-            CommandFuture motorZStopCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), motorZStopCommand);
-            commandWait(motorXStopCommandFuture, motorYStopCommandFuture, motorZStopCommandFuture);
+                DeviceCommand motorXStopCommand = DeviceCommandGenerator.motorXStop(); //x轴停止移动
+                DeviceCommand motorYStopCommand = DeviceCommandGenerator.motorYStop(); //y轴停止移动
+                DeviceCommand motorZStopCommand = DeviceCommandGenerator.motorZStop(); //z轴停止移动
+                CommandFuture motorXStopCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), motorXStopCommand);
+                CommandFuture motorYStopCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), motorYStopCommand);
+                CommandFuture motorZStopCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), motorZStopCommand);
+                commandWait(motorXStopCommandFuture, motorYStopCommandFuture, motorZStopCommandFuture);
 
-            OperationLog operationLog = operationLogService.getById(sprayTask.getOperationLogId());
-            operationLog.setStatus(3);
-            operationLogService.updateById(operationLog);
+                OperationLog operationLog = operationLogService.getById(sprayTask.getOperationLogId());
+                operationLog.setStatus(3);
+                operationLogService.updateById(operationLog);
 
-            //XYZ回原点
-            DeviceCommand motorXOriginCommand = DeviceCommandGenerator.motorXOrigin();
-            DeviceCommand motorYOriginCommand = DeviceCommandGenerator.motorYOrigin();
-            DeviceCommand motorZOriginCommand = DeviceCommandGenerator.motorZOrigin();
-            CommandFuture motorXOriginCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), motorXOriginCommand);
-            CommandFuture motorYOriginCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), motorYOriginCommand);
-            CommandFuture motorZOriginCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), motorZOriginCommand);
-            commandWait(motorXOriginCommandFuture, motorYOriginCommandFuture, motorZOriginCommandFuture);
-
-            SprayTask.getInstance().clear();
-            deviceStatus.setSpraying(false);
-            deviceStatus.setPaused(false);
+                //XYZ回原点
+                DeviceCommand motorXOriginCommand = DeviceCommandGenerator.motorXOrigin();
+                DeviceCommand motorYOriginCommand = DeviceCommandGenerator.motorYOrigin();
+                DeviceCommand motorZOriginCommand = DeviceCommandGenerator.motorZOrigin();
+                CommandFuture motorXOriginCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), motorXOriginCommand);
+                CommandFuture motorYOriginCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), motorYOriginCommand);
+                CommandFuture motorZOriginCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), motorZOriginCommand);
+                commandWait(motorXOriginCommandFuture, motorYOriginCommandFuture, motorZOriginCommandFuture);
+            }finally {
+                sprayTask.clear();
+                deviceStatus.setSpraying(false);
+                deviceStatus.setPaused(false);
+            }
         });
     }
 }