From 6e2e2a50261389cdbdd952636cc7af2d1ce19d9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Wed, 4 Jun 2025 13:00:46 +0800 Subject: [PATCH] 1 --- .../com/iflytop/gd/app/command/control/SolutionAddCommand.java | 7 +++---- .../com/iflytop/gd/app/service/crafts/CraftsStepService.java | 9 +-------- src/main/java/com/iflytop/gd/common/result/ResultCode.java | 3 ++- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/iflytop/gd/app/command/control/SolutionAddCommand.java b/src/main/java/com/iflytop/gd/app/command/control/SolutionAddCommand.java index 553622b..ebcf861 100644 --- a/src/main/java/com/iflytop/gd/app/command/control/SolutionAddCommand.java +++ b/src/main/java/com/iflytop/gd/app/command/control/SolutionAddCommand.java @@ -22,7 +22,6 @@ import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Optional; import java.util.concurrent.CompletableFuture; /** @@ -68,12 +67,12 @@ public class SolutionAddCommand extends BaseCommandHandler { List futuresList = new ArrayList<>(); for (int k = 0; k < solutionList.size(); k++) { JSONObject addSolution = solutionList.getJSONObject(k); - Long solId = addSolution.getLong("solutionId"); + Long solId = addSolution.getLong("solutionId");//实际前端传递的是容器id Double volume = addSolution.getDouble("volume"); //AcidPumpDeviceCode acidPumpDevice = containerService.getPumpBySolutionId(solId);//获取溶液对应的泵 - Container container = containerService.getContainerBySolutionId(solId); + Container container = containerService.getById(solId); if (container == null) { - throw new AppException(ResultCode.CRAFT_CONTAINER_NOT_FOUND);//未找到对应溶液容器 + throw new AppException(ResultCode.CONTAINER_NOT_FOUND);//未找到对应溶液容器 } AcidPumpDeviceCode acidPumpDevice = AcidPumpDeviceCode.valueOf(container.getPumpId());//泵 int scale = container.getScale() == null ? 120 : container.getScale();//系数 diff --git a/src/main/java/com/iflytop/gd/app/service/crafts/CraftsStepService.java b/src/main/java/com/iflytop/gd/app/service/crafts/CraftsStepService.java index 8e4dd7f..c2b41dc 100644 --- a/src/main/java/com/iflytop/gd/app/service/crafts/CraftsStepService.java +++ b/src/main/java/com/iflytop/gd/app/service/crafts/CraftsStepService.java @@ -20,17 +20,10 @@ import com.iflytop.gd.common.enums.data.DevicePositionCode; import com.iflytop.gd.common.exception.AppException; import com.iflytop.gd.common.result.ResultCode; import com.iflytop.gd.common.utils.CommandUtil; -import com.iflytop.gd.hardware.drivers.DODriver.OutputIOCtrlDriver; -import com.iflytop.gd.hardware.drivers.TricolorLightDriver; -import com.iflytop.gd.hardware.exception.HardwareException; -import com.iflytop.gd.hardware.type.IO.OutputIOMId; -import com.iflytop.gd.hardware.type.MId; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.concurrent.CompletableFuture; - /** * 工艺步骤执行服务 */ @@ -93,7 +86,7 @@ public class CraftsStepService { Double volume = addLiquid.getDouble("volume"); Container container = containerService.getContainerBySolutionId(solId); if (container == null) { - throw new AppException(ResultCode.CRAFT_CONTAINER_NOT_FOUND);//未找到对应溶液容器 + throw new AppException(ResultCode.CONTAINER_NOT_FOUND);//未找到对应溶液容器 } AcidPumpDeviceCode acidPumpDevice = AcidPumpDeviceCode.valueOf(container.getPumpId());//泵 int scale = container.getScale() == null ? 120 : container.getScale();//系数 diff --git a/src/main/java/com/iflytop/gd/common/result/ResultCode.java b/src/main/java/com/iflytop/gd/common/result/ResultCode.java index 3a53727..ea1fa13 100644 --- a/src/main/java/com/iflytop/gd/common/result/ResultCode.java +++ b/src/main/java/com/iflytop/gd/common/result/ResultCode.java @@ -37,9 +37,10 @@ public enum ResultCode implements IResultCode, Serializable { OPERATION_NOT_ALLOWED("4003", "业务操作不允许"), DATA_ALREADY_EXISTS("4004", "数据已存在"), + CONTAINER_NOT_FOUND("4005", "未找到对应溶液容器"), + CRAFT_RUNNING("4101", "工艺正在执行"), CRAFT_CONTEXT_NULL("4102", "请先配置该加热区工艺"), - CRAFT_CONTAINER_NOT_FOUND("4005", "工艺未找到对应溶液容器"), CRAFT_NO_TRAY("4005", "工艺未找到托盘"), //============================ 5xxx:系统 & 第三方 ============================ SYSTEM_ERROR("5000", "系统内部错误"),