|
@ -37,7 +37,6 @@ import java.util.concurrent.TimeUnit; |
|
|
public class SprayTaskExecutor { |
|
|
public class SprayTaskExecutor { |
|
|
private final WebSocketService webSocketService; |
|
|
private final WebSocketService webSocketService; |
|
|
private final DeviceCommandService deviceCommandService; |
|
|
private final DeviceCommandService deviceCommandService; |
|
|
private final SprayTaskPointCollector sprayTaskPointCollector; |
|
|
|
|
|
private final SysSettingsService sysSettingsService; |
|
|
private final SysSettingsService sysSettingsService; |
|
|
private final DeviceStatus deviceStatus; |
|
|
private final DeviceStatus deviceStatus; |
|
|
private final PositionService positionService; |
|
|
private final PositionService positionService; |
|
@ -150,6 +149,7 @@ public class SprayTaskExecutor { |
|
|
double cacheYPoint = -1; |
|
|
double cacheYPoint = -1; |
|
|
for (int i = 0; i < sprayTaskStep.getSpraySteps().size(); i++) {//单次喷涂 |
|
|
for (int i = 0; i < sprayTaskStep.getSpraySteps().size(); i++) {//单次喷涂 |
|
|
if (currentStep < reCurrentStep) { |
|
|
if (currentStep < reCurrentStep) { |
|
|
|
|
|
currentStep++; |
|
|
continue; |
|
|
continue; |
|
|
} |
|
|
} |
|
|
List<DeviceCommand> sprayStepCommands = sprayTaskStep.getSpraySteps().get(i); |
|
|
List<DeviceCommand> sprayStepCommands = sprayTaskStep.getSpraySteps().get(i); |
|
@ -241,7 +241,7 @@ public class SprayTaskExecutor { |
|
|
|
|
|
|
|
|
SprayTask.getInstance().clear(); |
|
|
SprayTask.getInstance().clear(); |
|
|
deviceStatus.setSpraying(false); |
|
|
deviceStatus.setSpraying(false); |
|
|
deviceStatus.setSuspendable(false); |
|
|
|
|
|
|
|
|
deviceStatus.setPaused(false); |
|
|
deviceStatus.setSuspendable(false); |
|
|
deviceStatus.setSuspendable(false); |
|
|
} catch (InterruptedException e) { |
|
|
} catch (InterruptedException e) { |
|
|
deviceStatus.setSuspendable(false); |
|
|
deviceStatus.setSuspendable(false); |
|
@ -253,7 +253,7 @@ public class SprayTaskExecutor { |
|
|
webSocketService.pushCMDResponseMsg(FrontResponseGenerator.generateJson(sprayTask.getCmdId(), sprayTask.getCmdCode(), CommandStatus.SPRAY_TASK_FINISH, "喷涂任务结束")); |
|
|
webSocketService.pushCMDResponseMsg(FrontResponseGenerator.generateJson(sprayTask.getCmdId(), sprayTask.getCmdCode(), CommandStatus.SPRAY_TASK_FINISH, "喷涂任务结束")); |
|
|
SprayTask.getInstance().clear(); |
|
|
SprayTask.getInstance().clear(); |
|
|
deviceStatus.setSpraying(false); |
|
|
deviceStatus.setSpraying(false); |
|
|
deviceStatus.setSuspendable(false); |
|
|
|
|
|
|
|
|
deviceStatus.setPaused(false); |
|
|
deviceStatus.setSuspendable(false); |
|
|
deviceStatus.setSuspendable(false); |
|
|
} finally { |
|
|
} finally { |
|
|
webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(sprayTask.getCmdId(), sprayTask.getCmdCode(), CommandStatus.SEND, "喷涂任务线程退出")); |
|
|
webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(sprayTask.getCmdId(), sprayTask.getCmdCode(), CommandStatus.SEND, "喷涂任务线程退出")); |
|
|