Browse Source

fix:修复通道初始化数据

master
白凤吉 4 days ago
parent
commit
91d116be3c
  1. 4
      src/main/java/com/iflytop/handacid/app/core/state/ChannelState.java
  2. 2
      src/main/java/com/iflytop/handacid/app/service/DeviceInitService.java

4
src/main/java/com/iflytop/handacid/app/core/state/ChannelState.java

@ -32,7 +32,7 @@ public class ChannelState {
private volatile String solutionName; private volatile String solutionName;
@Schema(description = "溶液浓度") @Schema(description = "溶液浓度")
private volatile String concentration;
private volatile Integer concentration;
@Schema(description = "是否选中") @Schema(description = "是否选中")
private volatile boolean selected = false; private volatile boolean selected = false;
@ -46,7 +46,7 @@ public class ChannelState {
@Schema(description = "领取溶液量(单位:mL)") @Schema(description = "领取溶液量(单位:mL)")
private volatile Double receivedVolume; 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.channelCode = channelCode;
this.solutionId = solutionId; this.solutionId = solutionId;
this.solutionName = solutionName; this.solutionName = solutionName;

2
src/main/java/com/iflytop/handacid/app/service/DeviceInitService.java

@ -35,7 +35,7 @@ public class DeviceInitService {
new Thread(() -> { new Thread(() -> {
try { try {
log.info("初始化开始"); log.info("初始化开始");
// initDeviceState();
initDeviceState();
log.info("初始化完毕"); log.info("初始化完毕");
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);

Loading…
Cancel
Save