diff --git a/src/main/java/com/iflytop/handacid/app/core/state/ChannelState.java b/src/main/java/com/iflytop/handacid/app/core/state/ChannelState.java index af9d166..bfcf915 100644 --- a/src/main/java/com/iflytop/handacid/app/core/state/ChannelState.java +++ b/src/main/java/com/iflytop/handacid/app/core/state/ChannelState.java @@ -32,7 +32,7 @@ public class ChannelState { private volatile String solutionName; @Schema(description = "溶液浓度") - private volatile String concentration; + private volatile Integer concentration; @Schema(description = "是否选中") private volatile boolean selected = false; @@ -46,7 +46,7 @@ public class ChannelState { @Schema(description = "领取溶液量(单位:mL)") private volatile Double receivedVolume; - public ChannelState(ChannelCode channelCode, Long solutionId, String solutionName, String concentration, Double targetVolume, Double receivedVolume, Double currentVolume) { + public ChannelState(ChannelCode channelCode, Long solutionId, String solutionName, Integer concentration, Double targetVolume, Double receivedVolume, Double currentVolume) { this.channelCode = channelCode; this.solutionId = solutionId; this.solutionName = solutionName; diff --git a/src/main/java/com/iflytop/handacid/app/service/DeviceInitService.java b/src/main/java/com/iflytop/handacid/app/service/DeviceInitService.java index 31e8b4c..cb2e7b3 100644 --- a/src/main/java/com/iflytop/handacid/app/service/DeviceInitService.java +++ b/src/main/java/com/iflytop/handacid/app/service/DeviceInitService.java @@ -35,7 +35,7 @@ public class DeviceInitService { new Thread(() -> { try { log.info("初始化开始"); -// initDeviceState(); + initDeviceState(); log.info("初始化完毕"); } catch (Exception e) { throw new RuntimeException(e);