From 8c2d335b3e81be599b706686554fc86faf64ebf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Tue, 27 May 2025 16:49:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=B9=E5=99=A8=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgs/app/model/bo/status/device/SolutionContainerState.java | 9 ++++----- src/main/java/com/iflytop/sgs/common/enums/ContainerCode.java | 5 ----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/iflytop/sgs/app/model/bo/status/device/SolutionContainerState.java b/src/main/java/com/iflytop/sgs/app/model/bo/status/device/SolutionContainerState.java index f68ae53..b308a2d 100644 --- a/src/main/java/com/iflytop/sgs/app/model/bo/status/device/SolutionContainerState.java +++ b/src/main/java/com/iflytop/sgs/app/model/bo/status/device/SolutionContainerState.java @@ -8,12 +8,12 @@ import lombok.Data; @Schema(description = "溶液容器") @Data public class SolutionContainerState { - @Schema(description = "容器数据id") - private Long id; - @Schema(description = "容器code") private ContainerCode containerCode; + @Schema(description = "容器名称") + private String containerName; + @Schema(description = "容器类型 solution溶液容器 neutralization中和容器") private ContainerType type; @@ -26,8 +26,7 @@ public class SolutionContainerState { @Schema(description = "是否完成预充，true为预充，false为排空") private boolean filledSolution = false; - public SolutionContainerState(Long id, ContainerCode containerCode, ContainerType type) { - this.id = id; + public SolutionContainerState(ContainerCode containerCode, ContainerType type) { this.containerCode = containerCode; this.type = type; } diff --git a/src/main/java/com/iflytop/sgs/common/enums/ContainerCode.java b/src/main/java/com/iflytop/sgs/common/enums/ContainerCode.java index a3f3141..3f78e0f 100644 --- a/src/main/java/com/iflytop/sgs/common/enums/ContainerCode.java +++ b/src/main/java/com/iflytop/sgs/common/enums/ContainerCode.java @@ -11,9 +11,4 @@ public enum ContainerCode { container_02, container_03, container_04, - container_05, - container_06, - container_07, - container_08, - container_09, }