update

doc/设备调试页面设计.md

@@ -0,0 +1,29 @@
+```angular2html
+调试页面逻辑
+    1. 一个页面对应一个类
+    2. 一个页面的基础属性是（菜单名称，页面类型（通过继承实现）排序（通过类命名实现）GROUP（通过命名空间来实现））
+    
+命名空间
+
+一个设备的测试页面应当包含的内容
+    初始化
+        模式选择
+        初始化设备
+    调试（UI能够操作和展示的一切内容，主要职责在没有UI的情况下调试设备）
+
+    测试 （目的：测试设备设置的参数）
+        代码单元测试
+        驱动测试
+        单步动作测试
+        脚本动作测试
+        全流程动作测试
+        压力测试
+    设备配置与数据（一切设备运行的基础配置，主要目的是配置UI没有展示的配置）
+        测量（目的:通过程序反向测量一些设备信息，用来对设备进行配置，这里不允许修改配置）
+    高级应用（参数设置，测量，等均包含的，一体的配置页面）
+        移液枪验证(送检)
+        温度控制验证（送检）
+        光学模块参数校准与验证
+        摇匀模组验证
+        
+```

src/main/java/a8k/app/service/statemgr/ConsumablesMgrService.java

@@ -177,6 +177,11 @@ public class ConsumablesMgrService {
 	synchronized public Integer statisticsConsumableNum(Integer projId) {
 		int total = 0;
 		for (int i = 0; i < cState.reactionPlateGroup.length; i++) {
+			if(cState.reactionPlateGroup[i].projId == null){
+				continue;
+			}
+
+
 			if (cState.reactionPlateGroup[i].projId.equals(projId)) {
 				total += cState.reactionPlateGroup[i].num - cState.reactionPlateGroup[i].reserveNum;
 			}

src/main/java/a8k/extui/mgr/ExtApiPageGroupCfgMgr.java

@@ -1,23 +1,23 @@
 package a8k.extui.mgr;
 
-import a8k.extui.page.data.DeviceActionParameterSettingPage;
-import a8k.extui.page.data.ProjInfoMgrPage;
-import a8k.extui.page.driver.LowLevelBoardVersionPreviewPage;
+import a8k.extui.newpage.debug.*;
+import a8k.extui.newpage.extsetting.DeviceActionParameterSettingPage;
+import a8k.extui.newpage.extsetting.ProjInfoMgrPage;
+import a8k.extui.newpage.test.driver.LowLevelBoardVersionPreviewPage;
 import a8k.extui.page.measurement.DeviceInitializeUtilsPage;
 import a8k.extui.page.measurement.HbotPosMeasurePage;
-import a8k.extui.page.opt_calibration.OptFormulaTestPage;
-import a8k.extui.page.opt_calibration.OptFormulaTestPageV2;
-import a8k.extui.page.debug.*;
-import a8k.extui.page.driver.PipetteCtrlDriverPage;
-import a8k.extui.page.opt_calibration.A8kOptVerification;
-import a8k.extui.page.frond_end_test.FakeReactionRecordGeneratorPage;
-
-import a8k.extui.page.frond_end_test.VirtualEventGeneratorPage;
-import a8k.extui.page.opt_calibration.OptModuleParamCalibration;
-import a8k.extui.page.pos_calibration.*;
-import a8k.extui.page.stress_test.PipetteGunStressTest;
-import a8k.extui.page.special_verification.P01PipetteGunVerification;
-import a8k.extui.page.special_verification.P02A8kTemperaturaVerfication;
+import a8k.extui.newpage.test.codetest.OptFormulaTestPage;
+import a8k.extui.newpage.test.codetest.OptFormulaTestPageV2;
+import a8k.extui.newpage.test.driver.PipetteCtrlDriverPage;
+import a8k.extui.newpage.extapp.A8kOptVerification;
+import a8k.extui.newpage.test.frond_end_test.FakeReactionRecordGeneratorPage;
+
+import a8k.extui.newpage.test.frond_end_test.VirtualEventGeneratorPage;
+import a8k.extui.newpage.extapp.OptModuleParamCalibration;
+import a8k.extui.newpage.extsetting.pos_calibration.*;
+import a8k.extui.newpage.test.stress_test.PipetteGunStressTest;
+import a8k.extui.newpage.extapp.P01PipetteGunVerification;
+import a8k.extui.newpage.extapp.P02A8kTemperaturaVerfication;
 import a8k.extui.page.verification.*;
 import a8k.extui.page.verification.P34LiquidOperationTestPage;
 import a8k.extui.page.verification.P10ProjejIDCardTestPage;
@@ -25,7 +25,6 @@ import jakarta.annotation.PostConstruct;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 @Component
@@ -121,7 +120,6 @@ public class ExtApiPageGroupCfgMgr {
 		)));
 
 		pushMenu(new Menu("调试", List.of(
-				new Menu(P21AppDebugModeConfigPage.class, "设备模式配置"),
 				new Menu(P00AppEventAndMessageBoxDebugPage.class, "事件与消息"),
 				new Menu(P22UserOperaionInRunOnlyModePage.class, "空转模式用户操作"),
 				new Menu(P22UserOperaionInVertualModePage.class, "虚拟模式用户操作"),

src/main/java/a8k/extui/page/debug/P00AppEventAndMessageBoxDebugPage.java → src/main/java/a8k/extui/newpage/debug/P00AppEventAndMessageBoxDebugPage.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.debug;
+package a8k.extui.newpage.debug;
 
 import a8k.app.a8ktype.appevent.AppEvent;
 import a8k.app.a8ktype.ui.MessageBox;

src/main/java/a8k/extui/page/debug/P00MainflowCtrlServiceDebugPage.java → src/main/java/a8k/extui/newpage/debug/P00MainflowCtrlServiceDebugPage.java

@@ -1,9 +1,7 @@
-package a8k.extui.page.debug;
+package a8k.extui.newpage.debug;
 
 import a8k.app.a8ktype.exception.AppException;
-import a8k.app.a8ktype.others.checkpoint.CheckResult;
 import a8k.app.a8ktype.state.DeviceWorkState;
-import a8k.app.a8ktype.state.SensorState;
 import a8k.app.service.background.BackgroudProcessCtrlService;
 import a8k.app.service.background.SensorDataUpdateService;
 import a8k.app.service.background.TemperatureCtrlService;
@@ -64,24 +62,7 @@ public class P00MainflowCtrlServiceDebugPage {
 		);
 	}
 
-	public void startTemperatureControl() throws AppException {
-		backgroudProcessCtrlService.startProcess();
-	}
-
-	public void stopTemperatureControl() throws AppException {
-		backgroudProcessCtrlService.stopProcess();
-	}
 
-	public List<CheckResult> initializeDevice() throws AppException {
-		var               ret       = deviceInitCtrlService.initDevice();
-		List<CheckResult> errorList = new java.util.ArrayList<>();
-		for (var checkResult : ret) {
-			if (!checkResult.pass) {
-				errorList.add(checkResult);
-			}
-		}
-		return errorList;
-	}
 
 	public void start() throws AppException {
 		appDeviceCtrlService.startWork();
@@ -125,10 +106,6 @@ public class P00MainflowCtrlServiceDebugPage {
 	@PostConstruct
 	public void init() {
 		var page = extApiPageMgr.newPage(this);
-		page.newGroup("基础");
-		page.addFunction("初始化设备", this::initializeDevice);
-		page.addFunction("开始控温", this::startTemperatureControl);
-		page.addFunction("停止控温", this::stopTemperatureControl);
 		page.newGroup("设备控制");
 		page.addFunction("开始", this::start);
 		page.addFunction("停止", this::stop);

src/main/java/a8k/extui/page/debug/P01EmergencyTubeDebugPage.java → src/main/java/a8k/extui/newpage/debug/P01EmergencyTubeDebugPage.java

@@ -1,9 +1,8 @@
-package a8k.extui.page.debug;
+package a8k.extui.newpage.debug;
 
 import a8k.app.a8ktype.device.BloodType;
 import a8k.app.a8ktype.exception.AppException;
 import a8k.app.a8ktype.state.Tube;
-import a8k.app.controler.api.v1.app.state.EmergencyTubeControler;
 import a8k.app.service.statemgr.TubeStateMgrService;
 import a8k.extui.mgr.ExtApiPageMgr;
 import a8k.extui.type.ExtApiStatu;

src/main/java/a8k/extui/page/debug/P01ProjInfoDebugPage.java → src/main/java/a8k/extui/newpage/debug/P01ProjInfoDebugPage.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.debug;
+package a8k.extui.newpage.debug;
 
 import a8k.app.a8ktype.exception.AppException;
 import a8k.app.dao.db.type.A8kProjInfoCardBreif;

src/main/java/a8k/extui/page/debug/P02ConsumablesMgrDebugPage.java → src/main/java/a8k/extui/newpage/debug/P02ConsumablesMgrDebugPage.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.debug;
+package a8k.extui.newpage.debug;
 
 import a8k.app.a8ktype.device.ConsumableGroup;
 import a8k.app.a8ktype.device.TipGroup;
@@ -17,7 +17,6 @@ import a8k.app.service.data.ProjIdCardInfoMgrService;
 import a8k.app.service.data.ProjInfoMgrService;
 import a8k.app.service.mainctrl.AppConsumablesScanService;
 import a8k.app.service.statemgr.ConsumablesMgrService;
-import a8k.app.utils.ProjBuildinInfo;
 import a8k.extui.mgr.ExtApiPageMgr;
 import a8k.extui.type.ExtApiStatu;
 import jakarta.annotation.PostConstruct;

src/main/java/a8k/extui/page/debug/P02TubeSettingDebugPage.java → src/main/java/a8k/extui/newpage/debug/P02TubeSettingDebugPage.java

@@ -1,8 +1,7 @@
-package a8k.extui.page.debug;
+package a8k.extui.newpage.debug;
 
 import a8k.app.a8ktype.device.BloodType;
 import a8k.app.a8ktype.exception.AppException;
-import a8k.app.a8ktype.state.Tube;
 import a8k.app.a8ktype.ui.TubeHolderSetting;
 import a8k.app.a8ktype.ui.TubeSetting;
 import a8k.app.service.mainctrl.TubeSettingMgrService;

src/main/java/a8k/extui/page/debug/P11IncubationPlateStateDebugPageAll.java → src/main/java/a8k/extui/newpage/debug/P11IncubationPlateStateDebugPageAll.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.debug;
+package a8k.extui.newpage.debug;
 
 
 import a8k.app.a8ktype.device.IncubatorPos;

src/main/java/a8k/extui/page/debug/P12TueStateDebugPage.java → src/main/java/a8k/extui/newpage/debug/P12TueStateDebugPage.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.debug;
+package a8k.extui.newpage.debug;
 
 import a8k.app.a8ktype.state.Tube;
 import a8k.app.a8ktype.state.TubeHolder;

src/main/java/a8k/extui/page/debug/P13OptModuleStateDebugPage.java → src/main/java/a8k/extui/newpage/debug/P13OptModuleStateDebugPage.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.debug;
+package a8k.extui.newpage.debug;
 
 import a8k.app.a8ktype.state.OptScanModule;
 import a8k.app.service.statemgr.OptScanModuleStateMgrService;

src/main/java/a8k/extui/page/debug/P20AppSettingDebugPage.java → src/main/java/a8k/extui/newpage/debug/P20AppSettingDebugPage.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.debug;
+package a8k.extui.newpage.debug;
 
 import a8k.app.dao.db.type.AppSetting;
 import a8k.app.dao.db.type.appsetting.settingenum.*;

src/main/java/a8k/extui/page/debug/P22UserOperaionInRunOnlyModePage.java → src/main/java/a8k/extui/newpage/debug/P22UserOperaionInRunOnlyModePage.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.debug;
+package a8k.extui.newpage.debug;
 
 import a8k.app.a8ktype.DeviceRunMode;
 import a8k.app.a8ktype.device.A8kTubeHolderType;
@@ -6,7 +6,6 @@ import a8k.app.a8ktype.exception.AppException;
 import a8k.app.a8ktype.type.TubeHolderScanResult;
 import a8k.app.a8ktype.type.TubesScanResult;
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
-import a8k.app.service.lowerctrl.ProjIDCardCtrlAndMonitorService;
 import a8k.app.service.statemgr.GStateMgrService;
 import a8k.extui.mgr.ExtApiPageMgr;
 import a8k.extui.type.ExtUIPageCfg;

src/main/java/a8k/extui/page/debug/P22UserOperaionInVertualModePage.java → src/main/java/a8k/extui/newpage/debug/P22UserOperaionInVertualModePage.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.debug;
+package a8k.extui.newpage.debug;
 
 import a8k.app.a8ktype.DeviceRunMode;
 import a8k.app.a8ktype.device.A8kTubeHolderType;
@@ -14,7 +14,6 @@ import a8k.app.service.statemgr.GStateMgrService;
 import a8k.extui.mgr.ExtApiPageMgr;
 import a8k.extui.type.ExtUIPageCfg;
 import a8k.teststate.TestStateMgrService;
-import a8k.teststate.VirtualDevice;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;

src/main/java/a8k/extui/page/opt_calibration/A8kOptVerification.java → src/main/java/a8k/extui/newpage/extapp/A8kOptVerification.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.opt_calibration;
+package a8k.extui.newpage.extapp;
 
 import a8k.app.a8kproj.A8kReactionResultComputer;
 import a8k.app.a8kproj.optalgo.type.OptScanResult;

src/main/java/a8k/extui/page/opt_calibration/OptModuleParamCalibration.java → src/main/java/a8k/extui/newpage/extapp/OptModuleParamCalibration.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.opt_calibration;
+package a8k.extui.newpage.extapp;
 
 import a8k.app.a8ktype.device.ConsumableGroup;
 import a8k.app.a8ktype.device.IncubatorPos;

src/main/java/a8k/extui/page/special_verification/P01PipetteGunVerification.java → src/main/java/a8k/extui/newpage/extapp/P01PipetteGunVerification.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.special_verification;
+package a8k.extui.newpage.extapp;
 
 import a8k.app.constant.AppConstant;
 import a8k.app.service.param.HbotTipPosMgr;

src/main/java/a8k/extui/page/special_verification/P02A8kTemperaturaVerfication.java → src/main/java/a8k/extui/newpage/extapp/P02A8kTemperaturaVerfication.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.special_verification;
+package a8k.extui.newpage.extapp;
 
 import a8k.app.a8ktype.param.TemperatureCtrlParam;
 import a8k.app.service.background.BackgroudProcessCtrlService;

src/main/java/a8k/extui/page/data/DeviceActionParameterSettingPage.java → src/main/java/a8k/extui/newpage/extsetting/DeviceActionParameterSettingPage.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.data;
+package a8k.extui.newpage.extsetting;
 
 import a8k.app.controler.filemgr.StorageControler;
 import a8k.app.dao.db.DeviceActionParameterDao;

src/main/java/a8k/extui/page/data/ProjInfoMgrPage.java → src/main/java/a8k/extui/newpage/extsetting/ProjInfoMgrPage.java

@@ -1,15 +1,11 @@
-package a8k.extui.page.data;
+package a8k.extui.newpage.extsetting;
 
 import a8k.app.a8ktype.exception.AppException;
-import a8k.app.controler.filemgr.StorageControler;
-import a8k.app.dao.db.DeviceActionParameterDao;
 import a8k.app.service.data.ProjIdCardInfoMgrService;
 import a8k.app.service.data.ProjInfoMgrService;
 import a8k.app.utils.ProjBuildinInfo;
 import a8k.extui.mgr.ExtApiPageMgr;
 import a8k.extui.type.ExtUIPageCfg;
-import a8k.extui.type.param.ExtUIFile;
-import a8k.extui.type.ret.FileToBeDownload;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;

src/main/java/a8k/extui/page/pos_calibration/P01MiniServoReferencePointIniter.java → src/main/java/a8k/extui/newpage/extsetting/pos_calibration/P01MiniServoReferencePointIniter.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.pos_calibration;
+package a8k.extui.newpage.extsetting.pos_calibration;
 
 
 import a8k.extui.mgr.ExtApiPageMgr;

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

@@ -1,4 +1,4 @@
-package a8k.extui.page.pos_calibration;
+package a8k.extui.newpage.extsetting.pos_calibration;
 
 import a8k.app.a8ktype.param.tubefeeding.TubeFeedingModulePos;
 import a8k.app.a8ktype.param.tubefeeding.TubeFeedingModuleSetting;

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

@@ -1,4 +1,4 @@
-package a8k.extui.page.pos_calibration;
+package a8k.extui.newpage.extsetting.pos_calibration;
 
 import a8k.app.a8ktype.param.tubepreprocess.TubePreProcessGripperPos;
 import a8k.app.a8ktype.param.tubepreprocess.TubePreProcessTubeClamp;

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

@@ -1,4 +1,4 @@
-package a8k.extui.page.pos_calibration;
+package a8k.extui.newpage.extsetting.pos_calibration;
 
 import a8k.app.a8ktype.param.optpos.OptModuleParam;
 import a8k.app.service.param.OptModuleParamsMgr;

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

@@ -1,4 +1,4 @@
-package a8k.extui.page.pos_calibration;
+package a8k.extui.newpage.extsetting.pos_calibration;
 
 
 import a8k.app.a8ktype.device.Pos3d;

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

@@ -1,4 +1,4 @@
-package a8k.extui.page.pos_calibration;
+package a8k.extui.newpage.extsetting.pos_calibration;
 
 import a8k.app.a8ktype.device.Pos2d;
 import a8k.app.a8ktype.param.hbotpos.HbotLittleBSPos;

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

@@ -1,4 +1,4 @@
-package a8k.extui.page.pos_calibration;
+package a8k.extui.newpage.extsetting.pos_calibration;
 
 import a8k.app.a8ktype.device.Pos2d;
 import a8k.app.a8ktype.param.hbotpos.HbotLargeBottleBSPos;

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

@@ -1,4 +1,4 @@
-package a8k.extui.page.pos_calibration;
+package a8k.extui.newpage.extsetting.pos_calibration;
 
 import a8k.app.a8ktype.device.Pos2d;
 import a8k.app.service.param.Hbot2DCodeScanParamMgr;

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

@@ -1,4 +1,4 @@
-package a8k.extui.page.pos_calibration;
+package a8k.extui.newpage.extsetting.pos_calibration;
 
 import a8k.app.a8ktype.device.Pos3d;
 import a8k.app.a8ktype.param.hbotpos.HbotSamplePos;

src/main/java/a8k/extui/newpage/init/DeviceInitPage.java

@@ -0,0 +1,123 @@
+package a8k.extui.newpage.init;
+
+import a8k.app.a8ktype.DeviceRunMode;
+import a8k.app.a8ktype.exception.AppException;
+import a8k.app.a8ktype.others.checkpoint.CheckResult;
+import a8k.app.service.background.BackgroudProcessCtrlService;
+import a8k.app.service.lowerctrl.DeviceInitCtrlService;
+import a8k.app.service.statemgr.GStateMgrService;
+import a8k.extui.mgr.ExtApiPageMgr;
+import a8k.extui.type.ExtApiStatu;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class DeviceInitPage {
+
+	@Resource
+	GStateMgrService gstate;
+
+
+	@Resource
+	DeviceInitCtrlService deviceInitCtrlService;
+
+
+	@ExtApiStatu(name = "", group = "设备工作模式", order = 1)
+	public String getDeviceRunMode() {
+		if (gstate.getDeviceRunMode() == DeviceRunMode.RealMode) {
+			return "真实模式";
+		} else if (gstate.getDeviceRunMode() == DeviceRunMode.VirtualMode) {
+			return "虚拟模式";
+		} else if (gstate.getDeviceRunMode() == DeviceRunMode.RunOnlyMode) {
+			return "设备空转模式";
+		} else if (gstate.getDeviceRunMode() == DeviceRunMode.VirtualStateGenerateMode) {
+			return "虚拟状态生成模式";
+		}
+		return gstate.getDeviceRunMode().name();
+	}
+
+
+	//
+	public void setInRealMode() {
+		gstate.setDeviceRunMode(DeviceRunMode.RealMode);
+	}
+
+	public void setInVirtualMode() {
+		gstate.setDeviceRunMode(DeviceRunMode.VirtualMode);
+	}
+
+	public void setInRunOnlyMode() {
+		gstate.setDeviceRunMode(DeviceRunMode.RunOnlyMode);
+	}
+
+	public void setInVirtualStateMode() {
+		gstate.setDeviceRunMode(DeviceRunMode.VirtualStateGenerateMode);
+	}
+
+
+	public String moveAllStepMotorToZero() throws AppException {
+		deviceInitCtrlService.moveAllMotorToZero();
+		return "SUCCESS";
+	}
+
+	public String disableAll() throws AppException {
+		deviceInitCtrlService.disableAllMotor();
+		return "已失能所有电机";
+	}
+
+	public String enableAll() throws AppException {
+		deviceInitCtrlService.enableAllMotor();
+		return "已使能所有电机";
+	}
+
+
+	@Resource
+	BackgroudProcessCtrlService backgroudProcessCtrlService;
+
+	public void startTemperatureControl() throws AppException {
+		backgroudProcessCtrlService.startProcess();
+	}
+
+	public void stopTemperatureControl() throws AppException {
+		backgroudProcessCtrlService.stopProcess();
+	}
+
+	public List<CheckResult> initializeDevice() throws AppException {
+		var               ret       = deviceInitCtrlService.initDevice();
+		List<CheckResult> errorList = new java.util.ArrayList<>();
+		for (var checkResult : ret) {
+			if (!checkResult.pass) {
+				errorList.add(checkResult);
+			}
+		}
+		return errorList;
+	}
+
+	@Resource
+	ExtApiPageMgr extApiPageMgr;
+
+	@PostConstruct
+	public void init() {
+		var page = extApiPageMgr.newPage(this);
+		page.newGroup("设备工作模式");
+		page.addFunction("设置为真实模式", this::setInRealMode);
+		page.addFunction("设置为虚拟模式", this::setInVirtualMode);
+		page.addFunction("设置为设备空转模式", this::setInRunOnlyMode);
+		page.addFunction("设置为虚拟状态生成模式", this::setInVirtualStateMode);
+
+		page.newGroup("设备初始化");
+		page.addFunction("初始化设备", this::initializeDevice);
+		page.addFunction("开始控温", this::startTemperatureControl);
+		page.addFunction("停止控温", this::stopTemperatureControl);
+
+		page.newGroup("电机初始化");
+		page.addFunction("电机归零", this::moveAllStepMotorToZero);
+		page.addFunction("使能所有电机", this::enableAll);
+		page.addFunction("失能所有电机", this::disableAll);
+
+		extApiPageMgr.addPage(page);
+	}
+}

src/main/java/a8k/extui/page/opt_calibration/OptFormulaTestPage.java → src/main/java/a8k/extui/newpage/test/codetest/OptFormulaTestPage.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.opt_calibration;
+package a8k.extui.newpage.test.codetest;
 
 
 import a8k.app.a8kproj.A8kReactionResultComputer;

src/main/java/a8k/extui/page/opt_calibration/OptFormulaTestPageV2.java → src/main/java/a8k/extui/newpage/test/codetest/OptFormulaTestPageV2.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.opt_calibration;
+package a8k.extui.newpage.test.codetest;
 
 
 import a8k.app.a8kproj.A8kReactionResultComputer;

src/main/java/a8k/extui/page/driver/LowLevelBoardVersionPreviewPage.java → src/main/java/a8k/extui/newpage/test/driver/LowLevelBoardVersionPreviewPage.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.driver;
+package a8k.extui.newpage.test.driver;
 
 import a8k.app.a8ktype.exception.AppException;
 import a8k.app.hardware.basedriver.A8kCanBusService;
@@ -9,9 +9,7 @@ import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @Component

src/main/java/a8k/extui/page/driver/PipetteCtrlDriverPage.java → src/main/java/a8k/extui/newpage/test/driver/PipetteCtrlDriverPage.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.driver;
+package a8k.extui.newpage.test.driver;
 
 import a8k.app.hardware.driver.PipetteCtrlDriver;
 import a8k.extui.mgr.ExtApiPageMgr;

src/main/java/a8k/extui/page/frond_end_test/FakeReactionRecordGeneratorPage.java → src/main/java/a8k/extui/newpage/test/frond_end_test/FakeReactionRecordGeneratorPage.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.frond_end_test;
+package a8k.extui.newpage.test.frond_end_test;
 
 import a8k.SpringBootBeanUtil;
 import a8k.app.a8ktype.device.BloodType;

src/main/java/a8k/extui/page/frond_end_test/FakeStateGeneratorPage.java → src/main/java/a8k/extui/newpage/test/frond_end_test/FakeStateGeneratorPage.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.frond_end_test;
+package a8k.extui.newpage.test.frond_end_test;
 
 import a8k.SpringBootBeanUtil;
 import a8k.app.a8ktype.device.BloodType;

src/main/java/a8k/extui/page/frond_end_test/VirtualEventGeneratorPage.java → src/main/java/a8k/extui/newpage/test/frond_end_test/VirtualEventGeneratorPage.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.frond_end_test;
+package a8k.extui.newpage.test.frond_end_test;
 
 import a8k.app.a8ktype.appevent.*;
 import a8k.app.a8ktype.ui.*;

src/main/java/a8k/extui/page/stress_test/PipetteGunStressTest.java → src/main/java/a8k/extui/newpage/test/stress_test/PipetteGunStressTest.java

@@ -1,4 +1,4 @@
-package a8k.extui.page.stress_test;
+package a8k.extui.newpage.test.stress_test;
 
 import a8k.app.a8ktype.exception.AppException;
 import a8k.app.hardware.driver.PipetteCtrlDriver;

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

@@ -1,4 +1,4 @@
-//package a8k.extui.page.pos_calibration;
+//package a8k.extui.newpage.extsetting.pos_calibration;
 //
 //import a8k.extui.mgr.ExtApiPageMgr;
 //import a8k.app.service.lowerctrl.HbotMoveCtrlService;

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

@@ -1,4 +1,4 @@
-//package a8k.extui.page.pos_calibration;
+//package a8k.extui.newpage.extsetting.pos_calibration;
 //
 //import a8k.app.a8ktype.device.ConsumableGroup;
 //import a8k.app.constant.AppConstant;

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

@@ -1,4 +1,4 @@
-//package a8k.extui.page.pos_calibration;
+//package a8k.extui.newpage.extsetting.pos_calibration;
 //
 //
 //import a8k.app.constant.AppConstant;

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

@@ -1,4 +1,4 @@
-//package a8k.extui.page.pos_calibration;
+//package a8k.extui.newpage.extsetting.pos_calibration;
 //
 //import a8k.app.a8ktype.exception.AppException;
 //import a8k.app.a8ktype.param.optpos.OptModuleExtParam;

src/main/java/a8k/extui/page/debug/P21AppDebugModeConfigPage.java

@@ -1,60 +0,0 @@
-package a8k.extui.page.debug;
-
-import a8k.app.a8ktype.DeviceRunMode;
-import a8k.app.service.statemgr.GStateMgrService;
-import a8k.extui.mgr.ExtApiPageMgr;
-import a8k.extui.type.ExtApiStatu;
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-@Component
-public class P21AppDebugModeConfigPage {
-
-	@Resource
-	GStateMgrService gstate;
-
-	@ExtApiStatu(name = "", group = "设备工作模式", order = 1)
-	public String getDeviceRunMode() {
-		if (gstate.getDeviceRunMode() == DeviceRunMode.RealMode) {
-			return "真实模式";
-		} else if (gstate.getDeviceRunMode() == DeviceRunMode.VirtualMode) {
-			return "虚拟模式";
-		} else if (gstate.getDeviceRunMode() == DeviceRunMode.RunOnlyMode) {
-			return "设备空转模式";
-		} else if (gstate.getDeviceRunMode() == DeviceRunMode.VirtualStateGenerateMode) {
-			return "虚拟状态生成模式";
-		}
-		return gstate.getDeviceRunMode().name();
-	}
-
-	//
-	public void setInRealMode() {
-		gstate.setDeviceRunMode(DeviceRunMode.RealMode);
-	}
-
-	public void setInVirtualMode() {
-		gstate.setDeviceRunMode(DeviceRunMode.VirtualMode);
-	}
-
-	public void setInRunOnlyMode() {
-		gstate.setDeviceRunMode(DeviceRunMode.RunOnlyMode);
-	}
-
-	public void setInVirtualStateMode() {
-		gstate.setDeviceRunMode(DeviceRunMode.VirtualStateGenerateMode);
-	}
-
-	@Resource
-	ExtApiPageMgr extApiPageMgr;
-
-	@PostConstruct
-	public void init() {
-		var page = extApiPageMgr.newPage(this);
-		page.addFunction("设置为真实模式", this::setInRealMode);
-		page.addFunction("设置为虚拟模式", this::setInVirtualMode);
-		page.addFunction("设置为设备空转模式", this::setInRunOnlyMode);
-		page.addFunction("设置为虚拟状态生成模式", this::setInVirtualStateMode);
-		extApiPageMgr.addPage(page);
-	}
-}

src/main/java/a8k/extui/page/measurement/DeviceInitializeUtilsPage.java

@@ -1,46 +0,0 @@
-package a8k.extui.page.measurement;
-
-import a8k.app.a8ktype.exception.AppException;
-import a8k.app.service.lowerctrl.DeviceInitCtrlService;
-import a8k.extui.mgr.ExtApiPageMgr;
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DeviceInitializeUtilsPage {
-	@Resource
-	ExtApiPageMgr extApiPageMgr;
-
-
-	@Resource
-	DeviceInitCtrlService deviceInitCtrlService;
-
-
-	public String moveAllStepMotorToZero() throws AppException {
-		deviceInitCtrlService.moveAllMotorToZero();
-		return "SUCCESS";
-	}
-
-	public String disableAll() throws AppException {
-		deviceInitCtrlService.disableAllMotor();
-		return "已失能所有电机";
-	}
-
-	public String enableAll() throws AppException {
-		deviceInitCtrlService.enableAllMotor();
-		return "已使能所有电机";
-	}
-
-	@PostConstruct
-	public void init() {
-		var page = extApiPageMgr.newPage(this);
-		page.addFunction("电机归零", this::moveAllStepMotorToZero);
-		page.addFunction("使能所有电机", this::enableAll);
-		page.addFunction("失能所有电机", this::disableAll);
-
-		extApiPageMgr.addPage(page);
-	}
-
-
-}