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 9276652..e4b2467 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 @@ -81,6 +81,7 @@ public class SprayTaskExecutor { } sprayTask.setCurrentIndex(sprayTaskParam.getIndex()); int sprayNum = 1; //当前玻片是第几次喷涂 + sprayTask.setCurrentCountSprayNum(1); for (SprayTimes sprayTimes : sprayTaskParam.getTimes()) {//每个拨片有多次喷涂,循环每次喷涂 if (sprayNum < sprayTask.getSprayNum()) { sprayNum++; @@ -157,8 +158,8 @@ public class SprayTaskExecutor { commandFutureList.add(commandFuture); cacheYPoint = currentPoint.y; } - sprayTask.getSprayTaskSprayedList().add(new SprayTaskSprayed(sprayNum, sprayTaskParam.getIndex(), currentPoint)); - SprayTaskPointCollectorPushBO sprayTaskPointCollectorPushBO = new SprayTaskPointCollectorPushBO(sprayTask.getCmdId(), sprayTask.getCmdCode(), sprayTaskParam.getIndex(), sprayNum, currentPoint); + sprayTask.getSprayTaskSprayedList().add(new SprayTaskSprayed(sprayTask.getCurrentCountSprayNum(), sprayTaskParam.getIndex(), currentPoint)); + SprayTaskPointCollectorPushBO sprayTaskPointCollectorPushBO = new SprayTaskPointCollectorPushBO(sprayTask.getCmdId(), sprayTask.getCmdCode(), sprayTaskParam.getIndex(), sprayTask.getCurrentCountSprayNum(), currentPoint); webSocketService.pushMsg(WebSocketMessageType.SPRAY_POINT, sprayTaskPointCollectorPushBO);//向前端推送当前路径 CommandFuture[] commandFutureArray = commandFutureList.toArray(new CommandFuture[0]); @@ -173,6 +174,7 @@ public class SprayTaskExecutor { if (sprayTimes.getGridDelay() != null) { delay(sprayTimes.getGridDelay() * 1000); } + sprayTask.setCurrentCountSprayNum(sprayTask.getCurrentCountSprayNum() + 1); } sprayNum++; sprayTask.setSprayNum(sprayNum); diff --git a/src/main/java/com/qyft/ms/app/device/status/SprayTask.java b/src/main/java/com/qyft/ms/app/device/status/SprayTask.java index 9824bdf..0c45d64 100644 --- a/src/main/java/com/qyft/ms/app/device/status/SprayTask.java +++ b/src/main/java/com/qyft/ms/app/device/status/SprayTask.java @@ -33,10 +33,14 @@ public class SprayTask { */ private Integer currentIndex = null; /** - * 当前玻片是第几次喷涂 + * 当前玻片根据喷涂参数,是第几次喷涂 */ private volatile int sprayNum = 0; /** + * 当前玻片已喷涂遍数,田字格算2次 + */ + private volatile int currentCountSprayNum = 1; + /** * 当前暂停点位 */ private Point3D currentPausedPoint = null; @@ -88,6 +92,7 @@ public class SprayTask { currentPausedPoint = null; currentIndex = null; sprayNum = 0; + currentCountSprayNum = 1; operationLogId = null; sprayTaskSprayedList.clear(); }