From 5b0c51b336f8abbec33e0f4039ae15b09227a0f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Mon, 26 May 2025 15:25:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=BB=93=E6=9E=84=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8A=A0?= =?UTF-8?q?=E7=83=AD=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/model/bo/status/device/DeviceState.java | 5 +--- .../model/bo/status/device/HeatModuleState.java | 25 ++++++++------------ .../sgs/app/model/bo/status/device/PumpState.java | 16 ------------- .../bo/status/device/SolutionModuleState.java | 4 ++++ .../sgs/app/model/bo/status/device/ValveState.java | 5 ++-- .../com/iflytop/sgs/common/enums/HeatingType.java | 27 ++++++++++++++++++++++ .../iflytop/sgs/common/enums/ValveStateCode.java | 23 +++++++++--------- 7 files changed, 56 insertions(+), 49 deletions(-) delete mode 100644 src/main/java/com/iflytop/sgs/app/model/bo/status/device/PumpState.java create mode 100644 src/main/java/com/iflytop/sgs/common/enums/HeatingType.java diff --git a/src/main/java/com/iflytop/sgs/app/model/bo/status/device/DeviceState.java b/src/main/java/com/iflytop/sgs/app/model/bo/status/device/DeviceState.java index b5c515e..ed5fb21 100644 --- a/src/main/java/com/iflytop/sgs/app/model/bo/status/device/DeviceState.java +++ b/src/main/java/com/iflytop/sgs/app/model/bo/status/device/DeviceState.java @@ -34,10 +34,7 @@ public class DeviceState { private User currentUser; @Schema(description = "当前实验") private Tasks currentTasks; - @Schema(description = "电磁阀状态") - private ValveState valveState; - @Schema(description = "蠕动泵状态") - private PumpState pumpState; + /** * 获取指定加热模块状态 */ diff --git a/src/main/java/com/iflytop/sgs/app/model/bo/status/device/HeatModuleState.java b/src/main/java/com/iflytop/sgs/app/model/bo/status/device/HeatModuleState.java index b9e2f59..5351232 100644 --- a/src/main/java/com/iflytop/sgs/app/model/bo/status/device/HeatModuleState.java +++ b/src/main/java/com/iflytop/sgs/app/model/bo/status/device/HeatModuleState.java @@ -1,6 +1,7 @@ package com.iflytop.sgs.app.model.bo.status.device; import com.iflytop.sgs.common.enums.HeatModuleCode; +import com.iflytop.sgs.common.enums.HeatingType; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -16,29 +17,23 @@ public class HeatModuleState { @Schema(description = "托盘状态，0为无托盘，1为有托盘") private int trayStatus = 0; - @Schema(description = "是否正在加热，true为正在加热，false为未加热") - private boolean heating = false; - - @Schema(description = "是否正在烘干，true为正在烘干，false为未烘干") - private boolean drying = false; - - @Schema(description = "是否正在退火，true为正在退火，false为未退火") - private boolean annealing = false; + @Schema(description = "加热类型状态") + private HeatingType heatingType = HeatingType.stop; @Schema(description = "是否启动散热，true为正在散热，false为未在散热") private boolean fanOpen = false; - @Schema(description = "加热器目标温度") + @Schema(description = "加热器当前目标温度") private Double targetTemperature = null; - @Schema(description = "加热器烘干温度") - private Double dryTemperature; + @Schema(description = "加热器烘干设定温度") + private Double dryTemperature = null; - @Schema(description = "加热器退火温度") - private Double annealTemperature; + @Schema(description = "加热器退火设定温度") + private Double annealTemperature = null; - @Schema(description = "加热器加热温度") - private Double heatTemperature; + @Schema(description = "加热器加热设定温度") + private Double heatTemperature = null; @Schema(description = "加热器当前温度") private Double temperature = null; diff --git a/src/main/java/com/iflytop/sgs/app/model/bo/status/device/PumpState.java b/src/main/java/com/iflytop/sgs/app/model/bo/status/device/PumpState.java deleted file mode 100644 index 284e0d1..0000000 --- a/src/main/java/com/iflytop/sgs/app/model/bo/status/device/PumpState.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.iflytop.sgs.app.model.bo.status.device; - -import com.iflytop.sgs.common.enums.PumpStateCode; -import com.iflytop.sgs.common.enums.ValveStateCode; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Schema(description = "电磁转换阀") -@Data -public class PumpState { - - @Schema(description = "开关") - private PumpStateCode state; - - -} diff --git a/src/main/java/com/iflytop/sgs/app/model/bo/status/device/SolutionModuleState.java b/src/main/java/com/iflytop/sgs/app/model/bo/status/device/SolutionModuleState.java index 9fae34f..5a382bc 100644 --- a/src/main/java/com/iflytop/sgs/app/model/bo/status/device/SolutionModuleState.java +++ b/src/main/java/com/iflytop/sgs/app/model/bo/status/device/SolutionModuleState.java @@ -20,4 +20,8 @@ public class SolutionModuleState { @Schema(description = "是否正在加液，true正在加液，false未运行") private boolean pumping = false; + + @Schema(description = "电磁阀状态") + private ValveState valveState; + } diff --git a/src/main/java/com/iflytop/sgs/app/model/bo/status/device/ValveState.java b/src/main/java/com/iflytop/sgs/app/model/bo/status/device/ValveState.java index 8e79c68..3e4e7ea 100644 --- a/src/main/java/com/iflytop/sgs/app/model/bo/status/device/ValveState.java +++ b/src/main/java/com/iflytop/sgs/app/model/bo/status/device/ValveState.java @@ -4,12 +4,11 @@ import com.iflytop.sgs.common.enums.ValveStateCode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -@Schema(description = "电磁转换阀") +@Schema(description = "电磁阀状态") @Data public class ValveState { - @Schema(description = "开关") + @Schema(description = "当前电磁阀通道") private ValveStateCode state; - } diff --git a/src/main/java/com/iflytop/sgs/common/enums/HeatingType.java b/src/main/java/com/iflytop/sgs/common/enums/HeatingType.java new file mode 100644 index 0000000..d439330 --- /dev/null +++ b/src/main/java/com/iflytop/sgs/common/enums/HeatingType.java @@ -0,0 +1,27 @@ +package com.iflytop.sgs.common.enums; + +import lombok.Getter; + +/** + * 加热模块加热类型 + */ +@Getter +public enum HeatingType { + /** + * 加热 + */ + heating, + /** + * 烘干 + */ + drying, + /** + * 退火 + */ + annealing, + /** + * 停止加热 + */ + stop + +} diff --git a/src/main/java/com/iflytop/sgs/common/enums/ValveStateCode.java b/src/main/java/com/iflytop/sgs/common/enums/ValveStateCode.java index b32fe61..55249bf 100644 --- a/src/main/java/com/iflytop/sgs/common/enums/ValveStateCode.java +++ b/src/main/java/com/iflytop/sgs/common/enums/ValveStateCode.java @@ -3,23 +3,24 @@ package com.iflytop.sgs.common.enums; import lombok.Getter; /** - * 电磁转换阀状态枚举类 index为对应的物理通道 - * + * 电磁转换阀状态枚举类 channel为对应的设备定义的通道编号 */ @Getter public enum ValveStateCode { //加液时 液量的转换系数 - thin_way(1, "稀硝酸通道",SystemConfigCode.scale_thin), - thick_way(2, "浓硝酸通道",SystemConfigCode.scale_thick), - water(3, "蒸馏水通道",SystemConfigCode.scale_water), - waste(4, "废水通道",SystemConfigCode.scale_waste), - vacant(5, "空气通道",SystemConfigCode.scale_vacant); - private final Integer index; + thin(1, "稀硝酸通道", SystemConfigCode.scale_thin), + thick(2, "浓硝酸通道", SystemConfigCode.scale_thick), + water(3, "蒸馏水通道", SystemConfigCode.scale_water), + waste(4, "废水通道", SystemConfigCode.scale_waste), + vacant(5, "空气通道", SystemConfigCode.scale_vacant), + ; + + private final Integer channel; private final String description; - private SystemConfigCode systemConfigCode; + private final SystemConfigCode systemConfigCode; - ValveStateCode(Integer index, String description, SystemConfigCode systemConfigCode) { - this.index = index; + ValveStateCode(Integer channel, String description, SystemConfigCode systemConfigCode) { + this.channel = channel; this.description = description; this.systemConfigCode = systemConfigCode; }