recode

src/main/java/a8k/app/controler/api/v1/app/ws/AppWebSocketEndpointMgr.java

@@ -1,6 +1,6 @@
 package a8k.app.controler.api.v1.app.ws;
 
-import a8k.app.engineer_service.state.EngineerModeStateMgrService;
+import a8k.app.service.engineer.state.EngineerModeStateMgrService;
 import a8k.app.type.AppGetStateFn;
 import a8k.app.type.DeviceRunMode;
 import a8k.app.dao.type.db.AppUser;

src/main/java/a8k/app/controler/api/v1/engineer/EngineerModeActionCtrlController.java

@@ -1,7 +1,7 @@
 package a8k.app.controler.api.v1.engineer;
 
 
-import a8k.app.engineer_service.qatest.EngineerModeActionCtrlService;
+import a8k.app.service.engineer.qatest.EngineerModeActionCtrlService;
 import a8k.app.type.exception.AppException;
 import a8k.app.type.ui.ApiRet;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/a8k/app/controler/api/v1/engineer/ExperimentConsistencyTestingControler.java

@@ -1,9 +1,9 @@
 package a8k.app.controler.api.v1.engineer;
 
 
-import a8k.app.engineer_service.qatest.ExperimentConsistencyTestingService;
-import a8k.app.engineer_service.state.TubeholderExSettingMgr;
-import a8k.app.engineer_service.type.TubeHolderExConfig;
+import a8k.app.service.engineer.qatest.ExperimentConsistencyTestingService;
+import a8k.app.service.engineer.state.TubeholderExSettingMgr;
+import a8k.app.service.engineer.type.TubeHolderExConfig;
 import a8k.app.type.exception.AppException;
 import a8k.app.type.ui.ApiRet;
 import a8k.app.utils.ZJsonHelper;

src/main/java/a8k/app/controler/api/v1/engineer/LiquidAbsorptionAndDistributionTestControler.java

@@ -1,7 +1,7 @@
 package a8k.app.controler.api.v1.engineer;
 
 
-import a8k.app.engineer_service.qatest.LiquidAbsorptionAndDistributionTestService;
+import a8k.app.service.engineer.qatest.LiquidAbsorptionAndDistributionTestService;
 import a8k.app.iflytophald.type.protocol.A8kEcode;
 import a8k.app.type.exception.AppException;
 import a8k.app.type.ui.ApiRet;

src/main/java/a8k/app/controler/api/v1/engineer/QATemperatureCtrlTestController.java

@@ -1,7 +1,7 @@
 package a8k.app.controler.api.v1.engineer;
 
 
-import a8k.app.engineer_service.qatest.QATemperatureCtrlTestService;
+import a8k.app.service.engineer.qatest.QATemperatureCtrlTestService;
 import a8k.app.type.TemperatureRecordPoint;
 import a8k.app.type.ui.ApiRet;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/a8k/app/engineer_service/type/EngineerActionType.java

@@ -1,2 +0,0 @@
-package a8k.app.engineer_service.type;
-

src/main/java/a8k/app/engineer_service/executor/EngineerModeActionExecutor.java → src/main/java/a8k/app/service/engineer/executor/EngineerModeActionExecutor.java

@@ -1,9 +1,9 @@
-package a8k.app.engineer_service.executor;
+package a8k.app.service.engineer.executor;
 
 import a8k.OS;
-import a8k.app.engineer_service.state.EngineerModeStateMgrService;
-import a8k.app.engineer_service.type.A8kCmdRunnable;
-import a8k.app.engineer_service.type.EngineerWorkState;
+import a8k.app.service.engineer.state.EngineerModeStateMgrService;
+import a8k.app.service.engineer.type.EngineerWorkState;
+import a8k.app.service.engineer.type.A8kCmdRunnable;
 import a8k.app.service.statemgr.DeviceWorkStateMgrService;
 import a8k.app.service.statemgr.GStateMgrService;
 import a8k.app.type.DeviceRunMode;

src/main/java/a8k/app/engineer_service/qatest/EngineerModeActionCtrlService.java → src/main/java/a8k/app/service/engineer/qatest/EngineerModeActionCtrlService.java

@@ -1,6 +1,6 @@
-package a8k.app.engineer_service.qatest;
+package a8k.app.service.engineer.qatest;
 
-import a8k.app.engineer_service.executor.EngineerModeActionExecutor;
+import a8k.app.service.engineer.executor.EngineerModeActionExecutor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

src/main/java/a8k/app/engineer_service/qatest/ExperimentConsistencyTestingService.java → src/main/java/a8k/app/service/engineer/qatest/ExperimentConsistencyTestingService.java

@@ -1,7 +1,6 @@
-package a8k.app.engineer_service.qatest;
+package a8k.app.service.engineer.qatest;
 
-import a8k.app.engineer_service.state.TubeholderExSettingMgr;
-import a8k.app.iflytophald.type.protocol.A8kEcode;
+import a8k.app.service.engineer.state.TubeholderExSettingMgr;
 import a8k.app.service.data.ProjInfoMgrService;
 import a8k.app.service.mainctrl.MainFlowCtrlScheduler;
 import a8k.app.service.mainctrl.TubeHolderSettingMgrService;

src/main/java/a8k/app/engineer_service/qatest/LiquidAbsorptionAndDistributionTestService.java → src/main/java/a8k/app/service/engineer/qatest/LiquidAbsorptionAndDistributionTestService.java

@@ -1,7 +1,7 @@
-package a8k.app.engineer_service.qatest;
+package a8k.app.service.engineer.qatest;
 
-import a8k.app.engineer_service.executor.EngineerModeActionExecutor;
-import a8k.app.engineer_service.utils.BeforeDoEngineerActionChecker;
+import a8k.app.service.engineer.executor.EngineerModeActionExecutor;
+import a8k.app.service.engineer.utils.BeforeDoEngineerActionChecker;
 import a8k.app.iflytophald.driver.PipetteCtrlDriverV2;
 import a8k.app.iflytophald.type.protocol.pipette_module.DistribuType;
 import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.ContainerCpyId;

src/main/java/a8k/app/engineer_service/qatest/QATemperatureCtrlTestService.java → src/main/java/a8k/app/service/engineer/qatest/QATemperatureCtrlTestService.java

@@ -1,4 +1,4 @@
-package a8k.app.engineer_service.qatest;
+package a8k.app.service.engineer.qatest;
 
 import a8k.app.service.background.SensorDataUpdateService;
 import a8k.app.service.background.TemperatureCtrlService;

src/main/java/a8k/app/engineer_service/state/EngineerModeStateMgrService.java → src/main/java/a8k/app/service/engineer/state/EngineerModeStateMgrService.java

@@ -1,8 +1,8 @@
-package a8k.app.engineer_service.state;
+package a8k.app.service.engineer.state;
 
 
-import a8k.app.engineer_service.type.EngineerModeState;
-import a8k.app.engineer_service.type.EngineerWorkState;
+import a8k.app.service.engineer.type.EngineerModeState;
+import a8k.app.service.engineer.type.EngineerWorkState;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

src/main/java/a8k/app/engineer_service/state/TubeholderExSettingMgr.java → src/main/java/a8k/app/service/engineer/state/TubeholderExSettingMgr.java

@@ -1,6 +1,6 @@
-package a8k.app.engineer_service.state;
+package a8k.app.service.engineer.state;
 
-import a8k.app.engineer_service.type.TubeHolderExConfig;
+import a8k.app.service.engineer.type.TubeHolderExConfig;
 import a8k.app.utils.ZJsonHelper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/a8k/app/engineer_service/type/A8kCmdRunnable.java → src/main/java/a8k/app/service/engineer/type/A8kCmdRunnable.java

@@ -1,4 +1,4 @@
-package a8k.app.engineer_service.type;
+package a8k.app.service.engineer.type;
 
 import a8k.app.type.exception.AppException;
 

src/main/java/a8k/app/service/engineer/type/EngineerActionType.java

@@ -0,0 +1,2 @@
+package a8k.app.service.engineer.type;
+

src/main/java/a8k/app/engineer_service/type/EngineerModeState.java → src/main/java/a8k/app/service/engineer/type/EngineerModeState.java

@@ -1,4 +1,4 @@
-package a8k.app.engineer_service.type;
+package a8k.app.service.engineer.type;
 
 
 public class EngineerModeState {

src/main/java/a8k/app/engineer_service/type/EngineerWorkState.java → src/main/java/a8k/app/service/engineer/type/EngineerWorkState.java

@@ -1,4 +1,4 @@
-package a8k.app.engineer_service.type;
+package a8k.app.service.engineer.type;
 
 public enum EngineerWorkState {
 	IDLE,

src/main/java/a8k/app/engineer_service/type/TubeExConfig.java → src/main/java/a8k/app/service/engineer/type/TubeExConfig.java

@@ -1,4 +1,4 @@
-package a8k.app.engineer_service.type;
+package a8k.app.service.engineer.type;
 
 public class TubeExConfig {
 	public Integer repeatTimes = 1;

src/main/java/a8k/app/engineer_service/type/TubeHolderExConfig.java → src/main/java/a8k/app/service/engineer/type/TubeHolderExConfig.java

@@ -1,4 +1,4 @@
-package a8k.app.engineer_service.type;
+package a8k.app.service.engineer.type;
 
 import a8k.app.constant.AppConstant;
 import lombok.Data;

src/main/java/a8k/app/engineer_service/utils/BeforeDoEngineerActionChecker.java → src/main/java/a8k/app/service/engineer/utils/BeforeDoEngineerActionChecker.java

@@ -1,9 +1,9 @@
-package a8k.app.engineer_service.utils;
+package a8k.app.service.engineer.utils;
 
 
 import a8k.SpringBootBeanUtil;
-import a8k.app.engineer_service.state.EngineerModeStateMgrService;
-import a8k.app.engineer_service.type.EngineerWorkState;
+import a8k.app.service.engineer.state.EngineerModeStateMgrService;
+import a8k.app.service.engineer.type.EngineerWorkState;
 import a8k.app.iflytophald.type.protocol.A8kEcode;
 import a8k.app.service.statemgr.DeviceWorkStateMgrService;
 import a8k.app.service.statemgr.GStateMgrService;

src/main/java/a8k/app/service/mainctrl/AppDeviceMainFlowCtrlService.java

@@ -1,6 +1,6 @@
 package a8k.app.service.mainctrl;
 
-import a8k.app.engineer_service.qatest.EngineerModeActionCtrlService;
+import a8k.app.service.engineer.qatest.EngineerModeActionCtrlService;
 import a8k.app.iflytophald.type.protocol.A8kEcode;
 import a8k.app.service.statemgr.AppFlagStateMgr;
 import a8k.app.service.statemgr.DeviceWorkStateMgrService;

src/main/java/a8k/app/service/mainctrl/MainFlowCtrlScheduler.java

@@ -1,8 +1,8 @@
 package a8k.app.service.mainctrl;
 
 import a8k.OS;
-import a8k.app.engineer_service.state.EngineerModeStateMgrService;
-import a8k.app.engineer_service.type.EngineerWorkState;
+import a8k.app.service.engineer.state.EngineerModeStateMgrService;
+import a8k.app.service.engineer.type.EngineerWorkState;
 import a8k.app.service.ctrlmodule.TipOperationCtrlModule;
 import a8k.app.service.lowerctrl.HbotMoveExCtrlService;
 import a8k.app.service.lowerctrl.OptScanModuleLowerCtrlService;

src/main/java/a8k/app/service/module/InFeedingCtrlModule.java

@@ -2,8 +2,8 @@ package a8k.app.service.module;
 
 import a8k.OS;
 import a8k.app.dao.type.db.ReactionRecord;
-import a8k.app.engineer_service.state.TubeholderExSettingMgr;
-import a8k.app.engineer_service.type.A8kCmdRunnable;
+import a8k.app.service.engineer.state.TubeholderExSettingMgr;
+import a8k.app.service.engineer.type.A8kCmdRunnable;
 import a8k.app.factory.AppErrorFactory;
 import a8k.app.iflytophald.driver.InputDetectDriver;
 import a8k.app.iflytophald.type.protocol.A8kEcode;

src/main/java/a8k/app/service/module/IncubationPlateCtrlModule.java

@@ -1,7 +1,7 @@
 package a8k.app.service.module;
 
 import a8k.OS;
-import a8k.app.engineer_service.type.A8kCmdRunnable;
+import a8k.app.service.engineer.type.A8kCmdRunnable;
 import a8k.app.factory.AppErrorFactory;
 import a8k.app.service.lowerctrl.OptScanModuleLowerCtrlService;
 import a8k.app.service.lowerctrl.PlateBoxCtrlService;

src/main/java/a8k/app/service/module/OptScanCtrlModule.java

@@ -2,7 +2,7 @@ package a8k.app.service.module;
 
 import a8k.OS;
 import a8k.app.dao.type.db.ReactionRecord;
-import a8k.app.engineer_service.type.A8kCmdRunnable;
+import a8k.app.service.engineer.type.A8kCmdRunnable;
 import a8k.app.factory.AppErrorFactory;
 import a8k.app.factory.FakeReactionRecordFactory;
 import a8k.app.optalgo.A8kPeakAnalyzer;

src/main/java/a8k/app/service/module/SamplePreProcessModule.java

@@ -3,7 +3,7 @@ package a8k.app.service.module;
 import a8k.OS;
 import a8k.app.dao.type.combination.ProjBuildInInfo;
 import a8k.app.dao.type.db.ReactionRecord;
-import a8k.app.engineer_service.type.A8kCmdRunnable;
+import a8k.app.service.engineer.type.A8kCmdRunnable;
 import a8k.app.factory.AppErrorFactory;
 import a8k.app.service.ctrlmodule.TipOperationCtrlModule;
 import a8k.app.service.lowerctrl.*;

src/main/java/a8k/extui/page/extapp/profession_test/ExperimentConsistencyTestingPage.java

@@ -1,13 +1,13 @@
 package a8k.extui.page.extapp.profession_test;
 
 
-import a8k.app.engineer_service.qatest.EngineerModeActionCtrlService;
-import a8k.app.engineer_service.qatest.ExperimentConsistencyTestingService;
-import a8k.app.engineer_service.state.EngineerModeStateMgrService;
-import a8k.app.engineer_service.state.TubeholderExSettingMgr;
-import a8k.app.engineer_service.type.EngineerModeState;
-import a8k.app.engineer_service.type.TubeExConfig;
-import a8k.app.engineer_service.type.TubeHolderExConfig;
+import a8k.app.service.engineer.qatest.EngineerModeActionCtrlService;
+import a8k.app.service.engineer.qatest.ExperimentConsistencyTestingService;
+import a8k.app.service.engineer.state.EngineerModeStateMgrService;
+import a8k.app.service.engineer.state.TubeholderExSettingMgr;
+import a8k.app.service.engineer.type.EngineerModeState;
+import a8k.app.service.engineer.type.TubeExConfig;
+import a8k.app.service.engineer.type.TubeHolderExConfig;
 import a8k.app.type.exception.AppException;
 import a8k.extui.mgr.ExtApiPageMgr;
 import a8k.extui.type.ExtApiStatu;

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

@@ -1,6 +1,6 @@
 package a8k.extui.page.extapp.profession_test;
 
-import a8k.app.engineer_service.qatest.LiquidAbsorptionAndDistributionTestService;
+import a8k.app.service.engineer.qatest.LiquidAbsorptionAndDistributionTestService;
 import a8k.app.type.exception.AppException;
 import a8k.extui.mgr.ExtApiPageMgr;
 import a8k.extui.type.ExtUIPageCfg;