update

src/main/java/a8k/controler/extapi/pagecontrol/ExtApiTabConfig.java

@@ -2,14 +2,14 @@ package a8k.controler.extapi.pagecontrol;
 
 public enum ExtApiTabConfig {
 	AppFrontEndEventRouter("基础组件.前端事件路由", true),
-
 	AppUserMgrService("应用.用户管理", true), //Ok
 	AppSettingsMgr("应用.设备配置管理", true), //OK
-	AppProjectItemMgrService("应用.项目信息管理", true),
+	AppProjectItemMgrService("应用.ID卡状态管理", true),
 	AppConsumablesMgrService("应用.耗材扫描", true),
 	AppStateMgrService("应用.设备状态管理", true),
 	SampleFormulaMgrService("应用.配方管理", true),
 	AppCtrlService("应用.设备控制", true),
+	AppDeviceInitializationModule("应用.初始化", true),
 
 	//底层硬件
 	A8kPipetteCtrlModule("A8kPipetteCtrlModule", true),

src/main/java/a8k/service/app/AppDeviceInitializationModule.java

@@ -0,0 +1,10 @@
+package a8k.service.app;
+
+import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;
+import a8k.controler.extapi.utils.ExtApiTab;
+import org.springframework.stereotype.Component;
+
+@Component
+@ExtApiTab(cfg = ExtApiTabConfig.AppDeviceInitializationModule)
+public class AppDeviceInitializationModule {
+}

src/main/java/a8k/service/project_mgr/AppProjIDCardMgrService.java → src/main/java/a8k/service/app/AppProjIDCardMgrService.java

@@ -1,4 +1,4 @@
-package a8k.service.project_mgr;
+package a8k.service.app;
 
 
 import a8k.baseservice.appeventbus.appevent.*;
@@ -32,7 +32,6 @@ public class AppProjIDCardMgrService implements AppEventListener {
 		static final int readIDCardInfo     = 1;
 		static final int saveIDCardInfo     = 2;
 		static final int getProjectInfoList = 3;
-		static final int getProjectInfo     = 4;
 	}
 
 	@Resource

src/main/java/a8k/service/app/appstate/AppStateMgrService.java

@@ -5,7 +5,7 @@ import a8k.controler.extapi.utils.ExtApiFn;
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;
 import a8k.olddbservice.ProjectInfo;
 import a8k.type.appconsumable.Consumables;
-import a8k.service.appbase.A8kDeviceState;
+import a8k.service.bak_appbase.A8kDeviceState;
 import jakarta.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/a8k/service/appbase/A8kDeviceState.java → src/main/java/a8k/service/bak_appbase/A8kDeviceState.java

@@ -1,10 +1,10 @@
-package a8k.service.appbase;
+package a8k.service.bak_appbase;
 
 import a8k.olddbservice.ProjectInfo;
 import a8k.type.appconsumable.Consumables;
-import a8k.service.appbase.runstate.ReactingPlateRunState;
-import a8k.service.appbase.runstate.EmergencyPosRunState;
-import a8k.service.appbase.runstate.TubeHolderRunState;
+import a8k.service.bak_appbase.runstate.ReactingPlateRunState;
+import a8k.service.bak_appbase.runstate.EmergencyPosRunState;
+import a8k.service.bak_appbase.runstate.TubeHolderRunState;
 
 import java.util.List;
 

src/main/java/a8k/service/appbase/progress/EmergencySampleProgress.java → src/main/java/a8k/service/bak_appbase/progress/EmergencySampleProgress.java

@@ -1,4 +1,4 @@
-package a8k.service.appbase.progress;
+package a8k.service.bak_appbase.progress;
 
 public enum EmergencySampleProgress {
 	IDLE,//

src/main/java/a8k/service/appbase/progress/ReactionPlateProgress.java → src/main/java/a8k/service/bak_appbase/progress/ReactionPlateProgress.java

@@ -1,4 +1,4 @@
-package a8k.service.appbase.progress;
+package a8k.service.bak_appbase.progress;
 
 //反应板条状态
 public enum ReactionPlateProgress {

src/main/java/a8k/service/appbase/progress/TubeHolderProgress.java → src/main/java/a8k/service/bak_appbase/progress/TubeHolderProgress.java

@@ -1,4 +1,4 @@
-package a8k.service.appbase.progress;
+package a8k.service.bak_appbase.progress;
 
 public enum TubeHolderProgress {
 	TubeHolderStateIdle, //空闲

src/main/java/a8k/service/appbase/progress/TubeProcessProgress.java → src/main/java/a8k/service/bak_appbase/progress/TubeProcessProgress.java

@@ -1,4 +1,4 @@
-package a8k.service.appbase.progress;
+package a8k.service.bak_appbase.progress;
 
 public enum TubeProcessProgress {
 	//空

src/main/java/a8k/service/appbase/result/ReactionResult.java → src/main/java/a8k/service/bak_appbase/result/ReactionResult.java

@@ -1,4 +1,4 @@
-package a8k.service.appbase.result;
+package a8k.service.bak_appbase.result;
 
 public class ReactionResult {
 

src/main/java/a8k/service/appbase/runstate/EmergencyPosRunState.java → src/main/java/a8k/service/bak_appbase/runstate/EmergencyPosRunState.java

@@ -1,8 +1,8 @@
-package a8k.service.appbase.runstate;
+package a8k.service.bak_appbase.runstate;
 
 import a8k.type.sampleinfo.SampleInfo;
-import a8k.service.appbase.result.ReactionResult;
-import a8k.service.appbase.progress.EmergencySampleProgress;
+import a8k.service.bak_appbase.result.ReactionResult;
+import a8k.service.bak_appbase.progress.EmergencySampleProgress;
 
 public class EmergencyPosRunState {
 	//急诊位状态

src/main/java/a8k/service/appbase/runstate/ReactingPlateRunState.java → src/main/java/a8k/service/bak_appbase/runstate/ReactingPlateRunState.java

@@ -1,8 +1,8 @@
-package a8k.service.appbase.runstate;
+package a8k.service.bak_appbase.runstate;
 
-import a8k.service.appbase.result.ReactionResult;
+import a8k.service.bak_appbase.result.ReactionResult;
 import a8k.type.sampleinfo.SampleInfo;
-import a8k.service.appbase.progress.ReactionPlateProgress;
+import a8k.service.bak_appbase.progress.ReactionPlateProgress;
 
 import java.util.Date;
 

src/main/java/a8k/service/appbase/runstate/TubeHolderRunState.java → src/main/java/a8k/service/bak_appbase/runstate/TubeHolderRunState.java

@@ -1,8 +1,8 @@
-package a8k.service.appbase.runstate;
+package a8k.service.bak_appbase.runstate;
 
 import a8k.type.type.A8kTubeType;
 import a8k.type.type.BloodType;
-import a8k.service.appbase.progress.TubeHolderProgress;
+import a8k.service.bak_appbase.progress.TubeHolderProgress;
 
 public class TubeHolderRunState {
 	public BloodType          bloodType           = BloodType.WHOLE_BLOOD; //血型

src/main/java/a8k/service/appbase/runstate/TubeRunState.java → src/main/java/a8k/service/bak_appbase/runstate/TubeRunState.java

@@ -1,7 +1,7 @@
-package a8k.service.appbase.runstate;
+package a8k.service.bak_appbase.runstate;
 
 import a8k.type.sampleinfo.SampleInfo;
-import a8k.service.appbase.progress.TubeProcessProgress;
+import a8k.service.bak_appbase.progress.TubeProcessProgress;
 
 public class TubeRunState {
 	public TubeProcessProgress tubeProcessProgress = TubeProcessProgress.EMPTY; //样本运行状态

src/main/java/a8k/service/devicectrl/calibration/PositionCalibration.java → src/main/java/a8k/service/bak_devicectrl/calibration/PositionCalibration.java

@@ -1,4 +1,4 @@
-package a8k.service.devicectrl.calibration;
+package a8k.service.bak_devicectrl.calibration;
 
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;
 import a8k.type.HardwareException;
@@ -7,9 +7,9 @@ import a8k.type.cfg.Pos2d;
 import a8k.controler.extapi.utils.*;
 import a8k.hardware.A8kCanBusService;
 import a8k.hardware.type.a8kcanprotocol.MId;
-import a8k.service.devicectrl.param.DebugParam;
-import a8k.service.devicectrl.param.PosParam;
-import a8k.service.devicectrl.param.TimeParam;
+import a8k.service.bak_devicectrl.param.DebugParam;
+import a8k.service.bak_devicectrl.param.PosParam;
+import a8k.service.bak_devicectrl.param.TimeParam;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;
 

src/main/java/a8k/service/devicectrl/commonctrl/HardwareCommonCtrl.java → src/main/java/a8k/service/bak_devicectrl/commonctrl/HardwareCommonCtrl.java

@@ -1,4 +1,4 @@
-package a8k.service.devicectrl.commonctrl;
+package a8k.service.bak_devicectrl.commonctrl;
 
 
 import a8k.type.HardwareException;
@@ -10,8 +10,8 @@ import a8k.hardware.A8kCanBusService;
 import a8k.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.hardware.type.a8kcanprotocol.IOId;
 import a8k.hardware.type.a8kcanprotocol.MId;
-import a8k.service.devicectrl.param.PosParam;
-import a8k.service.devicectrl.param.TimeParam;
+import a8k.service.bak_devicectrl.param.PosParam;
+import a8k.service.bak_devicectrl.param.TimeParam;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.springframework.stereotype.Component;

src/main/java/a8k/service/devicectrl/ctrl/HbotControlService.java → src/main/java/a8k/service/bak_devicectrl/ctrl/HbotControlService.java

@@ -1,4 +1,4 @@
-package a8k.service.devicectrl.ctrl;
+package a8k.service.bak_devicectrl.ctrl;
 
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;
 import a8k.type.ConsumableGroup;
@@ -11,10 +11,10 @@ import a8k.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.hardware.type.a8kcanprotocol.IOId;
 import a8k.hardware.type.a8kcanprotocol.MId;
 import a8k.hardware.type.regindex.RegIndex;
-import a8k.service.devicectrl.commonctrl.HardwareCommonCtrl;
-import a8k.service.devicectrl.param.DebugParam;
-import a8k.service.devicectrl.param.PosParam;
-import a8k.service.devicectrl.param.TimeParam;
+import a8k.service.bak_devicectrl.commonctrl.HardwareCommonCtrl;
+import a8k.service.bak_devicectrl.param.DebugParam;
+import a8k.service.bak_devicectrl.param.PosParam;
+import a8k.service.bak_devicectrl.param.TimeParam;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/a8k/service/devicectrl/ctrl/PipetteGunCtrlService.java → src/main/java/a8k/service/bak_devicectrl/ctrl/PipetteGunCtrlService.java

@@ -1,4 +1,4 @@
-package a8k.service.devicectrl.ctrl;
+package a8k.service.bak_devicectrl.ctrl;
 
 
 import jakarta.annotation.PostConstruct;

src/main/java/a8k/service/devicectrl/ctrl/ReactionPlatesTransmitCtrl.java → src/main/java/a8k/service/bak_devicectrl/ctrl/ReactionPlatesTransmitCtrl.java

@@ -1,4 +1,4 @@
-package a8k.service.devicectrl.ctrl;
+package a8k.service.bak_devicectrl.ctrl;
 
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;
 import a8k.utils.opt_algo.A8kOptAlgo;
@@ -10,9 +10,9 @@ import a8k.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.hardware.type.a8kcanprotocol.IOId;
 import a8k.hardware.type.a8kcanprotocol.MId;
 import a8k.hardware.type.regindex.RegIndex;
-import a8k.service.devicectrl.param.DebugParam;
-import a8k.service.devicectrl.param.PosParam;
-import a8k.service.devicectrl.param.TimeParam;
+import a8k.service.bak_devicectrl.param.DebugParam;
+import a8k.service.bak_devicectrl.param.PosParam;
+import a8k.service.bak_devicectrl.param.TimeParam;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/a8k/service/devicectrl/ctrl/SamplesPreProcesCtrl.java → src/main/java/a8k/service/bak_devicectrl/ctrl/SamplesPreProcesCtrl.java

@@ -1,4 +1,4 @@
-package a8k.service.devicectrl.ctrl;
+package a8k.service.bak_devicectrl.ctrl;
 
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;
 import a8k.type.HardwareException;
@@ -7,9 +7,9 @@ import a8k.controler.extapi.utils.*;
 import a8k.hardware.A8kCanBusService;
 import a8k.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.hardware.type.a8kcanprotocol.MId;
-import a8k.service.devicectrl.param.DebugParam;
-import a8k.service.devicectrl.param.TimeParam;
-import a8k.service.devicectrl.param.PosParam;
+import a8k.service.bak_devicectrl.param.DebugParam;
+import a8k.service.bak_devicectrl.param.TimeParam;
+import a8k.service.bak_devicectrl.param.PosParam;
 import a8k.utils.ZEQ;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;

src/main/java/a8k/service/devicectrl/ctrl/TubeRackMoveCtrl.java → src/main/java/a8k/service/bak_devicectrl/ctrl/TubeRackMoveCtrl.java

@@ -1,4 +1,4 @@
-package a8k.service.devicectrl.ctrl;
+package a8k.service.bak_devicectrl.ctrl;
 
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;
 import a8k.type.HardwareException;
@@ -9,9 +9,9 @@ import a8k.hardware.A8kCanBusService;
 import a8k.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.hardware.type.a8kcanprotocol.IOId;
 import a8k.hardware.type.a8kcanprotocol.MId;
-import a8k.service.devicectrl.param.DebugParam;
-import a8k.service.devicectrl.param.PosParam;
-import a8k.service.devicectrl.param.TimeParam;
+import a8k.service.bak_devicectrl.param.DebugParam;
+import a8k.service.bak_devicectrl.param.PosParam;
+import a8k.service.bak_devicectrl.param.TimeParam;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/a8k/service/devicectrl/param/DebugParam.java → src/main/java/a8k/service/bak_devicectrl/param/DebugParam.java

@@ -1,4 +1,4 @@
-package a8k.service.devicectrl.param;
+package a8k.service.bak_devicectrl.param;
 
 import a8k.controler.extapi.utils.ExtApiTab;
 import a8k.controler.extapi.utils.ExtApiFn;

src/main/java/a8k/service/devicectrl/param/PosParam.java → src/main/java/a8k/service/bak_devicectrl/param/PosParam.java

@@ -1,4 +1,4 @@
-package a8k.service.devicectrl.param;
+package a8k.service.bak_devicectrl.param;
 
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;
 import a8k.type.cfg.*;

src/main/java/a8k/service/devicectrl/param/TimeParam.java → src/main/java/a8k/service/bak_devicectrl/param/TimeParam.java

@@ -1,4 +1,4 @@
-package a8k.service.devicectrl.param;
+package a8k.service.bak_devicectrl.param;
 
 
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;

src/main/java/a8k/service/devicectrl/status/DeviceStatus.java → src/main/java/a8k/service/bak_devicectrl/status/DeviceStatus.java

@@ -1,4 +1,4 @@
-package a8k.service.devicectrl.status;
+package a8k.service.bak_devicectrl.status;
 
 import a8k.type.HardwareException;
 import a8k.controler.extapi.utils.ExtApiTab;

src/main/java/a8k/service/devicectrl/testscript/TestScript.java → src/main/java/a8k/service/bak_devicectrl/testscript/TestScript.java

@@ -1,4 +1,4 @@
-package a8k.service.devicectrl.testscript;
+package a8k.service.bak_devicectrl.testscript;
 
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;
 import a8k.type.ConsumableGroup;
@@ -9,17 +9,17 @@ import a8k.type.cfg.BottleGroupsPosInfo;
 import a8k.type.cfg.BottlesPosInfo;
 import a8k.type.cfg.TipPickUpPosInfo;
 import a8k.controler.extapi.utils.*;
-import a8k.service.devicectrl.ctrl.SamplesPreProcesCtrl;
-import a8k.service.devicectrl.ctrl.TubeRackMoveCtrl;
+import a8k.service.bak_devicectrl.ctrl.SamplesPreProcesCtrl;
+import a8k.service.bak_devicectrl.ctrl.TubeRackMoveCtrl;
 import a8k.hardware.A8kCanBusService;
 import a8k.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.hardware.type.a8kcanprotocol.MId;
 import a8k.hardware.type.regindex.RegIndex;
-import a8k.service.devicectrl.ctrl.HbotControlService;
-import a8k.service.devicectrl.ctrl.ReactionPlatesTransmitCtrl;
-import a8k.service.devicectrl.param.DebugParam;
-import a8k.service.devicectrl.param.PosParam;
-import a8k.service.devicectrl.param.TimeParam;
+import a8k.service.bak_devicectrl.ctrl.HbotControlService;
+import a8k.service.bak_devicectrl.ctrl.ReactionPlatesTransmitCtrl;
+import a8k.service.bak_devicectrl.param.DebugParam;
+import a8k.service.bak_devicectrl.param.PosParam;
+import a8k.service.bak_devicectrl.param.TimeParam;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;