From 4e72c03392e23144bd96cf94ce8a1a057f7ca524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Tue, 15 Jul 2025 19:21:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=BC=93=E5=AD=98=E5=B7=A5=E8=89=BAid?= 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 | 4 ++-- src/main/java/com/qyft/ms/app/model/bo/SprayTaskParams.java | 5 +++++ 2 files changed, 7 insertions(+), 2 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 ed365da..9276652 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 @@ -89,7 +89,7 @@ public class SprayTaskExecutor { sprayTask.setSprayTimes(sprayTimes); Double[] slide = slideArr[sprayTaskParam.getIndex()];//获取玻片的坐标 - List sprayTaskStepList = getSprayPath(sprayTaskParam.getIndex(), sprayTimes);//计算本次喷涂的路线 + List sprayTaskStepList = getSprayPath(sprayTimes);//计算本次喷涂的路线 //先移动到玻片左上角位置 DeviceCommand motorXPositionSetCommand = DeviceCommandGenerator.motorXPositionSet(slideArr[sprayTaskParam.getIndex()][0], 20.0); DeviceCommand motorYPositionSetCommand = DeviceCommandGenerator.motorYPositionSet(slideArr[sprayTaskParam.getIndex()][1], 20.0); @@ -254,7 +254,7 @@ public class SprayTaskExecutor { .get(); } - private List getSprayPath(Integer index, SprayTimes sprayTimes) { + private List getSprayPath(SprayTimes sprayTimes) { String matrixPathType = sprayTimes.getMatrixPathType(); double left = sprayTimes.getX1(); double right = sprayTimes.getX2(); diff --git a/src/main/java/com/qyft/ms/app/model/bo/SprayTaskParams.java b/src/main/java/com/qyft/ms/app/model/bo/SprayTaskParams.java index 774e4cd..b82f6b8 100644 --- a/src/main/java/com/qyft/ms/app/model/bo/SprayTaskParams.java +++ b/src/main/java/com/qyft/ms/app/model/bo/SprayTaskParams.java @@ -9,8 +9,13 @@ import java.util.List; @Schema(description = "多次喷涂每次喷涂的参数") public class SprayTaskParams { + @Schema(description = "玻片序号") private Integer index; + @Schema(description = "工艺id") + private Long id; + + @Schema(description = "基质id") private Long matrixId; private List times;