Browse Source

fix:设备状态初始化方式修改

master
白凤吉 1 week ago
parent
commit
d00274f27b
  1. 4
      src/main/java/com/iflytop/colortitration/app/core/state/HeatModuleState.java
  2. 3
      src/main/java/com/iflytop/colortitration/app/core/state/TitrationModuleState.java
  3. 16
      src/main/java/com/iflytop/colortitration/app/service/DeviceInitService.java

4
src/main/java/com/iflytop/colortitration/app/core/state/HeatModuleState.java

@ -37,4 +37,8 @@ public class HeatModuleState {
@Schema(description = "开始加热的时间") @Schema(description = "开始加热的时间")
private LocalDateTime startHeatTime = null; private LocalDateTime startHeatTime = null;
public HeatModuleState(MultipleModuleCode moduleCode) {
this.moduleCode = moduleCode;
}
} }

3
src/main/java/com/iflytop/colortitration/app/core/state/TitrationModuleState.java

@ -21,4 +21,7 @@ public class TitrationModuleState {
@Schema(description = "是否存在试管,true 存在 false不存在") @Schema(description = "是否存在试管,true 存在 false不存在")
private boolean bubeExist = false; private boolean bubeExist = false;
public TitrationModuleState(MultipleModuleCode moduleCode) {
this.moduleCode = moduleCode;
}
} }

16
src/main/java/com/iflytop/colortitration/app/service/DeviceInitService.java

@ -2,6 +2,7 @@ package com.iflytop.colortitration.app.service;
import com.iflytop.colortitration.app.common.enums.MultipleModuleCode; import com.iflytop.colortitration.app.common.enums.MultipleModuleCode;
import com.iflytop.colortitration.app.core.state.DeviceState; import com.iflytop.colortitration.app.core.state.DeviceState;
import com.iflytop.colortitration.app.core.state.HeatModuleState;
import com.iflytop.colortitration.app.core.state.TitrationModuleState; import com.iflytop.colortitration.app.core.state.TitrationModuleState;
import com.iflytop.colortitration.hardware.service.AppEventBusService; import com.iflytop.colortitration.hardware.service.AppEventBusService;
import com.iflytop.colortitration.hardware.type.appevent.A8kCanBusOnConnectEvent; import com.iflytop.colortitration.hardware.type.appevent.A8kCanBusOnConnectEvent;
@ -20,6 +21,7 @@ public class DeviceInitService {
private boolean isLink = false; private boolean isLink = false;
private final DeviceState deviceState; private final DeviceState deviceState;
private final ObjectProvider<TitrationModuleState> titrationModuleObjectProvider; private final ObjectProvider<TitrationModuleState> titrationModuleObjectProvider;
private final ObjectProvider<HeatModuleState> heatModuleObjectProvider;
@PostConstruct @PostConstruct
public void init() { public void init() {
@ -47,12 +49,14 @@ public class DeviceInitService {
public void initDeviceState() { public void initDeviceState() {
log.info("初始化 initDeviceState"); log.info("初始化 initDeviceState");
TitrationModuleState trayModule1 = titrationModuleObjectProvider.getObject();
trayModule1.setModuleCode(MultipleModuleCode.MODULE_1);
deviceState.getTitrationModuleStateMap().put(MultipleModuleCode.MODULE_1, trayModule1);
TitrationModuleState trayModule2 = titrationModuleObjectProvider.getObject();
trayModule2.setModuleCode(MultipleModuleCode.MODULE_2);
deviceState.getTitrationModuleStateMap().put(MultipleModuleCode.MODULE_2, trayModule2);
for (MultipleModuleCode code : MultipleModuleCode.values()) {
//初始化滴定模块
TitrationModuleState titrationmoduleState = titrationModuleObjectProvider.getObject(code);
deviceState.getTitrationModuleStateMap().put(code, titrationmoduleState);
//初始化加热模块
HeatModuleState heatModuleState = heatModuleObjectProvider.getObject(code);
deviceState.getHeatModuleStateMap().put(code, heatModuleState);
}
log.info("初始化 initDeviceState完毕"); log.info("初始化 initDeviceState完毕");
} }

Loading…
Cancel
Save