diff --git a/app.db b/app.db index 939b890..f800f48 100644 Binary files a/app.db and b/app.db differ diff --git a/src/main/java/a8k/extapi_controler/ExtApiControler.java b/src/main/java/a8k/extapi_controler/ExtApiControler.java index 117ffd2..ce03657 100644 --- a/src/main/java/a8k/extapi_controler/ExtApiControler.java +++ b/src/main/java/a8k/extapi_controler/ExtApiControler.java @@ -5,6 +5,7 @@ import a8k.extapi_controler.utils.*; import a8k.type.appret.AppRet; import a8k.utils.*; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.PostMapping; @@ -19,6 +20,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +@Slf4j @Controller public class ExtApiControler { @PostMapping("/api/service-config/service-list") @@ -82,7 +84,7 @@ public class ExtApiControler { Map newParams = (Map) params.get("params"); var paramService = this.getServiceParamHandlerByServiceKey(serviceKey); - Assert.isTrue(paramService != null,"paramService != null"); + Assert.isTrue(paramService != null, "paramService != null"); var paramServiceClass = paramService.getClass(); for (var param : newParams.entrySet()) { var name = param.getKey(); @@ -269,6 +271,9 @@ public class ExtApiControler { } else if (parameter.getType().equals(EnginnerParamFile.class)) { String value = (String) actionParams.get(i); actionParams.set(i, EnginnerParamFile.fromBase64(value)); + } else if (parameter.getType().equals(Double.class)) { + Object value = actionParams.get(i); + actionParams.set(i, Double.valueOf(String.format("%s", value))); } } @@ -307,6 +312,8 @@ public class ExtApiControler { value = methodValueOf.invoke(null, (String) value); } else if (paramItem.getType().equals(EnginnerParamFile.class)) { value = EnginnerParamFile.fromBase64((String) value); + } else if (paramItem.getType().equals(Double.class)) { + value = Double.valueOf(String.format("%s", value)); } if (!paramItem.getType().isAssignableFrom(value.getClass())) { continue; diff --git a/src/main/java/a8k/extapi_controler/pagecontrol/ExtApiTabConfig.java b/src/main/java/a8k/extapi_controler/pagecontrol/ExtApiTabConfig.java index 04bea71..b6af803 100644 --- a/src/main/java/a8k/extapi_controler/pagecontrol/ExtApiTabConfig.java +++ b/src/main/java/a8k/extapi_controler/pagecontrol/ExtApiTabConfig.java @@ -5,6 +5,8 @@ public enum ExtApiTabConfig { FrontEndEventRouter("基础组件.前端事件路由", true), AppDeviceCtrlService("应用控制.应用控制", true), + BackgroudProcessCtrlService("应用控制.后台线程控制", true), + AppTubeSettingMgrService("应用控制.试管(样本)配置", true),//OK EmergencySamplePosStateMgrService("应用控制.急诊位状态管理", true),//OK @@ -13,6 +15,7 @@ public enum ExtApiTabConfig { ProjIdCardInfoMgrService("应用数据.项目与ID卡管理", true), //OK AppReactionResultMgrService("应用数据.反应结果管理", true), //OK + LowerDeviceParamMgr("底层参数管理", true),//OK MiniServoReferencePointSetting("校准.舵机参考点设置", true), ReactionPlatesTransmitControlerCalibration("校准.反应板相关位置校准", true), @@ -28,15 +31,12 @@ public enum ExtApiTabConfig { PipetteGunLLDParamCalibration("校准.移液枪LLD参数校准", true), PipetteGunLLFParamCalibration("校准.移液枪LLF参数校准", true), OptModuleParamCalibration("校准.光学模块参数校准", true), - + TemperatureCtrlParamCalibration("校准.温度控制参数校准", true), VirtualDeviceSimulationTest("测试.虚拟设备测试", true), MainflowCtrlTestService("测试.主流程控制测试", true), - A8kPipetteCtrlModule("硬件驱动测试.移液枪测试", true), - - ActionReactorService("底层调试.单步调试", false),//OK ReactionPlatesTransmitCtrl("ReactionPlatesTransmitCtrl", false), HbotControlService("HbotControlService", false), diff --git a/src/main/java/a8k/hardware/A8kCanBusService.java b/src/main/java/a8k/hardware/A8kCanBusService.java index 706a4f9..c01a982 100644 --- a/src/main/java/a8k/hardware/A8kCanBusService.java +++ b/src/main/java/a8k/hardware/A8kCanBusService.java @@ -169,8 +169,6 @@ public class A8kCanBusService { - - public void plateCodeScanerPushCardAndScan(MId id, Integer finalStopPos) throws AppException { callcmd(id.toInt(), CmdId.plate_code_scaner_push_card_and_scan.toInt(), finalStopPos); } @@ -303,11 +301,6 @@ public class A8kCanBusService { } - // - // MINI_SERVO - // - - public Boolean priGetIOState(IOId ioid) throws AppException { if (ioid.mtype == ModuleType.kboard) { return callcmd(ioid.mid.toInt(), CmdId.extboard_read_inio.toInt(), ioid.ioIndex).getContentI32(0) != 0; diff --git a/src/main/java/a8k/service/app/appctrl/AppDeviceCtrlService.java b/src/main/java/a8k/service/app/appctrl/AppDeviceCtrlService.java index 470ebfc..dac1fda 100644 --- a/src/main/java/a8k/service/app/appctrl/AppDeviceCtrlService.java +++ b/src/main/java/a8k/service/app/appctrl/AppDeviceCtrlService.java @@ -7,6 +7,8 @@ import a8k.service.app.appstate.ConsumablesMgrService; import a8k.service.app.appstate.ProjectProcessContextMgrService; import a8k.service.app.appstate.SensorState; import a8k.service.app.appstate.type.*; +import a8k.service.app.background.BackgroudProcessCtrlService; +import a8k.service.app.background.TemperatureCtrlService; import a8k.service.app.devicectrl.ctrlservice.DeviceInitCtrlService; import a8k.type.ConsumableGroup; @@ -39,6 +41,8 @@ public class AppDeviceCtrlService { ConsumablesMgrService consumablesMgrService; //耗材管理模块 @Resource ProjectProcessContextMgrService projectProcessContextMgrService; //项目处理上下文管理模块 + @Resource + BackgroudProcessCtrlService backgroudProcessCtrlService; /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ * 设备初始化 @@ -50,6 +54,7 @@ public class AppDeviceCtrlService { @ExtApiFn(name = "设备初始化(阻塞接口)", group = "设备初始化") public List initDevice() throws AppException { + backgroudProcessCtrlService.startProcess(); return deviceInitializationModule.deviceMoveToZero(); } diff --git a/src/main/java/a8k/service/app/appctrl/AppMainFlowCtrlService.java b/src/main/java/a8k/service/app/appctrl/AppMainFlowCtrlService.java index 667fa84..617c5d3 100644 --- a/src/main/java/a8k/service/app/appctrl/AppMainFlowCtrlService.java +++ b/src/main/java/a8k/service/app/appctrl/AppMainFlowCtrlService.java @@ -146,7 +146,7 @@ public class AppMainFlowCtrlService { throw ebuilder.buildAppException(A8kEcode.APPE_DEVICE_NOT_INITED); } - if (gstate.getSensorState().wasteBinFullFlag) { + if (gstate.getSensorState().getWasteBinFullFlag()) { throw ebuilder.buildAppException(A8kEcode.APPE_RECYCLE_BIN_OVERFLOW); } diff --git a/src/main/java/a8k/service/app/appstate/SensorState.java b/src/main/java/a8k/service/app/appstate/SensorState.java index f4a3020..6c60d2a 100644 --- a/src/main/java/a8k/service/app/appstate/SensorState.java +++ b/src/main/java/a8k/service/app/appstate/SensorState.java @@ -2,9 +2,33 @@ package a8k.service.app.appstate; import lombok.Data; -@Data + public class SensorState { - public Integer pboxTemperature = 25; - public Integer incubateBoxTemperature = 25; - public Boolean wasteBinFullFlag = false; -} + Integer pboxTemperature = 25; + Integer incubateBoxTemperature = 25; + Boolean wasteBinFullFlag = false; + + public synchronized Integer getPboxTemperature() { + return pboxTemperature; + } + + public synchronized void setPboxTemperature(Integer pboxTemperature) { + this.pboxTemperature = pboxTemperature; + } + + public synchronized Integer getIncubateBoxTemperature() { + return incubateBoxTemperature; + } + + public synchronized void setIncubateBoxTemperature(Integer incubateBoxTemperature) { + this.incubateBoxTemperature = incubateBoxTemperature; + } + + public synchronized Boolean getWasteBinFullFlag() { + return wasteBinFullFlag; + } + + public synchronized void setWasteBinFullFlag(Boolean wasteBinFullFlag) { + this.wasteBinFullFlag = wasteBinFullFlag; + } +} \ No newline at end of file diff --git a/src/main/java/a8k/service/app/appstate/type/OptScanModule.java b/src/main/java/a8k/service/app/appstate/type/OptScanModule.java index ebbb1d2..7da0ec0 100644 --- a/src/main/java/a8k/service/app/appstate/type/OptScanModule.java +++ b/src/main/java/a8k/service/app/appstate/type/OptScanModule.java @@ -19,6 +19,7 @@ public class OptScanModule { String sampleId; Integer projIndex; + public void syncCfg(IncubationSubTank tank) { this.bloodType = tank.bloodType; this.sampleBarcode = tank.sampleBarcode; diff --git a/src/main/java/a8k/service/app/background/BackgroudProcessCtrlService.java b/src/main/java/a8k/service/app/background/BackgroudProcessCtrlService.java new file mode 100644 index 0000000..747770b --- /dev/null +++ b/src/main/java/a8k/service/app/background/BackgroudProcessCtrlService.java @@ -0,0 +1,33 @@ +package a8k.service.app.background; + +import a8k.extapi_controler.utils.ExtApiFn; +import a8k.extapi_controler.utils.ExtApiTab; +import a8k.service.app.appdata.ProjIdCardInfoMgrService; +import a8k.type.exception.AppException; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Component; + +@Component +@ExtApiTab(cfg = a8k.extapi_controler.pagecontrol.ExtApiTabConfig.BackgroudProcessCtrlService) +public class BackgroudProcessCtrlService { + + @Resource + ProjIdCardInfoMgrService projIdCardInfoMgrService; + @Resource + TemperatureCtrlService temperatureCtrlService; + @Resource + SensorDataUpdateService sensorDataUpdateService; + + + @ExtApiFn(name = "启动后台进程", group = "后台进程控制", order = 1) + synchronized public void startProcess() throws AppException { + temperatureCtrlService.startTemperatureControl(); + sensorDataUpdateService.startUpdate(); + } + + @ExtApiFn(name = "停止后台进程", group = "后台进程控制", order = 2) + synchronized public void stopProcess() throws AppException { + temperatureCtrlService.stopTemperatureControl(); + sensorDataUpdateService.stopUpdate(); + } +} diff --git a/src/main/java/a8k/service/app/background/SensorDataUpdateService.java b/src/main/java/a8k/service/app/background/SensorDataUpdateService.java new file mode 100644 index 0000000..b925c37 --- /dev/null +++ b/src/main/java/a8k/service/app/background/SensorDataUpdateService.java @@ -0,0 +1,79 @@ +package a8k.service.app.background; + +import a8k.hardware.A8kCanBusService; +import a8k.hardware.type.a8kcanprotocol.IOId; +import a8k.service.app.appstate.GStateService; +import a8k.service.app.appstate.type.OptScanModule; +import a8k.service.app.appstate.type.state.OptScanModuleState; +import a8k.service.app.devicectrl.driver.TemperatureControlDriver; +import a8k.type.exception.AppException; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Component +@Slf4j +public class SensorDataUpdateService { + + @Resource + GStateService gStateService; + + @Resource + TemperatureControlDriver temperatureControlDriver; + + @Resource + A8kCanBusService canBus; + + Thread updateThread = null; + + public void startUpdate() { + if (updateThread != null) { + return; + } + + updateThread = new Thread(() -> { + while (true) { + try { + OptScanModuleState optScanModuleState = gStateService.getOptScanModule().getState(); + if (!optScanModuleState.equals(OptScanModuleState.EMPTY)) { + gStateService.getSensorState().setWasteBinFullFlag(false); + Thread.sleep(1000); + continue; + } + + canBus.setIOState(IOId.RecycleBinOverflowPPSPowerCtrl, true); + Thread.sleep(600);//等待光栅电源稳定 + Boolean wasteBinFullFlag = canBus.getIOState(IOId.RecycleBinOverflowPPS); + canBus.setIOState(IOId.RecycleBinOverflowPPSPowerCtrl, false); + + gStateService.getSensorState().setWasteBinFullFlag(wasteBinFullFlag); + + Thread.sleep(3000); + Double incubateBoxTemp = temperatureControlDriver.readIncubateBoxTemperature(); + gStateService.getSensorState().setIncubateBoxTemperature((int) (incubateBoxTemp + 0.5)); + + Double pbtemp = temperatureControlDriver.readPlateBoxTemperature(); + gStateService.getSensorState().setPboxTemperature((int) (pbtemp + 0.5)); + + + log.info("IncubateBoxTemperature: {}, PlateBoxTemperature: {}, WasteBinFullFlag: {}", incubateBoxTemp, pbtemp, wasteBinFullFlag); + } catch (InterruptedException e) { + break; + } catch (AppException e) { + log.error("Failed to read temperature data {}", e.getMessage()); + } + } + }); + updateThread.start(); + } + + public void stopUpdate() { + if (updateThread == null) { + return; + } + updateThread.interrupt(); + updateThread = null; + } + + +} diff --git a/src/main/java/a8k/service/app/background/TemperatureCtrlService.java b/src/main/java/a8k/service/app/background/TemperatureCtrlService.java new file mode 100644 index 0000000..8e3ef1d --- /dev/null +++ b/src/main/java/a8k/service/app/background/TemperatureCtrlService.java @@ -0,0 +1,85 @@ +package a8k.service.app.background; + + +import a8k.service.app.appsetting.AppSettingsMgr; +import a8k.service.app.devicectrl.driver.TemperatureControlDriver; +import a8k.service.db.type.AppSetting; +import a8k.service.test.state.VirtualDevice; +import a8k.type.exception.AppException; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Component +@Slf4j +public class TemperatureCtrlService { + + + @Resource + TemperatureControlDriver temperatureControlDriver; + @Resource + VirtualDevice virtualDevice; + + @Resource + AppSettingsMgr appSettingsMgr; + + Integer temperature = 0; + Thread temperatureCtrlThread = null; + + @PostConstruct + public void init() { + // eventBus.regListener(this::onAppEvent); + } + + public void startTemperatureControl() throws AppException { + if (virtualDevice.isEnable()) { + return; + } + + if (temperatureCtrlThread != null) { + return; + } + + AppSetting setting = appSettingsMgr.getAppSettings(); + temperature = setting.getTemperature(); + temperatureControlDriver.startCtrlTemperature(temperature.doubleValue()); + + /* + * 启动线程，定时检查温度设定值，如果发生变化则调用温度控制器 + */ + temperatureCtrlThread = new Thread(() -> { + while (true) { + try { + + Thread.sleep(1000); + Integer targetTemperature = appSettingsMgr.getAppSettings().getTemperature(); + if (!targetTemperature.equals(temperature)) { + temperature = targetTemperature; + temperatureControlDriver.startCtrlTemperature(temperature.doubleValue()); + } + + } catch (InterruptedException e) { + log.error("Temperature control thread interrupted"); + break; + } catch (AppException e) { + log.error("Temperature control error: {}", e.getMessage()); + } + } + }); + } + + public void stopTemperatureControl() throws AppException { + if (virtualDevice.isEnable()) { + return; + } + + if (temperatureCtrlThread != null) { + temperatureCtrlThread.interrupt(); + temperatureCtrlThread = null; + } + temperatureControlDriver.stopCtrlTemperature(); + + } + +} diff --git a/src/main/java/a8k/service/app/devicectrl/driver/TemperatureControlDriver.java b/src/main/java/a8k/service/app/devicectrl/driver/TemperatureControlDriver.java new file mode 100644 index 0000000..812425b --- /dev/null +++ b/src/main/java/a8k/service/app/devicectrl/driver/TemperatureControlDriver.java @@ -0,0 +1,81 @@ +package a8k.service.app.devicectrl.driver; + +import a8k.hardware.A8kCanBusService; +import a8k.hardware.type.a8kcanprotocol.CmdId; +import a8k.service.app.devicectrl.driver.type.TemperatureControlerMid; +import a8k.service.app.devicectrl.driver.type.TemperatureControlerRegIndex; +import a8k.service.app.devicectrl.param.param_mgr.TemperatureCtrlParamMgr; +import a8k.service.app.devicectrl.param.type.TemperatureCtrlParam; +import a8k.type.exception.AppException; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Component +@Slf4j +public class TemperatureControlDriver { + @Resource + A8kCanBusService canBus; + + Double incubatorTCMTempOffset = 0.0; + Double platesBoxTCMTempOffset = 0.0; + + @Resource + TemperatureCtrlParamMgr temperatureCtrlParamMgr; + + + public void startCtrlTemperature(Double temperature) throws AppException { + + incubatorTCMTempOffset = temperatureCtrlParamMgr.getParam(TemperatureCtrlParam.IncubatorTCMTempOffset); + platesBoxTCMTempOffset = temperatureCtrlParamMgr.getParam(TemperatureCtrlParam.PlatesBoxTCMTempOffset); + + Integer incubatorTCMSetTemp = (int) ((temperature + incubatorTCMTempOffset) * 10); + Integer platesBoxTCMSetTemp = (int) ((temperature + platesBoxTCMTempOffset) * 10); + + log.info("startCtrlTemperature {}", temperature); + log.info(" incubatorTCMSetTemp {}", incubatorTCMSetTemp); + log.info(" platesBoxTCMSetTemp {}", platesBoxTCMSetTemp); + + canBus.callcmd(TemperatureControlerMid.IncubatorTCM.mid, CmdId.temp_controler_start_hearting, incubatorTCMSetTemp); + canBus.callcmd(TemperatureControlerMid.PlatesBoxTCM.mid, CmdId.temp_controler_start_hearting, platesBoxTCMSetTemp); + } + + public void stopCtrlTemperature() throws AppException { + canBus.callcmd(TemperatureControlerMid.IncubatorTCM.mid, CmdId.temp_controler_stop_hearting); + canBus.callcmd(TemperatureControlerMid.PlatesBoxTCM.mid, CmdId.temp_controler_stop_hearting); + } + + public void testCtrlPeltierPower(TemperatureControlerMid mid, Integer val0To100) throws AppException { + canBus.callcmd(mid.mid, CmdId.temp_controler_set_peltier_power_level, val0To100); + } + + public void testCtrlFanLevel(TemperatureControlerMid mid, Integer val0To100) throws AppException { + canBus.callcmd(mid.mid, CmdId.temp_controler_set_fan_level, val0To100); + } + + public void testWaterPumpSpeed(TemperatureControlerMid mid, Integer val0To100) throws AppException { + canBus.callcmd(mid.mid, CmdId.temp_controler_set_pump_level, val0To100); + } + + public Double readIncubateBoxTemperature() throws AppException { + Integer readval = readReg(TemperatureControlerMid.IncubatorTCM, TemperatureControlerRegIndex.kreg_water_cooling_tmp_controler_temp0); + Double readvalDouble = readval / 10.0; + return readvalDouble - incubatorTCMTempOffset; + } + + public Double readPlateBoxTemperature() throws AppException { + Integer readval = readReg(TemperatureControlerMid.PlatesBoxTCM, TemperatureControlerRegIndex.kreg_water_cooling_tmp_controler_temp0); + Double readvalDouble = readval / 10.0; + return readvalDouble - platesBoxTCMTempOffset; + } + + public Integer readReg(TemperatureControlerMid mid, TemperatureControlerRegIndex regIndex) throws AppException { + return canBus.moduleGetReg(mid.mid, regIndex.regIndex); + } + + public void setReg(TemperatureControlerMid mid, TemperatureControlerRegIndex regIndex, Integer val) throws AppException { + canBus.moduleSetReg(mid.mid, regIndex.regIndex, val); + } + + +} diff --git a/src/main/java/a8k/service/app/devicectrl/driver/type/TemperatureControlerMid.java b/src/main/java/a8k/service/app/devicectrl/driver/type/TemperatureControlerMid.java new file mode 100644 index 0000000..0952e62 --- /dev/null +++ b/src/main/java/a8k/service/app/devicectrl/driver/type/TemperatureControlerMid.java @@ -0,0 +1,16 @@ +package a8k.service.app.devicectrl.driver.type; + +import a8k.hardware.type.a8kcanprotocol.MId; +import org.springframework.util.Assert; + +public enum TemperatureControlerMid { + PlatesBoxTCM(MId.PlatesBoxTCM), + IncubatorTCM(MId.IncubatorTCM), + ; + final public MId mid; + + TemperatureControlerMid(MId mid) { + Assert.isTrue(this.name().equals(mid.name()), "StepMotorMId init fail"); + this.mid = mid; + } +} diff --git a/src/main/java/a8k/service/app/devicectrl/driver/type/TemperatureControlerRegIndex.java b/src/main/java/a8k/service/app/devicectrl/driver/type/TemperatureControlerRegIndex.java new file mode 100644 index 0000000..3371ddb --- /dev/null +++ b/src/main/java/a8k/service/app/devicectrl/driver/type/TemperatureControlerRegIndex.java @@ -0,0 +1,41 @@ +package a8k.service.app.devicectrl.driver.type; + +import a8k.hardware.type.regindex.RegIndex; +import org.springframework.util.Assert; + +public enum TemperatureControlerRegIndex { + kreg_water_cooling_tmp_controler_pid_target(RegIndex.kreg_water_cooling_tmp_controler_pid_target), + kreg_water_cooling_tmp_controler_pid_nowoutput(RegIndex.kreg_water_cooling_tmp_controler_pid_nowoutput), + kreg_water_cooling_tmp_controler_pid_feedbackval(RegIndex.kreg_water_cooling_tmp_controler_pid_feedbackval), + kreg_water_cooling_tmp_controler_temp0(RegIndex.kreg_water_cooling_tmp_controler_temp0), + kreg_water_cooling_tmp_controler_temp1(RegIndex.kreg_water_cooling_tmp_controler_temp1), + kreg_water_cooling_tmp_controler_temp2(RegIndex.kreg_water_cooling_tmp_controler_temp2), + kreg_water_cooling_tmp_controler_temp3(RegIndex.kreg_water_cooling_tmp_controler_temp3), + kreg_water_cooling_tmp_controler_pid_kp(RegIndex.kreg_water_cooling_tmp_controler_pid_kp), + kreg_water_cooling_tmp_controler_pid_ki(RegIndex.kreg_water_cooling_tmp_controler_pid_ki), + kreg_water_cooling_tmp_controler_pid_kd(RegIndex.kreg_water_cooling_tmp_controler_pid_kd), + kreg_water_cooling_tmp_controler_pid_max_output(RegIndex.kreg_water_cooling_tmp_controler_pid_max_output), + kreg_water_cooling_tmp_controler_pid_min_output(RegIndex.kreg_water_cooling_tmp_controler_pid_min_output), + kreg_water_cooling_tmp_controler_pid_max_integral(RegIndex.kreg_water_cooling_tmp_controler_pid_max_integral), + kreg_water_cooling_tmp_controler_pid_min_integral(RegIndex.kreg_water_cooling_tmp_controler_pid_min_integral), + kreg_water_cooling_tmp_controler_pid_error_limit(RegIndex.kreg_water_cooling_tmp_controler_pid_error_limit), + kreg_water_cooling_tmp_controler_pid_compute_interval(RegIndex.kreg_water_cooling_tmp_controler_pid_compute_interval), + + ; + public final RegIndex regIndex; + + TemperatureControlerRegIndex(RegIndex regIndex) { + Assert.isTrue(this.name().equals(regIndex.name()), "PipetteRegIndex name must be equal to RegIndex name"); + this.regIndex = regIndex; + } + + public static TemperatureControlerRegIndex valueOf(int val) { + TemperatureControlerRegIndex[] values = TemperatureControlerRegIndex.values(); + for (TemperatureControlerRegIndex regindex : values) { + if (regindex.regIndex.index == val) { + return regindex; + } + } + return null; + } +} diff --git a/src/main/java/a8k/service/app/devicectrl/param/calibration/TemperatureCtrlParamCalibration.java b/src/main/java/a8k/service/app/devicectrl/param/calibration/TemperatureCtrlParamCalibration.java new file mode 100644 index 0000000..7472b6d --- /dev/null +++ b/src/main/java/a8k/service/app/devicectrl/param/calibration/TemperatureCtrlParamCalibration.java @@ -0,0 +1,67 @@ +package a8k.service.app.devicectrl.param.calibration; + + +import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; +import a8k.extapi_controler.utils.ExtApiFn; +import a8k.extapi_controler.utils.ExtApiTab; +import a8k.service.app.devicectrl.driver.TemperatureControlDriver; +import a8k.service.app.devicectrl.param.param_mgr.TemperatureCtrlParamMgr; +import a8k.service.app.devicectrl.param.type.TemperatureCtrlParam; +import a8k.type.exception.AppException; +import a8k.utils.ZJsonHelper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import jakarta.annotation.Resource; +import org.slf4j.Logger; +import org.springframework.stereotype.Component; + +@ExtApiTab(cfg = ExtApiTabConfig.TemperatureCtrlParamCalibration) +@Component +public class TemperatureCtrlParamCalibration { + static Logger logger = org.slf4j.LoggerFactory.getLogger(TemperatureCtrlParamCalibration.class); + + + @Resource + TemperatureControlDriver temperatureControlDriver; + + @Resource + TemperatureCtrlParamMgr temperatureCtrlParamMgr; + + + @ExtApiFn(name = "获取所有参数", group = "基础", order = 1) + public Object getPoss() throws AppException { + return temperatureCtrlParamMgr.getParams(); + } + + + // 测试工具 + @ExtApiFn(name = "设置孵育盘温度偏差", group = "温度控制", order = 11) + public void setIncubatorBoxTemperatureOff(Double offset) throws AppException { + temperatureCtrlParamMgr.setParam(TemperatureCtrlParam.IncubatorTCMTempOffset, offset); + } + + @ExtApiFn(name = "设置板夹仓温度偏差", group = "温度控制", order = 12) + public void setPlatesBoxTCMTempOffset(Double offset) throws AppException { + temperatureCtrlParamMgr.setParam(TemperatureCtrlParam.PlatesBoxTCMTempOffset, offset); + } + + @ExtApiFn(name = "开始控制温度", group = "温度控制", order = 13) + public void startControlTemperature(Double temperature) throws AppException { + temperatureControlDriver.startCtrlTemperature(temperature); + } + + @ExtApiFn(name = "停止控制温度", group = "温度控制", order = 14) + public void stopControlTemperature() throws AppException { + temperatureControlDriver.stopCtrlTemperature(); + } + + //测量工具 + + @ExtApiFn(name = "读取温度", group = "传感状态", order = 21) + public Object readTemperature() throws AppException { + ObjectNode node = ZJsonHelper.createObjectNode(); + node.put("IncubatorBoxTemperature", temperatureControlDriver.readIncubateBoxTemperature()); + node.put("PlatesBoxTemperature", temperatureControlDriver.readPlateBoxTemperature()); + return node; + } + +} diff --git a/src/main/java/a8k/service/app/devicectrl/param/param_mgr/TemperatureCtrlParamMgr.java b/src/main/java/a8k/service/app/devicectrl/param/param_mgr/TemperatureCtrlParamMgr.java new file mode 100644 index 0000000..4e41b69 --- /dev/null +++ b/src/main/java/a8k/service/app/devicectrl/param/param_mgr/TemperatureCtrlParamMgr.java @@ -0,0 +1,32 @@ +package a8k.service.app.devicectrl.param.param_mgr; + +import a8k.service.app.devicectrl.param.param_mgr.base.ParamMgr; +import a8k.service.app.devicectrl.param.type.TemperatureCtrlParam; +import jakarta.annotation.PostConstruct; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +/** + * HBOT二维码扫描坐标参数 + */ +@Component +public class TemperatureCtrlParamMgr extends ParamMgr { + static final Logger logger = LoggerFactory.getLogger(TemperatureCtrlParamMgr.class); + + @PostConstruct + void initialize() { + for (TemperatureCtrlParam pos : TemperatureCtrlParam.values()) { + setParamChName(pos, pos.chName); + } + } + + void setParam(TemperatureCtrlParam pos, Double value) { + super.setParam(pos, value); + } + + public Double getParam(TemperatureCtrlParam pos) { + return super.getParam(pos, Double.class); + } +} + diff --git a/src/main/java/a8k/service/app/devicectrl/param/type/TemperatureCtrlParam.java b/src/main/java/a8k/service/app/devicectrl/param/type/TemperatureCtrlParam.java new file mode 100644 index 0000000..3794a23 --- /dev/null +++ b/src/main/java/a8k/service/app/devicectrl/param/type/TemperatureCtrlParam.java @@ -0,0 +1,16 @@ +package a8k.service.app.devicectrl.param.type; + +public enum TemperatureCtrlParam { + + + IncubatorTCMTempOffset("<孵育仓>温度偏移"), + PlatesBoxTCMTempOffset("<板夹仓>温度偏移"), + ; + public final String chName; + + TemperatureCtrlParam(String chName) { + this.chName = chName; + } + + +} diff --git a/src/main/java/a8k/service/db/type/AppSetting.java b/src/main/java/a8k/service/db/type/AppSetting.java index 273deef..c0b8fa7 100644 --- a/src/main/java/a8k/service/db/type/AppSetting.java +++ b/src/main/java/a8k/service/db/type/AppSetting.java @@ -1,7 +1,9 @@ package a8k.service.db.type; import a8k.service.db.type.appsetting.settingenum.*; +import lombok.Data; +@Data public class AppSetting { public int id = 0; public LanguageType language = LanguageType.zh_CN;