From f743f72882b729edb39505c59ecf99a11684fc63 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 17:47:36 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iflytop/sgs/app/model/bo/status/device/HeatModuleState.java | 4 ++-- .../iflytop/sgs/app/model/bo/status/device/SolutionModuleState.java | 4 ++-- .../iflytop/sgs/app/model/bo/status/device/TransferModuleState.java | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) 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 5351232..86c6575 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 @@ -14,8 +14,8 @@ public class HeatModuleState { @Schema(description = "加热模块是否启用") private boolean enable = true; - @Schema(description = "托盘状态，0为无托盘，1为有托盘") - private int trayStatus = 0; + @Schema(description = "托盘状态，true有托盘，false无托盘") + private boolean trayStatus = false; @Schema(description = "加热类型状态") private HeatingType heatingType = HeatingType.stop; 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 5a382bc..f839112 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 @@ -12,8 +12,8 @@ public class SolutionModuleState { @Schema(description = "是否空闲，true为空闲，false为占用") private boolean idle = true; - @Schema(description = "托盘状态，0为无托盘，1为有托盘") - private int trayStatus = 0; + @Schema(description = "上料台托盘状态，true有托盘，false无托盘") + private boolean feedAreaTrayStatus = false; @Schema(description = "溶液容器状态") private List solutionContainer = new ArrayList<>(); diff --git a/src/main/java/com/iflytop/sgs/app/model/bo/status/device/TransferModuleState.java b/src/main/java/com/iflytop/sgs/app/model/bo/status/device/TransferModuleState.java index cb3c726..a2a7d06 100644 --- a/src/main/java/com/iflytop/sgs/app/model/bo/status/device/TransferModuleState.java +++ b/src/main/java/com/iflytop/sgs/app/model/bo/status/device/TransferModuleState.java @@ -3,9 +3,12 @@ package com.iflytop.sgs.app.model.bo.status.device; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -@Schema(description = "转运机模块") +@Schema(description = "转运模块") @Data public class TransferModuleState { @Schema(description = "是否空闲，true为空闲，false为占用") private boolean idle = true; + + @Schema(description = "托盘状态，true有托盘，false无托盘") + private boolean trayStatus = false; }