recode

src/main/java/a8k/app/hardware/driver/TemperatureControlDriver.java

@@ -4,7 +4,7 @@ import a8k.app.hardware.basedriver.A8kCanBusService;
 import a8k.app.hardware.type.a8kcanprotocol.CmdId;
 import a8k.app.hardware.driver.type.TemperatureControlerMid;
 import a8k.app.hardware.driver.type.TemperatureControlerRegIndex;
-import a8k.app.service.param.TemperatureCtrlParamMgr;
+import a8k.app.service.param.pos.TemperatureCtrlParamMgr;
 import a8k.app.a8ktype.param.TemperatureCtrlParam;
 import a8k.app.a8ktype.exception.AppException;
 import jakarta.annotation.Resource;

src/main/java/a8k/app/service/exparam/HbotConsumableParamMgr.java

@@ -1,10 +1,10 @@
 package a8k.app.service.exparam;
 
 import a8k.app.a8ktype.device.ConsumableGroup;
-import a8k.app.service.param.HbotLargeBottleBSPosMgr;
-import a8k.app.service.param.HbotLittleBSPosMgr;
-import a8k.app.service.param.HbotProbeSubstancePosMgr;
-import a8k.app.service.param.HbotTipPosMgr;
+import a8k.app.service.param.hbotpos.HbotLargeBottleBSPosMgr;
+import a8k.app.service.param.hbotpos.HbotLittleBSPosMgr;
+import a8k.app.service.param.hbotpos.HbotProbeSubstancePosMgr;
+import a8k.app.service.param.hbotpos.HbotTipPosMgr;
 import a8k.app.a8ktype.device.Pos3d;
 import a8k.app.a8ktype.device.TipGroup;
 import jakarta.annotation.PostConstruct;

src/main/java/a8k/app/service/exparam/PipetteGunParamExMgr.java

@@ -1,118 +0,0 @@
-package a8k.app.service.exparam;
-
-import a8k.app.a8ktype.state.ProjectTaskContext;
-import a8k.app.service.exparam.base.PipetteGunBindActionType;
-import a8k.app.service.exparam.base.LLDParamPack;
-import a8k.app.service.exparam.base.LLFParamPack;
-import a8k.app.service.param.HbotLargeBottleBSPosMgr;
-import a8k.app.service.param.HbotSamplePosParamMgr;
-import a8k.app.service.param.PipetteGunLLDParamMgr;
-import a8k.app.service.param.PipetteGunLLFParamMgr;
-import a8k.app.a8ktype.param.type.A8kSamplePos;
-import a8k.app.a8ktype.param.pipette.PipetteGunLLDThresholdParam;
-import a8k.app.a8ktype.param.pipette.PipetteGunLLDTypeParam;
-import a8k.app.a8ktype.device.ConsumableGroup;
-import a8k.app.a8ktype.device.Pos3d;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.util.Assert;
-
-@Component
-public class PipetteGunParamExMgr {
-
-	@Resource
-	PipetteGunLLDParamMgr pipetteGunLLDParamMgr;
-
-	@Resource
-	PipetteGunLLFParamMgr pipetteGunLLFParamMgr;
-
-	@Resource
-	HbotSamplePosParamMgr hbotSamplePosParamMgr;
-
-	@Resource
-	HbotLargeBottleBSPosMgr hbotLargeBottleBSPosMgr;
-
-	@Resource
-	HbotConsumableParamMgr hbotConsumableParamMgr;
-
-	/**
-	 * 获取液面探测相关参数
-	 * @param type 操作类型
-	 * @param cxt 上下文
-	 * @return 液面探测相关参数
-	 */
-	public LLDParamPack getLLDParam(PipetteGunBindActionType type, ProjectTaskContext cxt) {
-		LLDParamPack paramPack = null;
-		switch (type) {
-			case SAMPLE -> {
-				A8kSamplePos samplePos      = cxt.getSamplePos();
-				Pos3d        sampleStartPos = hbotSamplePosParamMgr.getSampleStartPos(samplePos);
-				Pos3d        sampleEndPos   = hbotSamplePosParamMgr.getSampleEndPos(samplePos);
-
-				paramPack            = new LLDParamPack();
-				paramPack.type       = pipetteGunLLDParamMgr.getLLDType(PipetteGunLLDTypeParam.DEFAULT_LLD_TYPE);
-				paramPack.startZ     = sampleStartPos.z;
-				paramPack.endZ       = sampleEndPos.z;
-				paramPack.cThreshold = pipetteGunLLDParamMgr.getLLDThresholdParam(PipetteGunLLDThresholdParam.DEFAULT_C_THRESHOLD);
-				paramPack.pThreshold = pipetteGunLLDParamMgr.getLLDThresholdParam(PipetteGunLLDThresholdParam.DEFAULT_P_THRESHOLD);
-			}
-			case TAKE_LARGE_BUFFER_SOLUTION -> {
-				ConsumableGroup group     = cxt.getConsumable().getGroup();
-				var             sStartPos = hbotLargeBottleBSPosMgr.getLLDStartPos(group);
-				var             sEndPos   = hbotLargeBottleBSPosMgr.getSamplePosEnd(group);
-
-				paramPack            = new LLDParamPack();
-				paramPack.type       = pipetteGunLLDParamMgr.getLLDType(PipetteGunLLDTypeParam.DEFAULT_LLD_TYPE);
-				paramPack.startZ     = sStartPos.z;
-				paramPack.endZ       = sEndPos.z;
-				paramPack.cThreshold = pipetteGunLLDParamMgr.getLLDThresholdParam(PipetteGunLLDThresholdParam.DEFAULT_C_THRESHOLD);
-				paramPack.pThreshold = pipetteGunLLDParamMgr.getLLDThresholdParam(PipetteGunLLDThresholdParam.DEFAULT_P_THRESHOLD);
-			}
-		}
-
-		Assert.notNull(paramPack, "未知的操作类型");
-		return paramPack;
-	}
-
-	/**
-	 * 获取液面跟随相关参数
-	 * @param type 操作类型
-	 * @param cxt 上下文
-	 * @return 液面跟随相关参数
-	 */
-	public LLFParamPack getLLFParam(PipetteGunBindActionType type, ProjectTaskContext cxt) {
-		LLFParamPack paramPack = null;
-		switch (type) {
-			//			取样
-			case MIX_SAMPLE, SAMPLE -> { //
-				A8kSamplePos samplePos = cxt.getSamplePos();
-				paramPack             = new LLFParamPack();
-				paramPack.llfVel      = pipetteGunLLFParamMgr.getSampleLLFVel(samplePos);
-				paramPack.llfStartPos = hbotSamplePosParamMgr.getSampleStartPos(samplePos).z;
-				paramPack.llfEndPos   = hbotSamplePosParamMgr.getSampleStartPos(samplePos).z;
-
-			}
-			//取大瓶缓冲液
-			case TAKE_LARGE_BUFFER_SOLUTION -> { //
-				paramPack             = new LLFParamPack();
-				paramPack.llfVel      = pipetteGunLLFParamMgr.getLargeBSBottleLlfVel();
-				paramPack.llfStartPos = hbotConsumableParamMgr.getLargeBufferSamplePos(cxt.getConsumable().getGroup()).z;
-				paramPack.llfEndPos   = hbotConsumableParamMgr.getLargeBufferSamplePosEnd(cxt.getConsumable().getGroup()).z;
-			}
-
-			//混合反应液，分配大瓶缓冲液到探测物质中
-			case MIX_REACTION_LIQUOR, DISTRIBUTION_LARGE_BUFFER_SOLUTION_PROBE_SUBSTANCE -> {
-				paramPack             = new LLFParamPack();
-				paramPack.llfVel      = 0;
-				paramPack.llfStartPos = 0;
-				paramPack.llfEndPos   = 0;
-			}
-		}
-
-		Assert.notNull(paramPack, "未知的操作类型");
-		Assert.notNull(paramPack.llfVel, "未知的试管类型");
-		return paramPack;
-	}
-
-
-}

src/main/java/a8k/app/service/lowerctrl/ConsumablesScanCtrlService.java

@@ -1,7 +1,7 @@
 package a8k.app.service.lowerctrl;
 
 import a8k.app.hardware.driver.CodeScanerDriver;
-import a8k.app.service.param.Hbot2DCodeScanParamMgr;
+import a8k.app.service.param.hbotpos.Hbot2DCodeScanParamMgr;
 import a8k.teststate.VirtualDevice;
 import a8k.app.a8ktype.type.ConsumableOneChRawResult;
 import a8k.app.a8ktype.type.ConsumableScanRawResult;

src/main/java/a8k/app/service/lowerctrl/HbotMoveExCtrlService.java

@@ -5,11 +5,11 @@ import a8k.app.constant.AppConstant;
 import a8k.app.hardware.driver.type.PipetteRegIndex;
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.app.hardware.driver.HbotDriver;
-import a8k.app.service.param.HbotTipPosMgr;
+import a8k.app.service.param.hbotpos.HbotTipPosMgr;
 import a8k.app.hardware.driver.PipetteCtrlDriver;
 import a8k.app.service.exparam.HbotConsumableParamMgr;
-import a8k.app.service.param.HbotFixedPosParamMgr;
-import a8k.app.service.param.HbotSamplePosParamMgr;
+import a8k.app.service.param.hbotpos.HbotFixedPosParamMgr;
+import a8k.app.service.param.hbotpos.HbotSamplePosParamMgr;
 import a8k.app.a8ktype.param.type.A8kSamplePos;
 import a8k.app.a8ktype.param.hbotpos.HbotSamplePos;
 import a8k.app.a8ktype.exception.AppException;

src/main/java/a8k/app/service/lowerctrl/LiquidOperationCtrlService.java

@@ -11,9 +11,9 @@ import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.app.hardware.driver.PipetteCtrlDriver;
 import a8k.app.a8ktype.exception.AppException;
 import a8k.app.service.exparam.HbotConsumableParamMgr;
-import a8k.app.service.param.HbotSamplePosParamMgr;
-import a8k.app.service.param.PipetteGunExParamMgr;
-import a8k.app.service.param.PipetteGunLLFParamMgr;
+import a8k.app.service.param.hbotpos.HbotSamplePosParamMgr;
+import a8k.app.service.param.pipetteparam.PipetteGunExParamMgr;
+import a8k.app.service.param.pipetteparam.PipetteGunLLFParamMgr;
 import a8k.app.service.statemgr.ConsumablesMgrService;
 import a8k.app.service.statemgr.GStateMgrService;
 import a8k.app.utils.ProjBuildinInfo;
@@ -348,7 +348,7 @@ public class LiquidOperationCtrlService {
 		//取样 (该过程不需要预先吸入空气，因为分配的时候都是接触分配)
 		//
 		pipetteCtrlDriver.zMotorMoveToBlock(liquidLevel);
-		aspirate(sampleEndPos.z, aspiratePumpVmax, pipetteGunLLFParamMgr.getLargeBSBottleLlfVel(), ul * 1.0);
+		aspirate(sampleEndPos.z, aspiratePumpVmax, pipetteGunLLFParamMgr.getSampleLLFVel(from), ul * 1.0);
 		pipetteCtrlDriver.zMotorMoveToBlock(0);
 
 	}

src/main/java/a8k/app/service/lowerctrl/OptScanModuleCtrlService.java

@@ -9,8 +9,8 @@ import a8k.app.hardware.driver.OptModuleDriver;
 import a8k.app.hardware.driver.StepMotorCtrlDriver;
 import a8k.app.hardware.driver.type.OptModuleRegIndex;
 import a8k.app.hardware.driver.type.StepMotorMId;
-import a8k.app.service.param.OptModuleExtParamsMgr;
-import a8k.app.service.param.OptModuleParamsMgr;
+import a8k.app.service.param.optparam.OptModuleExtParamsMgr;
+import a8k.app.service.param.optparam.OptModuleParamsMgr;
 import a8k.app.dao.db.type.OptRawScanData;
 import a8k.app.dao.db.type.a8kidcard.zenum.A8kOptType;
 import a8k.app.a8ktype.device.IncubatorPos;

src/main/java/a8k/app/service/lowerctrl/PlateBoxCtrlService.java

@@ -2,7 +2,7 @@ package a8k.app.service.lowerctrl;
 
 import a8k.app.hardware.driver.StepMotorCtrlDriver;
 import a8k.app.hardware.driver.type.StepMotorMId;
-import a8k.app.service.param.PlatesBoxPosParamMgr;
+import a8k.app.service.param.pos.PlatesBoxPosParamMgr;
 import a8k.app.a8ktype.device.ConsumableGroup;
 import a8k.app.a8ktype.device.IncubatorPos;
 import a8k.app.a8ktype.exception.AppException;

src/main/java/a8k/app/service/lowerctrl/TubeFeedingCtrlService.java

@@ -7,7 +7,7 @@ import a8k.app.hardware.driver.MiniServoDriver;
 import a8k.app.hardware.driver.StepMotorCtrlDriver;
 import a8k.app.hardware.driver.type.MiniServoMId;
 import a8k.app.hardware.driver.type.StepMotorMId;
-import a8k.app.service.param.TubeFeedingModuleParamMgr;
+import a8k.app.service.param.pos.TubeFeedingModuleParamMgr;
 import a8k.app.service.bases.AppEventBusService;
 import a8k.app.a8ktype.appevent.AppWarningNotifyEvent;
 import a8k.app.a8ktype.type.TubeHolderScanResult;

src/main/java/a8k/app/service/lowerctrl/TubePreProcesModuleCtrlService.java

@@ -1,12 +1,11 @@
 package a8k.app.service.lowerctrl;
 
 import a8k.app.hardware.basedriver.A8kCanBusService;
-import a8k.app.hardware.type.a8kcanprotocol.MId;
 import a8k.app.hardware.driver.MiniServoDriver;
 import a8k.app.hardware.driver.StepMotorCtrlDriver;
 import a8k.app.hardware.driver.type.MiniServoMId;
 import a8k.app.hardware.driver.type.StepMotorMId;
-import a8k.app.service.param.TubePreProcesPosParamMgr;
+import a8k.app.service.param.pos.TubePreProcesPosParamMgr;
 import a8k.app.a8ktype.exception.AppException;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;

src/main/java/a8k/app/service/lowerctrl/TurnableMoveCtrlService.java

@@ -2,7 +2,7 @@ package a8k.app.service.lowerctrl;
 
 import a8k.app.hardware.driver.StepMotorCtrlDriver;
 import a8k.app.hardware.driver.type.StepMotorMId;
-import a8k.app.service.param.TurntablePosParamMgr;
+import a8k.app.service.param.pos.TurntablePosParamMgr;
 import a8k.app.a8ktype.device.IncubatorPos;
 import a8k.app.a8ktype.exception.AppException;
 import a8k.app.hardware.basedriver.A8kCanBusService;

src/main/java/a8k/app/service/param/Hbot2DCodeScanParamMgr.java → src/main/java/a8k/app/service/param/hbotpos/Hbot2DCodeScanParamMgr.java

@@ -1,5 +1,6 @@
-package a8k.app.service.param;
+package a8k.app.service.param.hbotpos;
 
+import a8k.app.service.param.pos.PlatesBoxPosParamMgr;
 import a8k.app.service.param.base.ParamMgr;
 import a8k.app.a8ktype.param.hbotpos.Hbot2DCodeScanPos;
 import a8k.app.a8ktype.device.Pos2d;

src/main/java/a8k/app/service/param/HbotFixedPosParamMgr.java → src/main/java/a8k/app/service/param/hbotpos/HbotFixedPosParamMgr.java

@@ -1,4 +1,4 @@
-package a8k.app.service.param;
+package a8k.app.service.param.hbotpos;
 
 import a8k.app.service.param.base.ParamMgr;
 import a8k.app.a8ktype.device.Pos3d;

src/main/java/a8k/app/service/param/HbotLargeBottleBSPosMgr.java → src/main/java/a8k/app/service/param/hbotpos/HbotLargeBottleBSPosMgr.java

@@ -1,4 +1,4 @@
-package a8k.app.service.param;
+package a8k.app.service.param.hbotpos;
 
 import a8k.app.a8ktype.device.ConsumableGroup;
 import a8k.app.service.param.base.ParamMgr;

src/main/java/a8k/app/service/param/HbotLittleBSPosMgr.java → src/main/java/a8k/app/service/param/hbotpos/HbotLittleBSPosMgr.java

@@ -1,4 +1,4 @@
-package a8k.app.service.param;
+package a8k.app.service.param.hbotpos;
 
 import a8k.app.a8ktype.device.ConsumableGroup;
 import a8k.app.service.param.base.ParamMgr;

src/main/java/a8k/app/service/param/HbotProbeSubstancePosMgr.java → src/main/java/a8k/app/service/param/hbotpos/HbotProbeSubstancePosMgr.java

@@ -1,14 +1,10 @@
-package a8k.app.service.param;
+package a8k.app.service.param.hbotpos;
 
 import a8k.app.service.param.base.ParamMgr;
 
 import a8k.app.a8ktype.device.ConsumableGroup;
-import a8k.app.a8ktype.device.Pos2d;
 import a8k.app.a8ktype.device.Pos3d;
-import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 /**

src/main/java/a8k/app/service/param/HbotSamplePosParamMgr.java → src/main/java/a8k/app/service/param/hbotpos/HbotSamplePosParamMgr.java

@@ -1,4 +1,4 @@
-package a8k.app.service.param;
+package a8k.app.service.param.hbotpos;
 
 import a8k.app.service.param.base.ParamMgr;
 import a8k.app.a8ktype.param.type.A8kSamplePos;

src/main/java/a8k/app/service/param/HbotTipPosMgr.java → src/main/java/a8k/app/service/param/hbotpos/HbotTipPosMgr.java

@@ -1,4 +1,4 @@
-package a8k.app.service.param;
+package a8k.app.service.param.hbotpos;
 
 import a8k.app.constant.AppConstant;
 import a8k.app.service.param.base.ParamMgr;

src/main/java/a8k/app/service/param/OptModuleExtParamsMgr.java → src/main/java/a8k/app/service/param/optparam/OptModuleExtParamsMgr.java

@@ -1,4 +1,4 @@
-package a8k.app.service.param;
+package a8k.app.service.param.optparam;
 
 
 import a8k.app.service.param.base.ParamMgr;

src/main/java/a8k/app/service/param/OptModuleParamsMgr.java → src/main/java/a8k/app/service/param/optparam/OptModuleParamsMgr.java

@@ -1,4 +1,4 @@
-package a8k.app.service.param;
+package a8k.app.service.param.optparam;
 
 
 import a8k.app.service.param.base.ParamMgr;
@@ -28,15 +28,6 @@ public class OptModuleParamsMgr extends ParamMgr {
 		getOptScanerScandbyPos();
 	}
 
-//	public void paramReset() {
-//		logger.info("init param");
-//		setParam(OptModuleParam.PullerTargetPos, 1147);
-//		setParam(OptModuleParam.OptScanerDropPos, -349);
-//		setParam(OptModuleParam.OptScanerScandbyPos, 305);
-//		setParam(OptModuleParam.OptScanerScandbyPos, 4000);
-//
-//	}
-
 
 	public void setOptParam(OptModuleParam pos, Object value) {
 		setParam(pos, value);

src/main/java/a8k/app/service/param/PipetteGunExParamMgr.java → src/main/java/a8k/app/service/param/pipetteparam/PipetteGunExParamMgr.java

@@ -1,4 +1,4 @@
-package a8k.app.service.param;
+package a8k.app.service.param.pipetteparam;
 
 import a8k.app.service.param.base.ParamMgr;
 import jakarta.annotation.PostConstruct;

src/main/java/a8k/app/service/param/PipetteGunLLDParamMgr.java → src/main/java/a8k/app/service/param/pipetteparam/PipetteGunLLDParamMgr.java

@@ -1,4 +1,4 @@
-package a8k.app.service.param;
+package a8k.app.service.param.pipetteparam;
 
 import a8k.app.hardware.type.LldType;
 import a8k.app.service.param.base.ParamMgr;
@@ -26,7 +26,7 @@ public class PipetteGunLLDParamMgr extends ParamMgr {
 			initParam(param, param.chName, param.type);
 		}
 
-		// 校验参数类型
+		//		// 校验参数类型
 		Arrays.stream(PipetteGunLLDTypeParam.values()).sequential().forEach(this::getLLDType);
 		Arrays.stream(PipetteGunLLDThresholdParam.values()).sequential().forEach(this::getLLDThresholdParam);
 	}

src/main/java/a8k/app/service/param/PipetteGunLLFParamMgr.java → src/main/java/a8k/app/service/param/pipetteparam/PipetteGunLLFParamMgr.java

@@ -1,4 +1,4 @@
-package a8k.app.service.param;
+package a8k.app.service.param.pipetteparam;
 
 import a8k.app.service.param.base.ParamMgr;
 import a8k.app.a8ktype.param.type.A8kSamplePos;

src/main/java/a8k/app/service/param/PlatesBoxPosParamMgr.java → src/main/java/a8k/app/service/param/pos/PlatesBoxPosParamMgr.java

@@ -1,4 +1,4 @@
-package a8k.app.service.param;
+package a8k.app.service.param.pos;
 
 
 import a8k.app.service.param.base.ParamMgr;

src/main/java/a8k/app/service/param/TemperatureCtrlParamMgr.java → src/main/java/a8k/app/service/param/pos/TemperatureCtrlParamMgr.java

@@ -1,4 +1,4 @@
-package a8k.app.service.param;
+package a8k.app.service.param.pos;
 
 import a8k.app.service.param.base.ParamMgr;
 import a8k.app.a8ktype.param.TemperatureCtrlParam;

src/main/java/a8k/app/service/param/TubeFeedingModuleParamMgr.java → src/main/java/a8k/app/service/param/pos/TubeFeedingModuleParamMgr.java

@@ -1,4 +1,4 @@
-package a8k.app.service.param;
+package a8k.app.service.param.pos;
 
 import a8k.app.service.param.base.ParamMgr;
 import a8k.app.a8ktype.param.tubefeeding.TubeFeedingModuleSetting;

src/main/java/a8k/app/service/param/TubePreProcesPosParamMgr.java → src/main/java/a8k/app/service/param/pos/TubePreProcesPosParamMgr.java

@@ -1,4 +1,4 @@
-package a8k.app.service.param;
+package a8k.app.service.param.pos;
 
 import a8k.app.service.param.base.ParamMgr;
 import a8k.app.a8ktype.param.tubepreprocess.TubePreProcessGripperPos;
@@ -6,13 +6,10 @@ import a8k.app.a8ktype.param.tubepreprocess.TubePreProcessTubeClamp;
 import a8k.app.a8ktype.param.tubepreprocess.TubePreProcessYPos;
 import a8k.app.a8ktype.param.tubepreprocess.TubePreProcessZAxisPos;
 import jakarta.annotation.PostConstruct;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component
 public class TubePreProcesPosParamMgr extends ParamMgr {
-	static final Logger logger = LoggerFactory.getLogger(TubeFeedingModuleParamMgr.class);
 
 	@PostConstruct
 	void initialize() {
@@ -52,15 +49,6 @@ public class TubePreProcesPosParamMgr extends ParamMgr {
 
 	private Integer getParamInteger(Enum<?> pos)                    {return getParam(pos, Integer.class);}
 
-	//Public
-
-	public Integer getPos(TubePreProcessGripperPos pos) {return getParamInteger(pos);}
-
-	public Integer getPos(TubePreProcessTubeClamp pos)  {return getParamInteger(pos);}
-
-	public Integer getPos(TubePreProcessYPos pos)       {return getParamInteger(pos);}
-
-	public Integer getPos(TubePreProcessZAxisPos pos)   {return getParamInteger(pos);}
 
 
 	public Integer getGripperServoOpenPos()             {return getParamInteger(TubePreProcessGripperPos.GripperServoOpenPos);}

src/main/java/a8k/app/service/param/TurntablePosParamMgr.java → src/main/java/a8k/app/service/param/pos/TurntablePosParamMgr.java

@@ -1,4 +1,4 @@
-package a8k.app.service.param;
+package a8k.app.service.param.pos;
 
 import a8k.app.service.param.base.ParamMgr;
 import jakarta.annotation.PostConstruct;

src/main/java/a8k/extui/oldpage/pos_calibration/Hbot2DCodeScanPosCalibration.java

@@ -6,7 +6,7 @@
 //import a8k.app.hardware.driver.PipetteCtrlDriver;
 //import a8k.app.hardware.driver.CodeScanerDriver;
 //import a8k.app.service.lowerctrl.ConsumablesScanCtrlService;
-//import a8k.app.service.param.Hbot2DCodeScanParamMgr;
+//import a8k.app.service.param.hbotpos.Hbot2DCodeScanParamMgr;
 //import a8k.app.a8ktype.device.ConsumableGroup;
 //import a8k.app.a8ktype.type.ConsumableScanRawResult;
 //import a8k.app.a8ktype.exception.AppException;

src/main/java/a8k/extui/oldpage/pos_calibration/HbotLargeBottleBSPosCalibration.java

@@ -7,7 +7,7 @@ import a8k.app.a8ktype.param.hbotpos.HbotLargeBottleBSPos;
 import a8k.app.hardware.driver.HbotDriver;
 import a8k.app.hardware.driver.PipetteCtrlDriver;
 import a8k.app.service.lowerctrl.HbotMoveExCtrlService;
-import a8k.app.service.param.HbotLargeBottleBSPosMgr;
+import a8k.app.service.param.hbotpos.HbotLargeBottleBSPosMgr;
 import a8k.app.a8ktype.device.Pos2d;
 import a8k.app.a8ktype.exception.AppException;
 import a8k.app.utils.ZJsonHelper;

src/main/java/a8k/extui/oldpage/pos_calibration/HbotLittleBSPosCalibration.java

@@ -4,7 +4,7 @@
 //import a8k.app.constant.AppConstant;
 //import a8k.extui.mgr.ExtApiPageMgr;
 //import a8k.app.service.lowerctrl.HbotMoveCtrlService;
-//import a8k.app.service.param.HbotLittleBSPosMgr;
+//import a8k.app.service.param.hbotpos.HbotLittleBSPosMgr;
 //import a8k.app.a8ktype.param.hbotpos.HbotLittleBSPos;
 //import a8k.app.hardware.driver.HbotDriver;
 //import a8k.app.hardware.driver.PipetteCtrlDriver;

src/main/java/a8k/extui/oldpage/pos_calibration/HbotProbeSubstancePosCalibration.java

@@ -4,7 +4,7 @@
 //import a8k.app.constant.AppConstant;
 //import a8k.extui.mgr.ExtApiPageMgr;
 //import a8k.app.service.lowerctrl.HbotMoveCtrlService;
-//import a8k.app.service.param.HbotProbeSubstancePosMgr;
+//import a8k.app.service.param.hbotpos.HbotProbeSubstancePosMgr;
 //import a8k.app.service.lowerctrl.HbotMoveExCtrlService;
 //import a8k.app.hardware.driver.HbotDriver;
 //import a8k.app.hardware.driver.PipetteCtrlDriver;

src/main/java/a8k/extui/oldpage/pos_calibration/HbotTipPosCalibration.java

@@ -5,7 +5,7 @@ import a8k.app.constant.AppConstant;
 import a8k.extui.mgr.ExtApiPageMgr;
 import a8k.app.service.lowerctrl.HbotMoveCtrlService;
 import a8k.app.service.exparam.HbotConsumableParamMgr;
-import a8k.app.service.param.HbotTipPosMgr;
+import a8k.app.service.param.hbotpos.HbotTipPosMgr;
 import a8k.app.hardware.driver.HbotDriver;
 import a8k.app.hardware.driver.PipetteCtrlDriver;
 import a8k.app.service.lowerctrl.HbotMoveExCtrlService;

src/main/java/a8k/extui/oldpage/pos_calibration/OptModuleParamPosCalibration.java

@@ -6,7 +6,7 @@
 //import a8k.app.hardware.driver.StepMotorCtrlDriver;
 //import a8k.app.hardware.driver.type.StepMotorMId;
 //import a8k.app.hardware.extdriver.MotorEnableExDriver;
-//import a8k.app.service.param.OptModuleExtParamsMgr;
+//import a8k.app.service.param.optparam.OptModuleExtParamsMgr;
 //import a8k.extui.mgr.ExtApiPageMgr;
 //import a8k.extui.type.ExtApiStatu;
 //import jakarta.annotation.PostConstruct;

src/main/java/a8k/extui/oldpage/pos_calibration/TubeFeedingModulePosCalibration.java

@@ -8,7 +8,7 @@ import a8k.app.hardware.extdriver.MotorMoveZeroExDriver;
 import a8k.app.service.lowerctrl.TubeFeedingExCtrlService;
 import a8k.app.hardware.driver.type.StepMotorMId;
 import a8k.app.service.lowerctrl.TubeFeedingCtrlService;
-import a8k.app.service.param.TubeFeedingModuleParamMgr;
+import a8k.app.service.param.pos.TubeFeedingModuleParamMgr;
 import a8k.app.dao.db.type.Parameter;
 import a8k.app.a8ktype.param.tubefeeding.TubeFeedingModulePos;
 import a8k.app.a8ktype.param.tubefeeding.TubeFeedingModuleSetting;

src/main/java/a8k/extui/oldpage/pos_calibration/TubePreProcesPosCalibration.java

@@ -9,7 +9,7 @@ import a8k.app.service.lowerctrl.TubePreProcesModuleExCtrlService;
 import a8k.app.hardware.extdriver.MotorEnableExDriver;
 import a8k.app.hardware.extdriver.MotorMoveZeroExDriver;
 import a8k.app.service.lowerctrl.TubePreProcesModuleCtrlService;
-import a8k.app.service.param.TubePreProcesPosParamMgr;
+import a8k.app.service.param.pos.TubePreProcesPosParamMgr;
 import a8k.app.a8ktype.param.tubepreprocess.TubePreProcessGripperPos;
 import a8k.app.a8ktype.param.tubepreprocess.TubePreProcessTubeClamp;
 import a8k.app.a8ktype.param.tubepreprocess.TubePreProcessYPos;

src/main/java/a8k/extui/page/extapp/OptModuleParamCalibration.java

@@ -8,7 +8,7 @@ import a8k.extui.type.ret.A8kScanCurve;
 import a8k.extui.type.ExtApiStatu;
 import a8k.app.service.lowerctrl.OptScanModuleCtrlService;
 import a8k.app.service.lowerctrl.PlateBoxCtrlService;
-import a8k.app.service.param.OptModuleExtParamsMgr;
+import a8k.app.service.param.optparam.OptModuleExtParamsMgr;
 import a8k.app.a8ktype.param.optpos.OptModuleExtParam;
 import a8k.app.dao.db.type.a8kidcard.zenum.A8kOptType;
 import a8k.app.a8ktype.exception.AppException;

src/main/java/a8k/extui/page/extapp/P01PipetteGunVerification.java

@@ -1,8 +1,8 @@
 package a8k.extui.page.extapp;
 
 import a8k.app.constant.AppConstant;
-import a8k.app.service.param.HbotTipPosMgr;
-import a8k.app.service.param.PipetteGunExParamMgr;
+import a8k.app.service.param.hbotpos.HbotTipPosMgr;
+import a8k.app.service.param.pipetteparam.PipetteGunExParamMgr;
 import a8k.extui.mgr.ExtApiPageMgr;
 import a8k.extui.type.ExtUIPageCfg;
 import a8k.app.hardware.type.LldType;

src/main/java/a8k/extui/page/extapp/P02A8kTemperaturaVerfication.java

@@ -2,7 +2,7 @@ package a8k.extui.page.extapp;
 
 import a8k.app.a8ktype.param.TemperatureCtrlParam;
 import a8k.app.service.background.BackgroudProcessCtrlService;
-import a8k.app.service.param.TemperatureCtrlParamMgr;
+import a8k.app.service.param.pos.TemperatureCtrlParamMgr;
 import a8k.extui.type.ret.ExtApiCurve;
 import a8k.extui.factory.CurveBuilder;
 import a8k.extui.type.ExtApiStatu;

src/main/java/a8k/extui/page/extsetting/pos_calibration/P02TubeFeedingModulePosCalibrationPage.java

@@ -2,7 +2,7 @@ package a8k.extui.page.extsetting.pos_calibration;
 
 import a8k.app.a8ktype.param.tubefeeding.TubeFeedingModulePos;
 import a8k.app.a8ktype.param.tubefeeding.TubeFeedingModuleSetting;
-import a8k.app.service.param.TubeFeedingModuleParamMgr;
+import a8k.app.service.param.pos.TubeFeedingModuleParamMgr;
 import a8k.extui.mgr.ExtApiPageMgr;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;

src/main/java/a8k/extui/page/extsetting/pos_calibration/P03TubePreProcesPosCalibrationPage.java

@@ -4,7 +4,7 @@ import a8k.app.a8ktype.param.tubepreprocess.TubePreProcessGripperPos;
 import a8k.app.a8ktype.param.tubepreprocess.TubePreProcessTubeClamp;
 import a8k.app.a8ktype.param.tubepreprocess.TubePreProcessYPos;
 import a8k.app.a8ktype.param.tubepreprocess.TubePreProcessZAxisPos;
-import a8k.app.service.param.TubePreProcesPosParamMgr;
+import a8k.app.service.param.pos.TubePreProcesPosParamMgr;
 import a8k.extui.mgr.ExtApiPageMgr;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;

src/main/java/a8k/extui/page/extsetting/pos_calibration/P04ReactionPlatesTransmitControlerCalibrationPage.java

@@ -1,9 +1,9 @@
 package a8k.extui.page.extsetting.pos_calibration;
 
 import a8k.app.a8ktype.param.optpos.OptModuleParam;
-import a8k.app.service.param.OptModuleParamsMgr;
-import a8k.app.service.param.PlatesBoxPosParamMgr;
-import a8k.app.service.param.TurntablePosParamMgr;
+import a8k.app.service.param.optparam.OptModuleParamsMgr;
+import a8k.app.service.param.pos.PlatesBoxPosParamMgr;
+import a8k.app.service.param.pos.TurntablePosParamMgr;
 import a8k.extui.mgr.ExtApiPageMgr;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;

src/main/java/a8k/extui/page/extsetting/pos_calibration/P20HbotTipPosCalibrationPage.java

@@ -4,8 +4,8 @@ package a8k.extui.page.extsetting.pos_calibration;
 import a8k.app.a8ktype.device.Pos3d;
 import a8k.app.a8ktype.device.TipGroup;
 import a8k.app.a8ktype.type.TipPosConfig;
-import a8k.app.service.param.HbotFixedPosParamMgr;
-import a8k.app.service.param.HbotTipPosMgr;
+import a8k.app.service.param.hbotpos.HbotFixedPosParamMgr;
+import a8k.app.service.param.hbotpos.HbotTipPosMgr;
 import a8k.extui.mgr.ExtApiPageMgr;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;

src/main/java/a8k/extui/page/extsetting/pos_calibration/P21HbotLittleBSPosCalibrationPage.java

@@ -2,7 +2,7 @@ package a8k.extui.page.extsetting.pos_calibration;
 
 import a8k.app.a8ktype.device.Pos2d;
 import a8k.app.a8ktype.param.hbotpos.HbotLittleBSPos;
-import a8k.app.service.param.HbotLittleBSPosMgr;
+import a8k.app.service.param.hbotpos.HbotLittleBSPosMgr;
 import a8k.extui.mgr.ExtApiPageMgr;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;

src/main/java/a8k/extui/page/extsetting/pos_calibration/P23HbotLargeBottleBSPosCalibrationPage.java

@@ -2,7 +2,7 @@ package a8k.extui.page.extsetting.pos_calibration;
 
 import a8k.app.a8ktype.device.Pos2d;
 import a8k.app.a8ktype.param.hbotpos.HbotLargeBottleBSPos;
-import a8k.app.service.param.HbotLargeBottleBSPosMgr;
+import a8k.app.service.param.hbotpos.HbotLargeBottleBSPosMgr;
 import a8k.extui.mgr.ExtApiPageMgr;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;

src/main/java/a8k/extui/page/extsetting/pos_calibration/P24Hbot2DCodeScanPosCalibrationPage.java

@@ -1,7 +1,7 @@
 package a8k.extui.page.extsetting.pos_calibration;
 
 import a8k.app.a8ktype.device.Pos2d;
-import a8k.app.service.param.Hbot2DCodeScanParamMgr;
+import a8k.app.service.param.hbotpos.Hbot2DCodeScanParamMgr;
 import a8k.extui.mgr.ExtApiPageMgr;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;

src/main/java/a8k/extui/page/extsetting/pos_calibration/P25HbotSamplePosCalibrationPage.java

@@ -2,7 +2,7 @@ package a8k.extui.page.extsetting.pos_calibration;
 
 import a8k.app.a8ktype.device.Pos3d;
 import a8k.app.a8ktype.param.hbotpos.HbotSamplePos;
-import a8k.app.service.param.HbotSamplePosParamMgr;
+import a8k.app.service.param.hbotpos.HbotSamplePosParamMgr;
 import a8k.extui.mgr.ExtApiPageMgr;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;

src/main/java/a8k/unittest/TestBeforeRun.java

@@ -1,7 +1,7 @@
 package a8k.unittest;
 
 
-import a8k.app.service.param.PipetteGunLLDParamMgr;
+import a8k.app.service.param.pipetteparam.PipetteGunLLDParamMgr;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;