Browse Source

systemconfig删除属性

master
王梦远 2 months ago
parent
commit
0a3e6dd216
  1. 2
      src/main/java/com/iflytop/sgs/app/cmd/control/CleanStartCommand.java
  2. 2
      src/main/java/com/iflytop/sgs/app/cmd/control/LiquidReduceCommand.java

2
src/main/java/com/iflytop/sgs/app/cmd/control/CleanStartCommand.java

@ -56,7 +56,7 @@ public class CleanStartCommand extends BaseCommandHandler {
Solutions solutions = solutionsService.getByCode(SolutionCode.water.name());
double waterScale = solutions.getDoubleScale();//水转换系数
double cleanWaterVolume = volume * waterScale;//清洁时加水的量
double pumpPosition = systemConfigService.getSystemConfigDoubleByCode(SystemConfigCode.number_reduce);//抽液时蠕动泵移动
double pumpPosition = systemConfigService.getSystemConfigDoubleByCode(SystemConfigCode.reduce_distance);//抽液时蠕动泵移动
Double solutionModuleMotorDownInTubeExtPositon = devicePositionService.getPosition(DevicePositionCode.solutionModuleMotorDownInTubeExtPositon).getPositon();//加液模块电机下降进入试管抽取位置
Point3D liquidAreaTrayPoint3D = devicePositionService.getPosition(DevicePositionCode.liquidAreaTrayPoint).getPoint3D();//获取加液时托盘位置点
Double trayTubeHorizontalSpacingDistance = devicePositionService.getPosition(DevicePositionCode.trayTubeHorizontalSpacingDistance).getDistance();//获取托盘试管水平间距

2
src/main/java/com/iflytop/sgs/app/cmd/control/LiquidReduceCommand.java

@ -49,7 +49,7 @@ public class LiquidReduceCommand extends BaseCommandHandler {
Point3D liquidAreaTrayPoint3D = devicePositionService.getPosition(DevicePositionCode.liquidAreaTrayPoint).getPoint3D();//获取加液时托盘位置点
Double trayTubeHorizontalSpacingDistance = devicePositionService.getPosition(DevicePositionCode.trayTubeHorizontalSpacingDistance).getDistance();//获取托盘试管水平间距
Double solutionModuleMotorDownInTubeExtPositon = devicePositionService.getPosition(DevicePositionCode.solutionModuleMotorDownInTubeExtPositon).getPositon();//加液模块电机下降进入试管抽取位置
double reduceNumber = systemConfigService.getSystemConfigDoubleByCode(SystemConfigCode.number_reduce);//抽液volume配置
double reduceNumber = systemConfigService.getSystemConfigDoubleByCode(SystemConfigCode.reduce_distance);//抽液volume配置
deviceStateService.getCommandMutexState().get().setTransferCommandExecuting(true);
return runAsync(() -> {
try {

Loading…
Cancel
Save