diff --git a/app.db b/app.db index 078994e..dba089e 100644 Binary files a/app.db and b/app.db differ diff --git a/src/main/java/a8k/SpringBootBeanUtil.java b/src/main/java/a8k/SpringBootBeanUtil.java index 5043e6b..27369e9 100644 --- a/src/main/java/a8k/SpringBootBeanUtil.java +++ b/src/main/java/a8k/SpringBootBeanUtil.java @@ -18,9 +18,6 @@ public class SpringBootBeanUtil implements ApplicationContextAware { if (SpringBootBeanUtil.applicationContext == null) { SpringBootBeanUtil.applicationContext = applicationContext; } - System.out.println("========ApplicationContext配置成功========"); - System.out.println("========在普通类可以通过调用SpringUtils.getAppContext()获取applicationContext对象========"); - System.out.println("========applicationContext=" + SpringBootBeanUtil.applicationContext + "========"); } /** diff --git a/src/main/java/a8k/extapi_controler/ExtApiControler.java b/src/main/java/a8k/extapi_controler/ExtApiControler.java index fad1538..523ddba 100644 --- a/src/main/java/a8k/extapi_controler/ExtApiControler.java +++ b/src/main/java/a8k/extapi_controler/ExtApiControler.java @@ -2,7 +2,7 @@ package a8k.extapi_controler; import a8k.extapi_controler.utils.*; import a8k.type.appret.AppRet; -import a8k.service.apps.dbservice.HardwareServiceSetting; +import a8k.service.db.HardwareServiceSetting; import a8k.utils.*; import com.iflytop.uf.UfApplication; import com.iflytop.uf.util.UfClassHelper; diff --git a/src/main/java/a8k/extapi_controler/utils/EnginnerParamReader.java b/src/main/java/a8k/extapi_controler/utils/EnginnerParamReader.java index 627fbd6..0f0a828 100644 --- a/src/main/java/a8k/extapi_controler/utils/EnginnerParamReader.java +++ b/src/main/java/a8k/extapi_controler/utils/EnginnerParamReader.java @@ -1,6 +1,6 @@ package a8k.extapi_controler.utils; -import a8k.service.apps.dbservice.HardwareServiceSetting; +import a8k.service.db.HardwareServiceSetting; import a8k.type.exception.AppException; diff --git a/src/main/java/a8k/service/apps/appctrl/AppDeviceCtrlService.java b/src/main/java/a8k/service/app/appctrl/AppDeviceCtrlService.java similarity index 93% rename from src/main/java/a8k/service/apps/appctrl/AppDeviceCtrlService.java rename to src/main/java/a8k/service/app/appctrl/AppDeviceCtrlService.java index 16a044c..adc107d 100644 --- a/src/main/java/a8k/service/apps/appctrl/AppDeviceCtrlService.java +++ b/src/main/java/a8k/service/app/appctrl/AppDeviceCtrlService.java @@ -1,14 +1,14 @@ -package a8k.service.apps.appctrl; +package a8k.service.app.appctrl; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; import a8k.extapi_controler.utils.ExtApiFn; import a8k.extapi_controler.utils.ExtApiTab; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appstate.type.MainFlowCtrlState; -import a8k.service.apps.appstate.type.TubeHolder; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appstate.type.MainFlowCtrlState; +import a8k.service.app.appstate.type.TubeHolder; import a8k.type.ConsumableGroup; import a8k.type.checkpoint.CheckResult; -import a8k.service.apps.appstate.GStateService; +import a8k.service.app.appstate.GStateService; import a8k.type.exception.AppException; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/service/apps/appctrl/ConsumablesScanService.java b/src/main/java/a8k/service/app/appctrl/ConsumablesScanService.java similarity index 95% rename from src/main/java/a8k/service/apps/appctrl/ConsumablesScanService.java rename to src/main/java/a8k/service/app/appctrl/ConsumablesScanService.java index 9033a30..02f4070 100644 --- a/src/main/java/a8k/service/apps/appctrl/ConsumablesScanService.java +++ b/src/main/java/a8k/service/app/appctrl/ConsumablesScanService.java @@ -1,18 +1,18 @@ -package a8k.service.apps.appctrl; +package a8k.service.app.appctrl; import a8k.constant.AppConstant; import a8k.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.service.apps.appdata.AppProjInfoMgrService; -import a8k.service.apps.appstate.GStateService; -import a8k.service.apps.devicedriver.ctrl.ConsumablesScanCtrl; +import a8k.service.app.appdata.AppProjInfoMgrService; +import a8k.service.app.appstate.GStateService; +import a8k.service.app.devicedriver.ctrl.ConsumablesScanCtrl; import a8k.type.ConsumableGroup; import a8k.type.consumables.LarBSGroup; import a8k.type.consumables.LittBSGroup; import a8k.type.consumables.ReactionPlateGroup; import a8k.type.consumables.ScanResultState; import a8k.type.exception.AppException; -import a8k.type.projecttype.A8kReactionFlowType; -import a8k.type.projecttype.a8kidcard.A8kIdCardInfo; +import a8k.service.db.type.a8kidcard.zenum.A8kReactionFlowType; +import a8k.service.db.type.A8kIdCardInfo; import a8k.utils.ReactionPlate2DCode; import a8k.utils.ReactionPlate2DCodeParser; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/appctrl/DeviceInitCtrlService.java b/src/main/java/a8k/service/app/appctrl/DeviceInitCtrlService.java similarity index 98% rename from src/main/java/a8k/service/apps/appctrl/DeviceInitCtrlService.java rename to src/main/java/a8k/service/app/appctrl/DeviceInitCtrlService.java index 7d6e83d..1198782 100644 --- a/src/main/java/a8k/service/apps/appctrl/DeviceInitCtrlService.java +++ b/src/main/java/a8k/service/app/appctrl/DeviceInitCtrlService.java @@ -1,4 +1,4 @@ -package a8k.service.apps.appctrl; +package a8k.service.app.appctrl; import a8k.hardware.A8kCanBusService; import a8k.hardware.type.a8kcanprotocol.A8kEcode; @@ -7,7 +7,7 @@ import a8k.hardware.type.a8kcanprotocol.MId; import a8k.service.bases.ActionReactorService; import a8k.type.checkpoint.CheckResult; import a8k.type.checkpoint.Checkpoint; -import a8k.service.apps.appstate.GStateService; +import a8k.service.app.appstate.GStateService; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/appctrl/MainFlowCtrlService.java b/src/main/java/a8k/service/app/appctrl/MainFlowCtrlService.java similarity index 84% rename from src/main/java/a8k/service/apps/appctrl/MainFlowCtrlService.java rename to src/main/java/a8k/service/app/appctrl/MainFlowCtrlService.java index fc843e7..3102285 100644 --- a/src/main/java/a8k/service/apps/appctrl/MainFlowCtrlService.java +++ b/src/main/java/a8k/service/app/appctrl/MainFlowCtrlService.java @@ -1,14 +1,14 @@ -package a8k.service.apps.appctrl; - -import a8k.service.apps.appctrl.mainflowctrl.MainFlowCtrlScheduler; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kErrorContext; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appctrl.mainflowctrl.action.DO_STOP; -import a8k.service.apps.appstate.GStateService; -import a8k.service.apps.appstate.type.MainFlowCtrlState; -import a8k.service.apps.appstate.type.state.A8kWorkState; -import a8k.service.apps.appstate.type.state.TubeState; +package a8k.service.app.appctrl; + +import a8k.service.app.appctrl.mainflowctrl.MainFlowCtrlScheduler; +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kErrorContext; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appctrl.mainflowctrl.action.DO_STOP; +import a8k.service.app.appstate.GStateService; +import a8k.service.app.appstate.type.MainFlowCtrlState; +import a8k.service.app.appstate.type.state.A8kWorkState; +import a8k.service.app.appstate.type.state.TubeState; import a8k.SpringBootBeanUtil; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/appctrl/TubeSettingMgrService.java b/src/main/java/a8k/service/app/appctrl/TubeSettingMgrService.java similarity index 98% rename from src/main/java/a8k/service/apps/appctrl/TubeSettingMgrService.java rename to src/main/java/a8k/service/app/appctrl/TubeSettingMgrService.java index bd61609..ee5947d 100644 --- a/src/main/java/a8k/service/apps/appctrl/TubeSettingMgrService.java +++ b/src/main/java/a8k/service/app/appctrl/TubeSettingMgrService.java @@ -1,8 +1,8 @@ -package a8k.service.apps.appctrl; +package a8k.service.app.appctrl; import a8k.service.bases.AppEventBusService; import a8k.service.bases.appevent.AppTubeholderSettingUpdateEvent; -import a8k.service.apps.appstate.GStateService; +import a8k.service.app.appstate.GStateService; import a8k.extapi_controler.utils.ExtApiTab; import a8k.extapi_controler.utils.ExtApiFn; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/CondtionMgrService.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/CondtionMgrService.java similarity index 91% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/CondtionMgrService.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/CondtionMgrService.java index 45bd0fd..d6e8490 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/CondtionMgrService.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/CondtionMgrService.java @@ -1,14 +1,14 @@ -package a8k.service.apps.appctrl.mainflowctrl; +package a8k.service.app.appctrl.mainflowctrl; import a8k.hardware.A8kCanBusService; import a8k.hardware.type.a8kcanprotocol.IOId; -import a8k.service.apps.appstate.GStateService; -import a8k.service.apps.appstate.IncubationPlateMgrService; -import a8k.service.apps.appstate.OptScanModuleStateMgrService; -import a8k.service.apps.appstate.type.Tube; -import a8k.service.apps.appstate.type.state.A8kWorkState; -import a8k.service.apps.appstate.type.state.TubeHolderState; -import a8k.service.apps.appstate.type.state.TubeState; +import a8k.service.app.appstate.GStateService; +import a8k.service.app.appstate.IncubationPlateMgrService; +import a8k.service.app.appstate.OptScanModuleStateMgrService; +import a8k.service.app.appstate.type.Tube; +import a8k.service.app.appstate.type.state.A8kWorkState; +import a8k.service.app.appstate.type.state.TubeHolderState; +import a8k.service.app.appstate.type.state.TubeState; import jakarta.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/MainFlowCtrlScheduler.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/MainFlowCtrlScheduler.java similarity index 92% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/MainFlowCtrlScheduler.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/MainFlowCtrlScheduler.java index b44528d..23f260a 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/MainFlowCtrlScheduler.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/MainFlowCtrlScheduler.java @@ -1,16 +1,16 @@ -package a8k.service.apps.appctrl.mainflowctrl; +package a8k.service.app.appctrl.mainflowctrl; import a8k.OS; import a8k.service.bases.AppEventBusService; import a8k.service.bases.appevent.A8kEcodeContextListPromptEvent; import a8k.service.bases.appevent.DoA8kStepActionEvent; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kErrorContext; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appstate.GStateService; -import a8k.service.apps.appstate.ResourceMgrService; -import a8k.service.apps.appstate.type.MainFlowCtrlState; -import a8k.service.apps.appstate.type.state.A8kWorkState; +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kErrorContext; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appstate.GStateService; +import a8k.service.app.appstate.ResourceMgrService; +import a8k.service.app.appstate.type.MainFlowCtrlState; +import a8k.service.app.appstate.type.state.A8kWorkState; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_CLEAR_ERROR_BEFORE_WORK.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_CLEAR_ERROR_BEFORE_WORK.java similarity index 71% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_CLEAR_ERROR_BEFORE_WORK.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_CLEAR_ERROR_BEFORE_WORK.java index a7146f6..a28d733 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_CLEAR_ERROR_BEFORE_WORK.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_CLEAR_ERROR_BEFORE_WORK.java @@ -1,14 +1,14 @@ -package a8k.service.apps.appctrl.mainflowctrl.action; - -import a8k.service.apps.appctrl.mainflowctrl.CondtionMgrService; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appstate.GStateService; -import a8k.service.apps.appstate.IncubationPlateMgrService; -import a8k.service.apps.appstate.OptScanModuleStateMgrService; -import a8k.service.apps.appstate.resource.A8kPublicResourceType; -import a8k.service.apps.appstate.type.MainFlowCtrlState; -import a8k.service.apps.appstate.type.state.A8kWorkState; +package a8k.service.app.appctrl.mainflowctrl.action; + +import a8k.service.app.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appstate.GStateService; +import a8k.service.app.appstate.IncubationPlateMgrService; +import a8k.service.app.appstate.OptScanModuleStateMgrService; +import a8k.service.app.appstate.resource.A8kPublicResourceType; +import a8k.service.app.appstate.type.MainFlowCtrlState; +import a8k.service.app.appstate.type.state.A8kWorkState; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_PAUSE.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_PAUSE.java similarity index 71% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_PAUSE.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_PAUSE.java index 7aa9021..925161b 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_PAUSE.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_PAUSE.java @@ -1,11 +1,11 @@ -package a8k.service.apps.appctrl.mainflowctrl.action; - -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appstate.GStateService; -import a8k.service.apps.appstate.resource.A8kPublicResourceType; -import a8k.service.apps.appstate.type.MainFlowCtrlState; -import a8k.service.apps.appstate.type.state.A8kWorkState; +package a8k.service.app.appctrl.mainflowctrl.action; + +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appstate.GStateService; +import a8k.service.app.appstate.resource.A8kPublicResourceType; +import a8k.service.app.appstate.type.MainFlowCtrlState; +import a8k.service.app.appstate.type.state.A8kWorkState; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_PLATE.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_PLATE.java similarity index 73% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_PLATE.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_PLATE.java index e6eaa3f..4b0f292 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_PLATE.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_PLATE.java @@ -1,16 +1,16 @@ -package a8k.service.apps.appctrl.mainflowctrl.action; +package a8k.service.app.appctrl.mainflowctrl.action; import a8k.OS; -import a8k.service.apps.appctrl.mainflowctrl.CondtionMgrService; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appstate.GStateService; -import a8k.service.apps.appstate.IncubationPlateMgrService; -import a8k.service.apps.appstate.OptScanModuleStateMgrService; -import a8k.service.apps.appstate.resource.A8kPublicResourceType; -import a8k.service.apps.appstate.type.IncubationSubTank; -import a8k.service.apps.appstate.type.MainFlowCtrlState; -import a8k.service.apps.appstate.type.state.IncubationSubTankState; +import a8k.service.app.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appstate.GStateService; +import a8k.service.app.appstate.IncubationPlateMgrService; +import a8k.service.app.appstate.OptScanModuleStateMgrService; +import a8k.service.app.appstate.resource.A8kPublicResourceType; +import a8k.service.app.appstate.type.IncubationSubTank; +import a8k.service.app.appstate.type.MainFlowCtrlState; +import a8k.service.app.appstate.type.state.IncubationSubTankState; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_TUBE.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_TUBE.java similarity index 68% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_TUBE.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_TUBE.java index ed02e20..c9124d6 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_TUBE.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_TUBE.java @@ -1,18 +1,17 @@ -package a8k.service.apps.appctrl.mainflowctrl.action; +package a8k.service.app.appctrl.mainflowctrl.action; import a8k.OS; -import a8k.service.apps.appctrl.mainflowctrl.CondtionMgrService; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appstate.GStateService; -import a8k.service.apps.appstate.IncubationPlateMgrService; -import a8k.service.apps.appstate.OptScanModuleStateMgrService; -import a8k.service.apps.appstate.TubeStateMgrService; -import a8k.service.apps.appstate.TubeProcessStateMgrService; -import a8k.service.apps.appstate.resource.A8kPublicResourceType; -import a8k.service.apps.appstate.type.MainFlowCtrlState; -import a8k.service.apps.appstate.type.Tube; -import a8k.service.apps.appstate.type.state.TubeState; +import a8k.service.app.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appstate.GStateService; +import a8k.service.app.appstate.IncubationPlateMgrService; +import a8k.service.app.appstate.OptScanModuleStateMgrService; +import a8k.service.app.appstate.TubeStateMgrService; +import a8k.service.app.appstate.resource.A8kPublicResourceType; +import a8k.service.app.appstate.type.MainFlowCtrlState; +import a8k.service.app.appstate.type.Tube; +import a8k.service.app.appstate.type.state.TubeState; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_RESUME.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_RESUME.java similarity index 70% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_RESUME.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_RESUME.java index 55908ec..c15cbbe 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_RESUME.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_RESUME.java @@ -1,11 +1,11 @@ -package a8k.service.apps.appctrl.mainflowctrl.action; - -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appstate.GStateService; -import a8k.service.apps.appstate.resource.A8kPublicResourceType; -import a8k.service.apps.appstate.type.MainFlowCtrlState; -import a8k.service.apps.appstate.type.state.A8kWorkState; +package a8k.service.app.appctrl.mainflowctrl.action; + +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appstate.GStateService; +import a8k.service.app.appstate.resource.A8kPublicResourceType; +import a8k.service.app.appstate.type.MainFlowCtrlState; +import a8k.service.app.appstate.type.state.A8kWorkState; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_START.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_START.java similarity index 70% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_START.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_START.java index 0b3e917..e95e77a 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_START.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_START.java @@ -1,12 +1,12 @@ -package a8k.service.apps.appctrl.mainflowctrl.action; - -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appstate.GStateService; -import a8k.service.apps.appstate.resource.A8kPublicResourceType; -import a8k.service.apps.appstate.type.MainFlowCtrlState; -import a8k.service.apps.appstate.type.state.A8kWorkState; -import a8k.service.apps.devicedriver.ctrl.SampleScanTransportCtrl; +package a8k.service.app.appctrl.mainflowctrl.action; + +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appstate.GStateService; +import a8k.service.app.appstate.resource.A8kPublicResourceType; +import a8k.service.app.appstate.type.MainFlowCtrlState; +import a8k.service.app.appstate.type.state.A8kWorkState; +import a8k.service.app.devicedriver.ctrl.SampleScanTransportCtrl; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_STOP.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_STOP.java similarity index 71% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_STOP.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_STOP.java index 2f32619..6ac80c0 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_STOP.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_STOP.java @@ -1,11 +1,11 @@ -package a8k.service.apps.appctrl.mainflowctrl.action; - -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appstate.GStateService; -import a8k.service.apps.appstate.resource.A8kPublicResourceType; -import a8k.service.apps.appstate.type.MainFlowCtrlState; -import a8k.service.apps.appstate.type.state.A8kWorkState; +package a8k.service.app.appctrl.mainflowctrl.action; + +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appstate.GStateService; +import a8k.service.app.appstate.resource.A8kPublicResourceType; +import a8k.service.app.appstate.type.MainFlowCtrlState; +import a8k.service.app.appstate.type.state.A8kWorkState; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/PLATE_OPT_SCAN.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/PLATE_OPT_SCAN.java similarity index 73% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/PLATE_OPT_SCAN.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/action/PLATE_OPT_SCAN.java index 7fa5572..854ea89 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/PLATE_OPT_SCAN.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/PLATE_OPT_SCAN.java @@ -1,16 +1,16 @@ -package a8k.service.apps.appctrl.mainflowctrl.action; +package a8k.service.app.appctrl.mainflowctrl.action; -import a8k.service.apps.appctrl.mainflowctrl.CondtionMgrService; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appdata.AppReactionResultMgrService; -import a8k.service.apps.appstate.GStateService; -import a8k.service.apps.appstate.IncubationPlateMgrService; -import a8k.service.apps.appstate.OptScanModuleStateMgrService; -import a8k.service.apps.appstate.TubeStateMgrService; +import a8k.service.app.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appdata.AppReactionResultMgrService; +import a8k.service.app.appstate.GStateService; +import a8k.service.app.appstate.IncubationPlateMgrService; +import a8k.service.app.appstate.OptScanModuleStateMgrService; +import a8k.service.app.appstate.TubeStateMgrService; -import a8k.service.apps.appstate.resource.A8kPublicResourceType; -import a8k.service.apps.appstate.type.MainFlowCtrlState; +import a8k.service.app.appstate.resource.A8kPublicResourceType; +import a8k.service.app.appstate.type.MainFlowCtrlState; import a8k.type.ReactionResult; import a8k.type.exception.AppException; import a8k.type.reaction_result_type.ReactionResultStatus; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java similarity index 71% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java index 0987bed..6547882 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java @@ -1,17 +1,17 @@ -package a8k.service.apps.appctrl.mainflowctrl.action; +package a8k.service.app.appctrl.mainflowctrl.action; import a8k.OS; -import a8k.service.apps.appctrl.mainflowctrl.CondtionMgrService; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appstate.GStateService; -import a8k.service.apps.appstate.IncubationPlateMgrService; -import a8k.service.apps.appstate.OptScanModuleStateMgrService; -import a8k.service.apps.appstate.TubeStateMgrService; -import a8k.service.apps.appstate.resource.A8kPublicResourceType; -import a8k.service.apps.appstate.type.IncubationSubTank; -import a8k.service.apps.appstate.type.MainFlowCtrlState; -import a8k.service.apps.appstate.type.state.IncubationSubTankState; +import a8k.service.app.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appstate.GStateService; +import a8k.service.app.appstate.IncubationPlateMgrService; +import a8k.service.app.appstate.OptScanModuleStateMgrService; +import a8k.service.app.appstate.TubeStateMgrService; +import a8k.service.app.appstate.resource.A8kPublicResourceType; +import a8k.service.app.appstate.type.IncubationSubTank; +import a8k.service.app.appstate.type.MainFlowCtrlState; +import a8k.service.app.appstate.type.state.IncubationSubTankState; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java similarity index 90% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java index b121406..2fdc63a 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java @@ -1,20 +1,20 @@ -package a8k.service.apps.appctrl.mainflowctrl.action; +package a8k.service.app.appctrl.mainflowctrl.action; import a8k.service.bases.AppEventBusService; import a8k.service.bases.appevent.AppWarningNotifyEvent; import a8k.hardware.A8kCanBusService; import a8k.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.service.apps.appctrl.mainflowctrl.CondtionMgrService; -import a8k.service.apps.appctrl.TubeSettingMgrService; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appstate.GStateService; -import a8k.service.apps.appstate.TubeStateMgrService; -import a8k.service.apps.appstate.resource.A8kPublicResourceType; -import a8k.service.apps.appstate.type.TubeHolder; -import a8k.service.apps.appstate.type.state.TubeHolderState; -import a8k.service.apps.appstate.type.state.TubeState; -import a8k.service.apps.devicedriver.ctrl.SampleScanTransportCtrl; +import a8k.service.app.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.app.appctrl.TubeSettingMgrService; +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appstate.GStateService; +import a8k.service.app.appstate.TubeStateMgrService; +import a8k.service.app.appstate.resource.A8kPublicResourceType; +import a8k.service.app.appstate.type.TubeHolder; +import a8k.service.app.appstate.type.state.TubeHolderState; +import a8k.service.app.appstate.type.state.TubeState; +import a8k.service.app.devicedriver.ctrl.SampleScanTransportCtrl; import a8k.type.exception.AppException; import a8k.type.tube_setting.TubeHolderSetting; import a8k.type.type.A8kTubeHolderType; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java similarity index 79% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java index 2cf5022..658cdd5 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java @@ -1,15 +1,15 @@ -package a8k.service.apps.appctrl.mainflowctrl.action; +package a8k.service.app.appctrl.mainflowctrl.action; -import a8k.service.apps.appctrl.mainflowctrl.CondtionMgrService; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appstate.*; -import a8k.service.apps.appstate.resource.A8kPublicResourceType; -import a8k.service.apps.appstate.type.MainFlowCtrlState; -import a8k.service.apps.appstate.type.TubeHolder; -import a8k.service.apps.appstate.type.Tube; -import a8k.service.apps.appstate.type.state.TubeState; -import a8k.service.apps.devicedriver.ctrl.SampleScanTransportCtrl; +import a8k.service.app.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appstate.*; +import a8k.service.app.appstate.resource.A8kPublicResourceType; +import a8k.service.app.appstate.type.MainFlowCtrlState; +import a8k.service.app.appstate.type.TubeHolder; +import a8k.service.app.appstate.type.Tube; +import a8k.service.app.appstate.type.state.TubeState; +import a8k.service.app.devicedriver.ctrl.SampleScanTransportCtrl; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java similarity index 69% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java index ac18373..0776dec 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java @@ -1,21 +1,22 @@ -package a8k.service.apps.appctrl.mainflowctrl.action; +package a8k.service.app.appctrl.mainflowctrl.action; +import a8k.service.db.type.A8kProjectInfo; import a8k.utils.AppExceptionBuilder; import a8k.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.service.apps.appctrl.mainflowctrl.CondtionMgrService; -import a8k.service.apps.appdata.AppProjInfoMgrService; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appstate.*; -import a8k.service.apps.appstate.resource.A8kPublicResourceType; -import a8k.service.apps.appstate.type.MainFlowCtrlState; -import a8k.service.apps.appstate.type.Tube; +import a8k.service.app.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.app.appdata.AppProjInfoMgrService; +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appstate.*; +import a8k.service.app.appstate.resource.A8kPublicResourceType; +import a8k.service.app.appstate.type.MainFlowCtrlState; +import a8k.service.app.appstate.type.Tube; import a8k.type.Consumable; import a8k.type.IncubatorPos; import a8k.type.TipPos; import a8k.type.exception.AppException; -import a8k.type.projecttype.A8kReactionFlowType; -import a8k.type.projecttype.a8kidcard.A8kIdCardInfo; +import a8k.service.db.type.a8kidcard.zenum.A8kReactionFlowType; +import a8k.service.db.type.A8kIdCardInfo; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import org.slf4j.Logger; @@ -41,19 +42,19 @@ public class SEQ3_APPLAY_RESOURCE extends A8kStepAction { } @Resource - GStateService gstate; + GStateService gstate; @Resource - ConsumablesMgrService consumablesMgrService; //耗材管理 + ConsumablesMgrService consumablesMgrService; //耗材管理 @Resource - AppExceptionBuilder ebuilder; //异常构造器 + AppExceptionBuilder ebuilder; //异常构造器 @Resource - IncubationPlateMgrService incubationPlateMgrService; //孵育盘管理 + IncubationPlateMgrService incubationPlateMgrService; //孵育盘管理 @Resource - AppProjInfoMgrService appProjInfoMgrService; //项目信息管理 + AppProjInfoMgrService appProjInfoMgrService; //项目信息管理 @Resource - TubeStateMgrService tubeStateMgrService; + TubeStateMgrService tubeStateMgrService; @Resource - CondtionMgrService cms; + CondtionMgrService cms; MainFlowCtrlState state; @@ -104,10 +105,17 @@ public class SEQ3_APPLAY_RESOURCE extends A8kStepAction { assert idcardInfo != null; a8kIdCardInfo.add(idcardInfo); } + + List projInfos = new ArrayList<>(); + for (Consumable consumable : consumables) { + A8kProjectInfo projInfo = appProjInfoMgrService.getProjInfoByProjIndex(consumable.projIndex); + assert projInfo != null; + projInfos.add(projInfo); + } //申请tip头 List> tipPos = new ArrayList<>(); for (int i = 0; i < projs.size(); i++) { - List tips = consumablesMgrService.takeTip(a8kIdCardInfo.get(i).reactionFlowType); + List tips = consumablesMgrService.takeTip(projInfos.get(i).reactionFlowType); assert tips != null; tipPos.add(tips); } diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ4_PRE_PROCESS.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ4_PRE_PROCESS.java similarity index 87% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ4_PRE_PROCESS.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ4_PRE_PROCESS.java index b8ff6d2..8bf2324 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ4_PRE_PROCESS.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ4_PRE_PROCESS.java @@ -1,20 +1,20 @@ -package a8k.service.apps.appctrl.mainflowctrl.action; +package a8k.service.app.appctrl.mainflowctrl.action; import a8k.OS; -import a8k.service.apps.appctrl.mainflowctrl.CondtionMgrService; -import a8k.service.apps.appdata.AppProjInfoMgrService; +import a8k.service.app.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.app.appdata.AppProjInfoMgrService; import a8k.utils.AppExceptionBuilder; import a8k.service.bases.AppEventBusService; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appstate.*; -import a8k.service.apps.appstate.resource.A8kPublicResourceType; -import a8k.service.apps.appstate.type.Tube; -import a8k.service.apps.appstate.type.state.TubeState; -import a8k.service.apps.devicedriver.ctrl.HbotControlService; -import a8k.service.apps.devicedriver.ctrl.ReactionPlatesTransmitCtrl; -import a8k.service.apps.devicedriver.ctrl.SampleScanTransportCtrl; -import a8k.service.apps.devicedriver.ctrl.SamplesPreProcesCtrl; +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appstate.*; +import a8k.service.app.appstate.resource.A8kPublicResourceType; +import a8k.service.app.appstate.type.Tube; +import a8k.service.app.appstate.type.state.TubeState; +import a8k.service.app.devicedriver.ctrl.HbotControlService; +import a8k.service.app.devicedriver.ctrl.ReactionPlatesTransmitCtrl; +import a8k.service.app.devicedriver.ctrl.SampleScanTransportCtrl; +import a8k.service.app.devicedriver.ctrl.SamplesPreProcesCtrl; import a8k.type.ecode.AppError; import a8k.type.exception.AppException; import a8k.utils.ZFnCall; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ5_PROCESS.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ5_PROCESS.java similarity index 77% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ5_PROCESS.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ5_PROCESS.java index 57c08ad..3536f83 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ5_PROCESS.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ5_PROCESS.java @@ -1,15 +1,15 @@ -package a8k.service.apps.appctrl.mainflowctrl.action; +package a8k.service.app.appctrl.mainflowctrl.action; import a8k.OS; import a8k.utils.AppExceptionBuilder; -import a8k.service.apps.appctrl.mainflowctrl.CondtionMgrService; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appstate.*; -import a8k.service.apps.appstate.resource.A8kPublicResourceType; -import a8k.service.apps.appstate.type.MainFlowCtrlState; -import a8k.service.apps.appstate.type.Tube; -import a8k.service.apps.appstate.type.state.TubeState; +import a8k.service.app.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appstate.*; +import a8k.service.app.appstate.resource.A8kPublicResourceType; +import a8k.service.app.appstate.type.MainFlowCtrlState; +import a8k.service.app.appstate.type.Tube; +import a8k.service.app.appstate.type.state.TubeState; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ6_POST_PROCESS.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ6_POST_PROCESS.java similarity index 78% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ6_POST_PROCESS.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ6_POST_PROCESS.java index 6039268..bf26c60 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ6_POST_PROCESS.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ6_POST_PROCESS.java @@ -1,15 +1,15 @@ -package a8k.service.apps.appctrl.mainflowctrl.action; +package a8k.service.app.appctrl.mainflowctrl.action; import a8k.OS; import a8k.utils.AppExceptionBuilder; -import a8k.service.apps.appctrl.mainflowctrl.CondtionMgrService; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appstate.*; -import a8k.service.apps.appstate.resource.A8kPublicResourceType; -import a8k.service.apps.appstate.type.MainFlowCtrlState; -import a8k.service.apps.appstate.type.Tube; -import a8k.service.apps.appstate.type.state.TubeState; +import a8k.service.app.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appstate.*; +import a8k.service.app.appstate.resource.A8kPublicResourceType; +import a8k.service.app.appstate.type.MainFlowCtrlState; +import a8k.service.app.appstate.type.Tube; +import a8k.service.app.appstate.type.state.TubeState; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ7_EJECT_TUBEHOLDER.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ7_EJECT_TUBEHOLDER.java similarity index 70% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ7_EJECT_TUBEHOLDER.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ7_EJECT_TUBEHOLDER.java index eec4320..87d791a 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ7_EJECT_TUBEHOLDER.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ7_EJECT_TUBEHOLDER.java @@ -1,13 +1,13 @@ -package a8k.service.apps.appctrl.mainflowctrl.action; - -import a8k.service.apps.appctrl.mainflowctrl.CondtionMgrService; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.service.apps.appstate.GStateService; -import a8k.service.apps.appstate.type.MainFlowCtrlState; -import a8k.service.apps.appstate.resource.A8kPublicResourceType; -import a8k.service.apps.appstate.type.state.TubeHolderState; -import a8k.service.apps.devicedriver.ctrl.SampleScanTransportCtrl; +package a8k.service.app.appctrl.mainflowctrl.action; + +import a8k.service.app.appctrl.mainflowctrl.CondtionMgrService; +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction; +import a8k.service.app.appstate.GStateService; +import a8k.service.app.appstate.type.MainFlowCtrlState; +import a8k.service.app.appstate.resource.A8kPublicResourceType; +import a8k.service.app.appstate.type.state.TubeHolderState; +import a8k.service.app.devicedriver.ctrl.SampleScanTransportCtrl; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/base/A8kActionStepType.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/base/A8kActionStepType.java similarity index 91% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/base/A8kActionStepType.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/base/A8kActionStepType.java index 8c7ae3e..9ea3a69 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/base/A8kActionStepType.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/base/A8kActionStepType.java @@ -1,4 +1,4 @@ -package a8k.service.apps.appctrl.mainflowctrl.base; +package a8k.service.app.appctrl.mainflowctrl.base; public enum A8kActionStepType { DO_START,//启动 diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/base/A8kErrorContext.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/base/A8kErrorContext.java similarity index 90% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/base/A8kErrorContext.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/base/A8kErrorContext.java index d1603ac..7e01827 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/base/A8kErrorContext.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/base/A8kErrorContext.java @@ -1,4 +1,4 @@ -package a8k.service.apps.appctrl.mainflowctrl.base; +package a8k.service.app.appctrl.mainflowctrl.base; import a8k.type.ecode.AppError; diff --git a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/base/A8kStepAction.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/base/A8kStepAction.java similarity index 83% rename from src/main/java/a8k/service/apps/appctrl/mainflowctrl/base/A8kStepAction.java rename to src/main/java/a8k/service/app/appctrl/mainflowctrl/base/A8kStepAction.java index 21fb432..579a26e 100644 --- a/src/main/java/a8k/service/apps/appctrl/mainflowctrl/base/A8kStepAction.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/base/A8kStepAction.java @@ -1,7 +1,7 @@ -package a8k.service.apps.appctrl.mainflowctrl.base; +package a8k.service.app.appctrl.mainflowctrl.base; -import a8k.service.apps.appstate.resource.A8kPublicResourceType; +import a8k.service.app.appstate.resource.A8kPublicResourceType; import a8k.type.exception.AppException; import java.util.List; diff --git a/src/main/java/a8k/service/apps/appdata/AppProjInfoMgrService.java b/src/main/java/a8k/service/app/appdata/AppProjInfoMgrService.java similarity index 89% rename from src/main/java/a8k/service/apps/appdata/AppProjInfoMgrService.java rename to src/main/java/a8k/service/app/appdata/AppProjInfoMgrService.java index a753758..f28a4ed 100644 --- a/src/main/java/a8k/service/apps/appdata/AppProjInfoMgrService.java +++ b/src/main/java/a8k/service/app/appdata/AppProjInfoMgrService.java @@ -1,18 +1,20 @@ -package a8k.service.apps.appdata; +package a8k.service.app.appdata; import a8k.service.bases.appevent.*; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; -import a8k.service.apps.dbservice.A8kProjIdCardDBService; +import a8k.service.db.A8kProjIdCardDBService; import a8k.extapi_controler.utils.ExtApiFn; import a8k.extapi_controler.utils.ExtApiTab; import a8k.hardware.type.regindex.RegIndex; +import a8k.service.db.A8kProjInfoDBService; +import a8k.service.db.type.A8kProjectInfo; import a8k.type.exception.AppException; import a8k.service.bases.AppEventBusService; import a8k.hardware.A8kCanBusService; import a8k.hardware.type.a8kcanprotocol.*; -import a8k.type.projecttype.A8kReactionFlowType; -import a8k.type.projecttype.a8kidcard.A8kIdCardInfo; +import a8k.service.db.type.a8kidcard.zenum.A8kReactionFlowType; +import a8k.service.db.type.A8kIdCardInfo; import a8k.utils.A8kIdCardDataParser; import a8k.utils.wq.ZWorkQueue; import jakarta.annotation.PostConstruct; @@ -42,6 +44,9 @@ public class AppProjInfoMgrService { @Resource A8kProjIdCardDBService a8kProjIdCardDBService; + @Resource + A8kProjInfoDBService a8kProjInfoDBService; + // //预设项目信息 A8kIdCardInfo mountedIdCardInfo; @@ -127,6 +132,10 @@ public class AppProjInfoMgrService { return a8kProjIdCardDBService.getIdCard(lotid); } + public A8kProjectInfo getProjInfoByProjIndex(Integer projIndex) { + return a8kProjInfoDBService.findByProjIndex(projIndex); + } + public String getProjNameByLotId(Integer projIndex) { var idCard = a8kProjIdCardDBService.getProjInfoByProjIndex(projIndex); if (idCard == null) { @@ -141,7 +150,10 @@ public class AppProjInfoMgrService { * @return 流程 */ public A8kReactionFlowType getA8kReactionFlowTypeByProjIndex(Integer projIndex) { - var projInfo = a8kProjIdCardDBService.getProjInfoByProjIndex(projIndex); + var projInfo = a8kProjInfoDBService.findByProjIndex(projIndex); + if (projInfo == null) { + return null; + } return projInfo.reactionFlowType; } diff --git a/src/main/java/a8k/service/apps/appdata/AppReactionResultMgrService.java b/src/main/java/a8k/service/app/appdata/AppReactionResultMgrService.java similarity index 89% rename from src/main/java/a8k/service/apps/appdata/AppReactionResultMgrService.java rename to src/main/java/a8k/service/app/appdata/AppReactionResultMgrService.java index 8b5d619..0f64659 100644 --- a/src/main/java/a8k/service/apps/appdata/AppReactionResultMgrService.java +++ b/src/main/java/a8k/service/app/appdata/AppReactionResultMgrService.java @@ -1,14 +1,14 @@ -package a8k.service.apps.appdata; +package a8k.service.app.appdata; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; import a8k.extapi_controler.utils.ExtApiFn; import a8k.extapi_controler.utils.ExtApiTab; -import a8k.service.apps.dbservice.ReactionRecordDBService; -import a8k.service.apps.dbservice.type.ReactionResultRecord; -import a8k.service.apps.appstate.GStateService; -import a8k.service.apps.appstate.TubeStateMgrService; -import a8k.service.apps.appstate.type.ProjProcessContext; -import a8k.service.apps.appstate.type.TubeProcessContext; +import a8k.service.db.ReactionRecordDBService; +import a8k.service.db.type.ReactionResultRecord; +import a8k.service.app.appstate.GStateService; +import a8k.service.app.appstate.TubeStateMgrService; +import a8k.service.app.appstate.type.ProjProcessContext; +import a8k.service.app.appstate.type.TubeProcessContext; import a8k.type.ReactionResult; import a8k.utils.ZJsonHelper; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/service/apps/appdata/AppUserMgrService.java b/src/main/java/a8k/service/app/appdata/AppUserMgrService.java similarity index 95% rename from src/main/java/a8k/service/apps/appdata/AppUserMgrService.java rename to src/main/java/a8k/service/app/appdata/AppUserMgrService.java index 20af87b..4681f22 100644 --- a/src/main/java/a8k/service/apps/appdata/AppUserMgrService.java +++ b/src/main/java/a8k/service/app/appdata/AppUserMgrService.java @@ -1,10 +1,10 @@ -package a8k.service.apps.appdata; +package a8k.service.app.appdata; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; import a8k.extapi_controler.utils.ExtApiTab; -import a8k.service.apps.dbservice.AppUsrDBService; -import a8k.service.apps.dbservice.type.AppUser; -import a8k.service.apps.dbservice.type.UsrRole; +import a8k.service.db.AppUsrDBService; +import a8k.service.db.type.AppUser; +import a8k.service.db.type.UsrRole; import a8k.extapi_controler.utils.ExtApiFn; import a8k.hardware.type.a8kcanprotocol.A8kEcode; import a8k.type.exception.AppException; diff --git a/src/main/java/a8k/service/apps/appdata/UtilsProjectColorAllocer.java b/src/main/java/a8k/service/app/appdata/UtilsProjectColorAllocer.java similarity index 96% rename from src/main/java/a8k/service/apps/appdata/UtilsProjectColorAllocer.java rename to src/main/java/a8k/service/app/appdata/UtilsProjectColorAllocer.java index 6c772a6..8577ea1 100644 --- a/src/main/java/a8k/service/apps/appdata/UtilsProjectColorAllocer.java +++ b/src/main/java/a8k/service/app/appdata/UtilsProjectColorAllocer.java @@ -1,4 +1,4 @@ -package a8k.service.apps.appdata; +package a8k.service.app.appdata; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; import a8k.extapi_controler.utils.ExtApiFn; diff --git a/src/main/java/a8k/service/apps/appsetting/AppSettingsMgr.java b/src/main/java/a8k/service/app/appsetting/AppSettingsMgr.java similarity index 91% rename from src/main/java/a8k/service/apps/appsetting/AppSettingsMgr.java rename to src/main/java/a8k/service/app/appsetting/AppSettingsMgr.java index a678b7c..40489b4 100644 --- a/src/main/java/a8k/service/apps/appsetting/AppSettingsMgr.java +++ b/src/main/java/a8k/service/app/appsetting/AppSettingsMgr.java @@ -1,15 +1,15 @@ -package a8k.service.apps.appsetting; +package a8k.service.app.appsetting; -import a8k.service.apps.dbservice.AppSettingDBService; -import a8k.service.apps.dbservice.type.AppSetting; -import a8k.service.apps.dbservice.type.appsetting.AppSettingType; -import a8k.service.apps.dbservice.type.appsetting.settingenum.*; +import a8k.service.db.AppSettingDBService; +import a8k.service.db.type.AppSetting; +import a8k.service.db.type.appsetting.AppSettingType; +import a8k.service.db.type.appsetting.settingenum.*; import a8k.extapi_controler.utils.ExtApiTab; import a8k.extapi_controler.utils.ExtApiFn; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; -import a8k.service.apps.dbservice.type.appsetting.AppSettingTab; -import a8k.service.apps.dbservice.type.appsetting.AppSettingName; +import a8k.service.db.type.appsetting.AppSettingTab; +import a8k.service.db.type.appsetting.AppSettingName; import a8k.hardware.type.a8kcanprotocol.A8kEcode; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/service/apps/appstate/ConsumablesMgrService.java b/src/main/java/a8k/service/app/appstate/ConsumablesMgrService.java similarity index 98% rename from src/main/java/a8k/service/apps/appstate/ConsumablesMgrService.java rename to src/main/java/a8k/service/app/appstate/ConsumablesMgrService.java index f51c426..257854a 100644 --- a/src/main/java/a8k/service/apps/appstate/ConsumablesMgrService.java +++ b/src/main/java/a8k/service/app/appstate/ConsumablesMgrService.java @@ -1,4 +1,4 @@ -package a8k.service.apps.appstate; +package a8k.service.app.appstate; import a8k.constant.AppConstant; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; @@ -7,7 +7,7 @@ import a8k.extapi_controler.utils.ExtApiTab; import a8k.type.Consumable; import a8k.type.ConsumableGroup; import a8k.type.TipPos; -import a8k.type.projecttype.A8kReactionFlowType; +import a8k.service.db.type.a8kidcard.zenum.A8kReactionFlowType; import a8k.type.type.TipGroup; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/service/apps/appstate/EmergencySamplePosStateMgrService.java b/src/main/java/a8k/service/app/appstate/EmergencySamplePosStateMgrService.java similarity index 91% rename from src/main/java/a8k/service/apps/appstate/EmergencySamplePosStateMgrService.java rename to src/main/java/a8k/service/app/appstate/EmergencySamplePosStateMgrService.java index 2052e20..3f8570f 100644 --- a/src/main/java/a8k/service/apps/appstate/EmergencySamplePosStateMgrService.java +++ b/src/main/java/a8k/service/app/appstate/EmergencySamplePosStateMgrService.java @@ -1,13 +1,13 @@ -package a8k.service.apps.appstate; +package a8k.service.app.appstate; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; import a8k.extapi_controler.utils.EnginnerPageActionParam; import a8k.extapi_controler.utils.ExtApiFn; import a8k.extapi_controler.utils.ExtApiTab; import a8k.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.service.apps.appstate.type.EmergencyTubePos; -import a8k.service.apps.appstate.type.Tube; -import a8k.service.apps.appstate.type.state.TubeState; +import a8k.service.app.appstate.type.EmergencyTubePos; +import a8k.service.app.appstate.type.Tube; +import a8k.service.app.appstate.type.state.TubeState; import a8k.type.exception.AppException; import a8k.type.type.BloodType; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/appstate/GStateService.java b/src/main/java/a8k/service/app/appstate/GStateService.java similarity index 91% rename from src/main/java/a8k/service/apps/appstate/GStateService.java rename to src/main/java/a8k/service/app/appstate/GStateService.java index 518fa21..08c1d06 100644 --- a/src/main/java/a8k/service/apps/appstate/GStateService.java +++ b/src/main/java/a8k/service/app/appstate/GStateService.java @@ -1,10 +1,10 @@ -package a8k.service.apps.appstate; +package a8k.service.app.appstate; import a8k.constant.AppConstant; import a8k.type.consumables.ConsumableState; -import a8k.service.apps.appstate.type.*; -import a8k.service.apps.appstate.type.state.A8kWorkState; -import a8k.service.apps.appstate.type.state.TubeHolderState; +import a8k.service.app.appstate.type.*; +import a8k.service.app.appstate.type.state.A8kWorkState; +import a8k.service.app.appstate.type.state.TubeHolderState; import a8k.type.tube_setting.TubeHolderSetting; import lombok.Data; import org.slf4j.Logger; diff --git a/src/main/java/a8k/service/apps/appstate/IncubationPlateMgrService.java b/src/main/java/a8k/service/app/appstate/IncubationPlateMgrService.java similarity index 95% rename from src/main/java/a8k/service/apps/appstate/IncubationPlateMgrService.java rename to src/main/java/a8k/service/app/appstate/IncubationPlateMgrService.java index 925d97b..9211a7a 100644 --- a/src/main/java/a8k/service/apps/appstate/IncubationPlateMgrService.java +++ b/src/main/java/a8k/service/app/appstate/IncubationPlateMgrService.java @@ -1,12 +1,12 @@ -package a8k.service.apps.appstate; +package a8k.service.app.appstate; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; import a8k.extapi_controler.utils.ExtApiTab; import a8k.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.service.apps.appstate.type.IncubationSubTank; -import a8k.service.apps.appstate.type.ProjProcessContext; -import a8k.service.apps.appstate.type.Tube; -import a8k.service.apps.appstate.type.state.IncubationSubTankState; +import a8k.service.app.appstate.type.IncubationSubTank; +import a8k.service.app.appstate.type.ProjProcessContext; +import a8k.service.app.appstate.type.Tube; +import a8k.service.app.appstate.type.state.IncubationSubTankState; import a8k.type.IncubatorPos; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/service/apps/appstate/OptScanModuleStateMgrService.java b/src/main/java/a8k/service/app/appstate/OptScanModuleStateMgrService.java similarity index 80% rename from src/main/java/a8k/service/apps/appstate/OptScanModuleStateMgrService.java rename to src/main/java/a8k/service/app/appstate/OptScanModuleStateMgrService.java index 60534ba..e016563 100644 --- a/src/main/java/a8k/service/apps/appstate/OptScanModuleStateMgrService.java +++ b/src/main/java/a8k/service/app/appstate/OptScanModuleStateMgrService.java @@ -1,10 +1,10 @@ -package a8k.service.apps.appstate; +package a8k.service.app.appstate; -import a8k.service.apps.appstate.type.IncubationSubTank; -import a8k.service.apps.appstate.type.OptScanModule; -import a8k.service.apps.appstate.type.ProjProcessContext; -import a8k.service.apps.appstate.type.state.IncubationSubTankState; -import a8k.service.apps.appstate.type.state.OptScanModuleState; +import a8k.service.app.appstate.type.IncubationSubTank; +import a8k.service.app.appstate.type.OptScanModule; +import a8k.service.app.appstate.type.ProjProcessContext; +import a8k.service.app.appstate.type.state.IncubationSubTankState; +import a8k.service.app.appstate.type.state.OptScanModuleState; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/service/apps/appstate/ResourceMgrService.java b/src/main/java/a8k/service/app/appstate/ResourceMgrService.java similarity index 96% rename from src/main/java/a8k/service/apps/appstate/ResourceMgrService.java rename to src/main/java/a8k/service/app/appstate/ResourceMgrService.java index 7c9d6db..f9a2684 100644 --- a/src/main/java/a8k/service/apps/appstate/ResourceMgrService.java +++ b/src/main/java/a8k/service/app/appstate/ResourceMgrService.java @@ -1,7 +1,7 @@ -package a8k.service.apps.appstate; +package a8k.service.app.appstate; -import a8k.service.apps.appstate.resource.A8kPublicResourceType; +import a8k.service.app.appstate.resource.A8kPublicResourceType; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/service/apps/appstate/TubeStateMgrService.java b/src/main/java/a8k/service/app/appstate/TubeStateMgrService.java similarity index 92% rename from src/main/java/a8k/service/apps/appstate/TubeStateMgrService.java rename to src/main/java/a8k/service/app/appstate/TubeStateMgrService.java index 71f3d9d..b8da9ae 100644 --- a/src/main/java/a8k/service/apps/appstate/TubeStateMgrService.java +++ b/src/main/java/a8k/service/app/appstate/TubeStateMgrService.java @@ -1,14 +1,14 @@ -package a8k.service.apps.appstate; +package a8k.service.app.appstate; -import a8k.service.apps.dbservice.type.SampleRecord; -import a8k.service.apps.appstate.type.ProjProcessContext; -import a8k.service.apps.appstate.type.Tube; -import a8k.service.apps.appstate.type.TubeProcessContext; -import a8k.service.apps.appstate.type.state.TubeState; +import a8k.service.db.type.SampleRecord; +import a8k.service.app.appstate.type.ProjProcessContext; +import a8k.service.app.appstate.type.Tube; +import a8k.service.app.appstate.type.TubeProcessContext; +import a8k.service.app.appstate.type.state.TubeState; import a8k.type.Consumable; import a8k.type.IncubatorPos; import a8k.type.TipPos; -import a8k.type.projecttype.a8kidcard.A8kIdCardInfo; +import a8k.service.db.type.A8kIdCardInfo; import jakarta.annotation.Resource; import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Component; @@ -19,7 +19,7 @@ import java.util.Date; import java.util.List; import java.util.UUID; -import a8k.service.apps.dbservice.SampleRecordDBService; +import a8k.service.db.SampleRecordDBService; @Component public class TubeStateMgrService { diff --git a/src/main/java/a8k/service/apps/appstate/resource/A8kPublicResourceType.java b/src/main/java/a8k/service/app/appstate/resource/A8kPublicResourceType.java similarity index 84% rename from src/main/java/a8k/service/apps/appstate/resource/A8kPublicResourceType.java rename to src/main/java/a8k/service/app/appstate/resource/A8kPublicResourceType.java index a591162..9096abb 100644 --- a/src/main/java/a8k/service/apps/appstate/resource/A8kPublicResourceType.java +++ b/src/main/java/a8k/service/app/appstate/resource/A8kPublicResourceType.java @@ -1,4 +1,4 @@ -package a8k.service.apps.appstate.resource; +package a8k.service.app.appstate.resource; public enum A8kPublicResourceType { ShakeModule,//样本平移电机 diff --git a/src/main/java/a8k/service/apps/appstate/type/EmergencyTubePos.java b/src/main/java/a8k/service/app/appstate/type/EmergencyTubePos.java similarity index 80% rename from src/main/java/a8k/service/apps/appstate/type/EmergencyTubePos.java rename to src/main/java/a8k/service/app/appstate/type/EmergencyTubePos.java index e6c6a6d..2d745b6 100644 --- a/src/main/java/a8k/service/apps/appstate/type/EmergencyTubePos.java +++ b/src/main/java/a8k/service/app/appstate/type/EmergencyTubePos.java @@ -1,4 +1,4 @@ -package a8k.service.apps.appstate.type; +package a8k.service.app.appstate.type; /** * 急诊位位置状态 diff --git a/src/main/java/a8k/service/apps/appstate/type/IncubationPlate.java b/src/main/java/a8k/service/app/appstate/type/IncubationPlate.java similarity index 71% rename from src/main/java/a8k/service/apps/appstate/type/IncubationPlate.java rename to src/main/java/a8k/service/app/appstate/type/IncubationPlate.java index 21e2197..afcf5d5 100644 --- a/src/main/java/a8k/service/apps/appstate/type/IncubationPlate.java +++ b/src/main/java/a8k/service/app/appstate/type/IncubationPlate.java @@ -1,10 +1,9 @@ -package a8k.service.apps.appstate.type; +package a8k.service.app.appstate.type; import a8k.type.IncubatorPos; public class IncubationPlate { public IncubationSubTank[] subtanks = new IncubationSubTank[20]; - public IncubatorPos incubationPos = IncubatorPos.SPACE01; public IncubationPlate() { for (int i = 0; i < 20; i++) { diff --git a/src/main/java/a8k/service/apps/appstate/type/IncubationSubTank.java b/src/main/java/a8k/service/app/appstate/type/IncubationSubTank.java similarity index 89% rename from src/main/java/a8k/service/apps/appstate/type/IncubationSubTank.java rename to src/main/java/a8k/service/app/appstate/type/IncubationSubTank.java index f2aeaef..d230449 100644 --- a/src/main/java/a8k/service/apps/appstate/type/IncubationSubTank.java +++ b/src/main/java/a8k/service/app/appstate/type/IncubationSubTank.java @@ -1,7 +1,7 @@ -package a8k.service.apps.appstate.type; +package a8k.service.app.appstate.type; import a8k.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.service.apps.appstate.type.state.IncubationSubTankState; +import a8k.service.app.appstate.type.state.IncubationSubTankState; import a8k.type.IncubatorPos; import a8k.type.type.BloodType; diff --git a/src/main/java/a8k/service/apps/appstate/type/MainFlowCtrlState.java b/src/main/java/a8k/service/app/appstate/type/MainFlowCtrlState.java similarity index 87% rename from src/main/java/a8k/service/apps/appstate/type/MainFlowCtrlState.java rename to src/main/java/a8k/service/app/appstate/type/MainFlowCtrlState.java index cb579d7..c4fa161 100644 --- a/src/main/java/a8k/service/apps/appstate/type/MainFlowCtrlState.java +++ b/src/main/java/a8k/service/app/appstate/type/MainFlowCtrlState.java @@ -1,7 +1,7 @@ -package a8k.service.apps.appstate.type; +package a8k.service.app.appstate.type; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kErrorContext; -import a8k.service.apps.appstate.type.state.A8kWorkState; +import a8k.service.app.appctrl.mainflowctrl.base.A8kErrorContext; +import a8k.service.app.appstate.type.state.A8kWorkState; import com.fasterxml.jackson.annotation.JsonIgnore; import java.util.ArrayList; diff --git a/src/main/java/a8k/service/apps/appstate/type/OptScanModule.java b/src/main/java/a8k/service/app/appstate/type/OptScanModule.java similarity index 85% rename from src/main/java/a8k/service/apps/appstate/type/OptScanModule.java rename to src/main/java/a8k/service/app/appstate/type/OptScanModule.java index e7e8173..4ca24bd 100644 --- a/src/main/java/a8k/service/apps/appstate/type/OptScanModule.java +++ b/src/main/java/a8k/service/app/appstate/type/OptScanModule.java @@ -1,6 +1,6 @@ -package a8k.service.apps.appstate.type; +package a8k.service.app.appstate.type; -import a8k.service.apps.appstate.type.state.OptScanModuleState; +import a8k.service.app.appstate.type.state.OptScanModuleState; import a8k.type.type.BloodType; public class OptScanModule { diff --git a/src/main/java/a8k/service/apps/appstate/type/ProjProcessContext.java b/src/main/java/a8k/service/app/appstate/type/ProjProcessContext.java similarity index 84% rename from src/main/java/a8k/service/apps/appstate/type/ProjProcessContext.java rename to src/main/java/a8k/service/app/appstate/type/ProjProcessContext.java index 247e559..0ba2097 100644 --- a/src/main/java/a8k/service/apps/appstate/type/ProjProcessContext.java +++ b/src/main/java/a8k/service/app/appstate/type/ProjProcessContext.java @@ -1,9 +1,9 @@ -package a8k.service.apps.appstate.type; +package a8k.service.app.appstate.type; import a8k.type.Consumable; import a8k.type.IncubatorPos; import a8k.type.TipPos; -import a8k.type.projecttype.a8kidcard.A8kIdCardInfo; +import a8k.service.db.type.A8kIdCardInfo; import java.util.List; diff --git a/src/main/java/a8k/service/apps/appstate/type/Tube.java b/src/main/java/a8k/service/app/appstate/type/Tube.java similarity index 90% rename from src/main/java/a8k/service/apps/appstate/type/Tube.java rename to src/main/java/a8k/service/app/appstate/type/Tube.java index 63153f7..021a897 100644 --- a/src/main/java/a8k/service/apps/appstate/type/Tube.java +++ b/src/main/java/a8k/service/app/appstate/type/Tube.java @@ -1,7 +1,7 @@ -package a8k.service.apps.appstate.type; +package a8k.service.app.appstate.type; import a8k.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.service.apps.appstate.type.state.TubeState; +import a8k.service.app.appstate.type.state.TubeState; import a8k.type.type.BloodType; import java.util.ArrayList; diff --git a/src/main/java/a8k/service/apps/appstate/type/TubeHolder.java b/src/main/java/a8k/service/app/appstate/type/TubeHolder.java similarity index 78% rename from src/main/java/a8k/service/apps/appstate/type/TubeHolder.java rename to src/main/java/a8k/service/app/appstate/type/TubeHolder.java index eb3fb15..8b4e102 100644 --- a/src/main/java/a8k/service/apps/appstate/type/TubeHolder.java +++ b/src/main/java/a8k/service/app/appstate/type/TubeHolder.java @@ -1,7 +1,7 @@ -package a8k.service.apps.appstate.type; +package a8k.service.app.appstate.type; -import a8k.service.apps.appstate.type.state.TubeHolderState; -import a8k.service.apps.appstate.type.state.TubeState; +import a8k.service.app.appstate.type.state.TubeHolderState; +import a8k.service.app.appstate.type.state.TubeState; import a8k.type.type.A8kTubeHolderType; public class TubeHolder { diff --git a/src/main/java/a8k/service/apps/appstate/type/TubeProcessContext.java b/src/main/java/a8k/service/app/appstate/type/TubeProcessContext.java similarity index 94% rename from src/main/java/a8k/service/apps/appstate/type/TubeProcessContext.java rename to src/main/java/a8k/service/app/appstate/type/TubeProcessContext.java index 36eb33b..9c1e952 100644 --- a/src/main/java/a8k/service/apps/appstate/type/TubeProcessContext.java +++ b/src/main/java/a8k/service/app/appstate/type/TubeProcessContext.java @@ -1,4 +1,4 @@ -package a8k.service.apps.appstate.type; +package a8k.service.app.appstate.type; import a8k.type.type.BloodType; diff --git a/src/main/java/a8k/service/apps/appstate/type/state/A8kWorkState.java b/src/main/java/a8k/service/app/appstate/type/state/A8kWorkState.java similarity index 54% rename from src/main/java/a8k/service/apps/appstate/type/state/A8kWorkState.java rename to src/main/java/a8k/service/app/appstate/type/state/A8kWorkState.java index 05e7f1f..f44fdf6 100644 --- a/src/main/java/a8k/service/apps/appstate/type/state/A8kWorkState.java +++ b/src/main/java/a8k/service/app/appstate/type/state/A8kWorkState.java @@ -1,4 +1,4 @@ -package a8k.service.apps.appstate.type.state; +package a8k.service.app.appstate.type.state; public enum A8kWorkState { IDLE, diff --git a/src/main/java/a8k/service/apps/appstate/type/state/IncubationSubTankState.java b/src/main/java/a8k/service/app/appstate/type/state/IncubationSubTankState.java similarity index 78% rename from src/main/java/a8k/service/apps/appstate/type/state/IncubationSubTankState.java rename to src/main/java/a8k/service/app/appstate/type/state/IncubationSubTankState.java index e7778dc..317318a 100644 --- a/src/main/java/a8k/service/apps/appstate/type/state/IncubationSubTankState.java +++ b/src/main/java/a8k/service/app/appstate/type/state/IncubationSubTankState.java @@ -1,4 +1,4 @@ -package a8k.service.apps.appstate.type.state; +package a8k.service.app.appstate.type.state; //反应板条状态 public enum IncubationSubTankState { diff --git a/src/main/java/a8k/service/apps/appstate/type/state/OptScanModuleState.java b/src/main/java/a8k/service/app/appstate/type/state/OptScanModuleState.java similarity index 61% rename from src/main/java/a8k/service/apps/appstate/type/state/OptScanModuleState.java rename to src/main/java/a8k/service/app/appstate/type/state/OptScanModuleState.java index 01528a5..9d35e13 100644 --- a/src/main/java/a8k/service/apps/appstate/type/state/OptScanModuleState.java +++ b/src/main/java/a8k/service/app/appstate/type/state/OptScanModuleState.java @@ -1,4 +1,4 @@ -package a8k.service.apps.appstate.type.state; +package a8k.service.app.appstate.type.state; public enum OptScanModuleState { EMPTY, diff --git a/src/main/java/a8k/service/apps/appstate/type/state/TubeHolderProgress.java b/src/main/java/a8k/service/app/appstate/type/state/TubeHolderProgress.java similarity index 68% rename from src/main/java/a8k/service/apps/appstate/type/state/TubeHolderProgress.java rename to src/main/java/a8k/service/app/appstate/type/state/TubeHolderProgress.java index bb480cd..504ec04 100644 --- a/src/main/java/a8k/service/apps/appstate/type/state/TubeHolderProgress.java +++ b/src/main/java/a8k/service/app/appstate/type/state/TubeHolderProgress.java @@ -1,4 +1,4 @@ -package a8k.service.apps.appstate.type.state; +package a8k.service.app.appstate.type.state; public enum TubeHolderProgress { Idle, //空闲 diff --git a/src/main/java/a8k/service/apps/appstate/type/state/TubeHolderState.java b/src/main/java/a8k/service/app/appstate/type/state/TubeHolderState.java similarity index 67% rename from src/main/java/a8k/service/apps/appstate/type/state/TubeHolderState.java rename to src/main/java/a8k/service/app/appstate/type/state/TubeHolderState.java index fa97775..6337920 100644 --- a/src/main/java/a8k/service/apps/appstate/type/state/TubeHolderState.java +++ b/src/main/java/a8k/service/app/appstate/type/state/TubeHolderState.java @@ -1,4 +1,4 @@ -package a8k.service.apps.appstate.type.state; +package a8k.service.app.appstate.type.state; public enum TubeHolderState { IDLE, //没有试管架 diff --git a/src/main/java/a8k/service/apps/appstate/type/state/TubeState.java b/src/main/java/a8k/service/app/appstate/type/state/TubeState.java similarity index 92% rename from src/main/java/a8k/service/apps/appstate/type/state/TubeState.java rename to src/main/java/a8k/service/app/appstate/type/state/TubeState.java index 594c830..2900af5 100644 --- a/src/main/java/a8k/service/apps/appstate/type/state/TubeState.java +++ b/src/main/java/a8k/service/app/appstate/type/state/TubeState.java @@ -1,4 +1,4 @@ -package a8k.service.apps.appstate.type.state; +package a8k.service.app.appstate.type.state; import java.util.List; diff --git a/src/main/java/a8k/service/apps/devicedriver/calibration/PositionCalibration.java b/src/main/java/a8k/service/app/devicedriver/calibration/PositionCalibration.java similarity index 95% rename from src/main/java/a8k/service/apps/devicedriver/calibration/PositionCalibration.java rename to src/main/java/a8k/service/app/devicedriver/calibration/PositionCalibration.java index 793f879..d9c394c 100644 --- a/src/main/java/a8k/service/apps/devicedriver/calibration/PositionCalibration.java +++ b/src/main/java/a8k/service/app/devicedriver/calibration/PositionCalibration.java @@ -1,4 +1,4 @@ -package a8k.service.apps.devicedriver.calibration; +package a8k.service.app.devicedriver.calibration; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; import a8k.extapi_controler.utils.ExtApiFn; @@ -8,9 +8,9 @@ import a8k.type.exception.AppException; import a8k.type.cfg.Pos2d; import a8k.hardware.A8kCanBusService; import a8k.hardware.type.a8kcanprotocol.MId; -import a8k.service.apps.devicedriver.param.DebugParam; -import a8k.service.apps.devicedriver.param.PosParam; -import a8k.service.apps.devicedriver.param.TimeParam; +import a8k.service.app.devicedriver.param.DebugParam; +import a8k.service.app.devicedriver.param.PosParam; +import a8k.service.app.devicedriver.param.TimeParam; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/service/apps/devicedriver/commonctrl/HardwareCommonCtrl.java b/src/main/java/a8k/service/app/devicedriver/commonctrl/HardwareCommonCtrl.java similarity index 98% rename from src/main/java/a8k/service/apps/devicedriver/commonctrl/HardwareCommonCtrl.java rename to src/main/java/a8k/service/app/devicedriver/commonctrl/HardwareCommonCtrl.java index 1027013..324dc17 100644 --- a/src/main/java/a8k/service/apps/devicedriver/commonctrl/HardwareCommonCtrl.java +++ b/src/main/java/a8k/service/app/devicedriver/commonctrl/HardwareCommonCtrl.java @@ -1,4 +1,4 @@ -package a8k.service.apps.devicedriver.commonctrl; +package a8k.service.app.devicedriver.commonctrl; import a8k.type.exception.AppException; @@ -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.apps.devicedriver.param.PosParam; -import a8k.service.apps.devicedriver.param.TimeParam; +import a8k.service.app.devicedriver.param.PosParam; +import a8k.service.app.devicedriver.param.TimeParam; import jakarta.annotation.Resource; import org.slf4j.Logger; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/service/apps/devicedriver/ctrl/ConsumablesScanCtrl.java b/src/main/java/a8k/service/app/devicedriver/ctrl/ConsumablesScanCtrl.java similarity index 95% rename from src/main/java/a8k/service/apps/devicedriver/ctrl/ConsumablesScanCtrl.java rename to src/main/java/a8k/service/app/devicedriver/ctrl/ConsumablesScanCtrl.java index 19e5c73..26fbde5 100644 --- a/src/main/java/a8k/service/apps/devicedriver/ctrl/ConsumablesScanCtrl.java +++ b/src/main/java/a8k/service/app/devicedriver/ctrl/ConsumablesScanCtrl.java @@ -1,12 +1,12 @@ -package a8k.service.apps.devicedriver.ctrl; +package a8k.service.app.devicedriver.ctrl; import a8k.service.bases.ActionReactorService; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; import a8k.extapi_controler.utils.ExtApiFn; import a8k.extapi_controler.utils.ExtApiTab; import a8k.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.service.apps.appstate.GStateService; -import a8k.service.apps.devicedriver.param.Hbot2DCodeScanPos; +import a8k.service.app.appstate.GStateService; +import a8k.service.app.devicedriver.param.Hbot2DCodeScanPos; import a8k.type.cfg.Pos2d; import a8k.type.exception.AppException; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/devicedriver/ctrl/HbotControlService.java b/src/main/java/a8k/service/app/devicedriver/ctrl/HbotControlService.java similarity index 98% rename from src/main/java/a8k/service/apps/devicedriver/ctrl/HbotControlService.java rename to src/main/java/a8k/service/app/devicedriver/ctrl/HbotControlService.java index 1df58fe..616e814 100644 --- a/src/main/java/a8k/service/apps/devicedriver/ctrl/HbotControlService.java +++ b/src/main/java/a8k/service/app/devicedriver/ctrl/HbotControlService.java @@ -1,12 +1,12 @@ -package a8k.service.apps.devicedriver.ctrl; +package a8k.service.app.devicedriver.ctrl; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; import a8k.extapi_controler.utils.ExtApiFn; import a8k.extapi_controler.utils.ExtApiTab; import a8k.hardware.A8kPipetteCtrlModule; import a8k.hardware.type.regindex.PipetteRegIndex; -import a8k.service.apps.devicedriver.param.PosParam; -import a8k.service.apps.devicedriver.param.TimeParam; +import a8k.service.app.devicedriver.param.PosParam; +import a8k.service.app.devicedriver.param.TimeParam; import a8k.type.ConsumableGroup; import a8k.type.exception.AppException; import a8k.type.cfg.*; diff --git a/src/main/java/a8k/service/apps/devicedriver/ctrl/PipetteGunCtrlService.java b/src/main/java/a8k/service/app/devicedriver/ctrl/PipetteGunCtrlService.java similarity index 91% rename from src/main/java/a8k/service/apps/devicedriver/ctrl/PipetteGunCtrlService.java rename to src/main/java/a8k/service/app/devicedriver/ctrl/PipetteGunCtrlService.java index 3640a8e..ed0f68b 100644 --- a/src/main/java/a8k/service/apps/devicedriver/ctrl/PipetteGunCtrlService.java +++ b/src/main/java/a8k/service/app/devicedriver/ctrl/PipetteGunCtrlService.java @@ -1,4 +1,4 @@ -package a8k.service.apps.devicedriver.ctrl; +package a8k.service.app.devicedriver.ctrl; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/service/apps/devicedriver/ctrl/ReactionPlatesTransmitCtrl.java b/src/main/java/a8k/service/app/devicedriver/ctrl/ReactionPlatesTransmitCtrl.java similarity index 97% rename from src/main/java/a8k/service/apps/devicedriver/ctrl/ReactionPlatesTransmitCtrl.java rename to src/main/java/a8k/service/app/devicedriver/ctrl/ReactionPlatesTransmitCtrl.java index 9eed513..e52ac0a 100644 --- a/src/main/java/a8k/service/apps/devicedriver/ctrl/ReactionPlatesTransmitCtrl.java +++ b/src/main/java/a8k/service/app/devicedriver/ctrl/ReactionPlatesTransmitCtrl.java @@ -1,4 +1,4 @@ -package a8k.service.apps.devicedriver.ctrl; +package a8k.service.app.devicedriver.ctrl; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; import a8k.extapi_controler.utils.EnginnerParamReader; @@ -12,9 +12,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.apps.devicedriver.param.DebugParam; -import a8k.service.apps.devicedriver.param.PosParam; -import a8k.service.apps.devicedriver.param.TimeParam; +import a8k.service.app.devicedriver.param.DebugParam; +import a8k.service.app.devicedriver.param.PosParam; +import a8k.service.app.devicedriver.param.TimeParam; import jakarta.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/service/apps/devicedriver/ctrl/SampleScanTransportCtrl.java b/src/main/java/a8k/service/app/devicedriver/ctrl/SampleScanTransportCtrl.java similarity index 98% rename from src/main/java/a8k/service/apps/devicedriver/ctrl/SampleScanTransportCtrl.java rename to src/main/java/a8k/service/app/devicedriver/ctrl/SampleScanTransportCtrl.java index 45c6ee6..f8cf9b0 100644 --- a/src/main/java/a8k/service/apps/devicedriver/ctrl/SampleScanTransportCtrl.java +++ b/src/main/java/a8k/service/app/devicedriver/ctrl/SampleScanTransportCtrl.java @@ -1,10 +1,10 @@ -package a8k.service.apps.devicedriver.ctrl; +package a8k.service.app.devicedriver.ctrl; import a8k.OS; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; import a8k.extapi_controler.utils.ExtApiFn; import a8k.extapi_controler.utils.ExtApiTab; -import a8k.service.apps.devicedriver.param.SampleTransportParam; +import a8k.service.app.devicedriver.param.SampleTransportParam; import a8k.type.exception.AppException; import a8k.type.TargetPosMeasureDirection; import a8k.hardware.A8kCanBusService; diff --git a/src/main/java/a8k/service/apps/devicedriver/ctrl/SamplesPreProcesCtrl.java b/src/main/java/a8k/service/app/devicedriver/ctrl/SamplesPreProcesCtrl.java similarity index 98% rename from src/main/java/a8k/service/apps/devicedriver/ctrl/SamplesPreProcesCtrl.java rename to src/main/java/a8k/service/app/devicedriver/ctrl/SamplesPreProcesCtrl.java index 10bd8f2..47b7313 100644 --- a/src/main/java/a8k/service/apps/devicedriver/ctrl/SamplesPreProcesCtrl.java +++ b/src/main/java/a8k/service/app/devicedriver/ctrl/SamplesPreProcesCtrl.java @@ -1,4 +1,4 @@ -package a8k.service.apps.devicedriver.ctrl; +package a8k.service.app.devicedriver.ctrl; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; import a8k.extapi_controler.utils.ExtApiFn; @@ -7,9 +7,9 @@ import a8k.type.exception.AppException; import a8k.hardware.A8kCanBusService; import a8k.hardware.type.a8kcanprotocol.A8kEcode; import a8k.hardware.type.a8kcanprotocol.MId; -import a8k.service.apps.devicedriver.param.DebugParam; -import a8k.service.apps.devicedriver.param.TimeParam; -import a8k.service.apps.devicedriver.param.PosParam; +import a8k.service.app.devicedriver.param.DebugParam; +import a8k.service.app.devicedriver.param.TimeParam; +import a8k.service.app.devicedriver.param.PosParam; import a8k.utils.ZEQ; import jakarta.annotation.Resource; import org.slf4j.Logger; diff --git a/src/main/java/a8k/service/apps/devicedriver/param/DebugParam.java b/src/main/java/a8k/service/app/devicedriver/param/DebugParam.java similarity index 93% rename from src/main/java/a8k/service/apps/devicedriver/param/DebugParam.java rename to src/main/java/a8k/service/app/devicedriver/param/DebugParam.java index a60398d..bcb774d 100644 --- a/src/main/java/a8k/service/apps/devicedriver/param/DebugParam.java +++ b/src/main/java/a8k/service/app/devicedriver/param/DebugParam.java @@ -1,4 +1,4 @@ -package a8k.service.apps.devicedriver.param; +package a8k.service.app.devicedriver.param; import a8k.extapi_controler.utils.ExtApiTab; import a8k.extapi_controler.utils.ExtApiFn; diff --git a/src/main/java/a8k/service/apps/devicedriver/param/Hbot2DCodeScanPos.java b/src/main/java/a8k/service/app/devicedriver/param/Hbot2DCodeScanPos.java similarity index 99% rename from src/main/java/a8k/service/apps/devicedriver/param/Hbot2DCodeScanPos.java rename to src/main/java/a8k/service/app/devicedriver/param/Hbot2DCodeScanPos.java index 82f9367..1ef141e 100644 --- a/src/main/java/a8k/service/apps/devicedriver/param/Hbot2DCodeScanPos.java +++ b/src/main/java/a8k/service/app/devicedriver/param/Hbot2DCodeScanPos.java @@ -1,4 +1,4 @@ -package a8k.service.apps.devicedriver.param; +package a8k.service.app.devicedriver.param; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; import a8k.extapi_controler.utils.*; diff --git a/src/main/java/a8k/service/apps/devicedriver/param/PosParam.java b/src/main/java/a8k/service/app/devicedriver/param/PosParam.java similarity index 99% rename from src/main/java/a8k/service/apps/devicedriver/param/PosParam.java rename to src/main/java/a8k/service/app/devicedriver/param/PosParam.java index d6fd6d9..885ccca 100644 --- a/src/main/java/a8k/service/apps/devicedriver/param/PosParam.java +++ b/src/main/java/a8k/service/app/devicedriver/param/PosParam.java @@ -1,4 +1,4 @@ -package a8k.service.apps.devicedriver.param; +package a8k.service.app.devicedriver.param; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; import a8k.extapi_controler.utils.EnginnerParamReader; diff --git a/src/main/java/a8k/service/apps/devicedriver/param/SampleTransportParam.java b/src/main/java/a8k/service/app/devicedriver/param/SampleTransportParam.java similarity index 98% rename from src/main/java/a8k/service/apps/devicedriver/param/SampleTransportParam.java rename to src/main/java/a8k/service/app/devicedriver/param/SampleTransportParam.java index 51bfd8a..978658a 100644 --- a/src/main/java/a8k/service/apps/devicedriver/param/SampleTransportParam.java +++ b/src/main/java/a8k/service/app/devicedriver/param/SampleTransportParam.java @@ -1,4 +1,4 @@ -package a8k.service.apps.devicedriver.param; +package a8k.service.app.devicedriver.param; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; import a8k.extapi_controler.utils.EnginnerParamReader; diff --git a/src/main/java/a8k/service/apps/devicedriver/param/TimeParam.java b/src/main/java/a8k/service/app/devicedriver/param/TimeParam.java similarity index 97% rename from src/main/java/a8k/service/apps/devicedriver/param/TimeParam.java rename to src/main/java/a8k/service/app/devicedriver/param/TimeParam.java index fd706a1..9d4aaff 100644 --- a/src/main/java/a8k/service/apps/devicedriver/param/TimeParam.java +++ b/src/main/java/a8k/service/app/devicedriver/param/TimeParam.java @@ -1,4 +1,4 @@ -package a8k.service.apps.devicedriver.param; +package a8k.service.app.devicedriver.param; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; diff --git a/src/main/java/a8k/service/apps/devicedriver/status/DeviceStatus.java b/src/main/java/a8k/service/app/devicedriver/status/DeviceStatus.java similarity index 98% rename from src/main/java/a8k/service/apps/devicedriver/status/DeviceStatus.java rename to src/main/java/a8k/service/app/devicedriver/status/DeviceStatus.java index 6843fd1..fc76f6a 100644 --- a/src/main/java/a8k/service/apps/devicedriver/status/DeviceStatus.java +++ b/src/main/java/a8k/service/app/devicedriver/status/DeviceStatus.java @@ -1,4 +1,4 @@ -package a8k.service.apps.devicedriver.status; +package a8k.service.app.devicedriver.status; import a8k.type.exception.AppException; import a8k.extapi_controler.utils.ExtApiTab; diff --git a/src/main/java/a8k/service/apps/devicedriver/testscript/TestScript.java b/src/main/java/a8k/service/app/devicedriver/testscript/TestScript.java similarity index 94% rename from src/main/java/a8k/service/apps/devicedriver/testscript/TestScript.java rename to src/main/java/a8k/service/app/devicedriver/testscript/TestScript.java index d61556c..77066d8 100644 --- a/src/main/java/a8k/service/apps/devicedriver/testscript/TestScript.java +++ b/src/main/java/a8k/service/app/devicedriver/testscript/TestScript.java @@ -1,4 +1,4 @@ -package a8k.service.apps.devicedriver.testscript; +package a8k.service.app.devicedriver.testscript; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; import a8k.extapi_controler.utils.EnginnerParamReader; @@ -7,15 +7,15 @@ import a8k.extapi_controler.utils.ExtApiTab; import a8k.type.ConsumableGroup; import a8k.type.exception.AppException; import a8k.type.IncubatorPos; -import a8k.service.apps.devicedriver.ctrl.SamplesPreProcesCtrl; -import a8k.service.apps.devicedriver.ctrl.SampleScanTransportCtrl; +import a8k.service.app.devicedriver.ctrl.SamplesPreProcesCtrl; +import a8k.service.app.devicedriver.ctrl.SampleScanTransportCtrl; import a8k.hardware.A8kCanBusService; import a8k.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.service.apps.devicedriver.ctrl.HbotControlService; -import a8k.service.apps.devicedriver.ctrl.ReactionPlatesTransmitCtrl; -import a8k.service.apps.devicedriver.param.DebugParam; -import a8k.service.apps.devicedriver.param.PosParam; -import a8k.service.apps.devicedriver.param.TimeParam; +import a8k.service.app.devicedriver.ctrl.HbotControlService; +import a8k.service.app.devicedriver.ctrl.ReactionPlatesTransmitCtrl; +import a8k.service.app.devicedriver.param.DebugParam; +import a8k.service.app.devicedriver.param.PosParam; +import a8k.service.app.devicedriver.param.TimeParam; import jakarta.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/service/apps/appstate/condtion/A8kCondition.java b/src/main/java/a8k/service/apps/appstate/condtion/A8kCondition.java deleted file mode 100644 index 60936bd..0000000 --- a/src/main/java/a8k/service/apps/appstate/condtion/A8kCondition.java +++ /dev/null @@ -1,5 +0,0 @@ -package a8k.service.apps.appstate.condtion; - -public enum A8kCondition { - -} diff --git a/src/main/java/a8k/service/apps/appstate/condtion/CondtionFn.java b/src/main/java/a8k/service/apps/appstate/condtion/CondtionFn.java deleted file mode 100644 index b6238e2..0000000 --- a/src/main/java/a8k/service/apps/appstate/condtion/CondtionFn.java +++ /dev/null @@ -1,6 +0,0 @@ -package a8k.service.apps.appstate.condtion; - -@FunctionalInterface -public interface CondtionFn { - Boolean isTrigger(); -} diff --git a/src/main/java/a8k/service/apps/dbservice/A8kPresetProjInfoDBService.java b/src/main/java/a8k/service/apps/dbservice/A8kPresetProjInfoDBService.java deleted file mode 100644 index cd02b96..0000000 --- a/src/main/java/a8k/service/apps/dbservice/A8kPresetProjInfoDBService.java +++ /dev/null @@ -1,50 +0,0 @@ -package a8k.service.apps.dbservice; - -import a8k.service.apps.dbservice.type.A8kPresetProjInfo; -import a8k.service.apps.appdata.UtilsProjectColorAllocer; -import a8k.utils.ZSqliteJdbcHelper; -import jakarta.annotation.PostConstruct; -import jakarta.annotation.Resource; -import lombok.SneakyThrows; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.stereotype.Component; - -import java.sql.ResultSet; -import java.util.List; - -@Component -public class A8kPresetProjInfoDBService { - private static final Logger logger = LoggerFactory.getLogger(A8kPresetProjInfoDBService.class); - private static final String tableName = "zapp_a8k_projinfo"; - private static Class tClass = A8kPresetProjInfo.class; - - - @Resource - JdbcTemplate jdbcTemplate; - - @Resource - UtilsProjectColorAllocer colorAllocer; - - @PostConstruct - void init() { - if (!ZSqliteJdbcHelper.isTableExist(jdbcTemplate, tableName)) { - ZSqliteJdbcHelper.createTable(jdbcTemplate, tableName, tClass); - } - } - - @SneakyThrows public A8kPresetProjInfo rowMapper(ResultSet rs, int rowNum) { - return (A8kPresetProjInfo) ZSqliteJdbcHelper.rowMapper(rs, tClass); - } - - public List getAll() { - return jdbcTemplate.query("select * from " + tableName, this::rowMapper); - } - - public A8kPresetProjInfo getByProjId(Integer projId) { - var results = jdbcTemplate.query("select * from " + tableName + " where projId = ?", this::rowMapper, projId); - return !results.isEmpty() ? results.get(0) : null; - } - -} diff --git a/src/main/java/a8k/service/apps/dbservice/type/A8kPresetProjInfo.java b/src/main/java/a8k/service/apps/dbservice/type/A8kPresetProjInfo.java deleted file mode 100644 index d8ae583..0000000 --- a/src/main/java/a8k/service/apps/dbservice/type/A8kPresetProjInfo.java +++ /dev/null @@ -1,13 +0,0 @@ -package a8k.service.apps.dbservice.type; - -import a8k.type.projecttype.A8kReactionFlowType; - -public class A8kPresetProjInfo { - public Integer id; - - public Integer projCode; // 项目ID - public String projName; // 只做标识，不做匹配 - - public A8kReactionFlowType reactionFlowType; //反应流程 - public Integer reactionTemperature; //反应温度 -} diff --git a/src/main/java/a8k/service/apps/dbservice/type/UsrRole.java b/src/main/java/a8k/service/apps/dbservice/type/UsrRole.java deleted file mode 100644 index bf47696..0000000 --- a/src/main/java/a8k/service/apps/dbservice/type/UsrRole.java +++ /dev/null @@ -1,6 +0,0 @@ -package a8k.service.apps.dbservice.type; - -public enum UsrRole { - Usr, - Admin -} diff --git a/src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LISSerialBaudrate.java b/src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LISSerialBaudrate.java deleted file mode 100644 index 3351e74..0000000 --- a/src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LISSerialBaudrate.java +++ /dev/null @@ -1,6 +0,0 @@ -package a8k.service.apps.dbservice.type.appsetting.settingenum; - -public enum LISSerialBaudrate { - B9600, - B115200, -} diff --git a/src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LanguageType.java b/src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LanguageType.java deleted file mode 100644 index cfaac59..0000000 --- a/src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LanguageType.java +++ /dev/null @@ -1,5 +0,0 @@ -package a8k.service.apps.dbservice.type.appsetting.settingenum; - -public enum LanguageType { - zh_CN, en_US -} diff --git a/src/main/java/a8k/service/apps/appdata/AppFrontEndEventRouter.java b/src/main/java/a8k/service/bases/AppFrontEndEventRouter.java similarity index 96% rename from src/main/java/a8k/service/apps/appdata/AppFrontEndEventRouter.java rename to src/main/java/a8k/service/bases/AppFrontEndEventRouter.java index c864dea..031f1c1 100644 --- a/src/main/java/a8k/service/apps/appdata/AppFrontEndEventRouter.java +++ b/src/main/java/a8k/service/bases/AppFrontEndEventRouter.java @@ -1,9 +1,8 @@ -package a8k.service.apps.appdata; +package a8k.service.bases; import a8k.extapi_controler.pagecontrol.ExtApiTabConfig; import a8k.extapi_controler.utils.ExtApiTab; import a8k.extapi_controler.utils.ExtApiFn; -import a8k.service.bases.AppEventBusService; import a8k.service.bases.appevent.A8kHardwareReport; import a8k.service.bases.appevent.AppEvent; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/service/bases/appevent/A8kEcodeContextListPromptEvent.java b/src/main/java/a8k/service/bases/appevent/A8kEcodeContextListPromptEvent.java index 7e5e8a0..534b145 100644 --- a/src/main/java/a8k/service/bases/appevent/A8kEcodeContextListPromptEvent.java +++ b/src/main/java/a8k/service/bases/appevent/A8kEcodeContextListPromptEvent.java @@ -1,6 +1,6 @@ package a8k.service.bases.appevent; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kErrorContext; +import a8k.service.app.appctrl.mainflowctrl.base.A8kErrorContext; import java.util.List; diff --git a/src/main/java/a8k/service/bases/appevent/AppIDCardMountEvent.java b/src/main/java/a8k/service/bases/appevent/AppIDCardMountEvent.java index 1d93cad..f07cc8e 100644 --- a/src/main/java/a8k/service/bases/appevent/AppIDCardMountEvent.java +++ b/src/main/java/a8k/service/bases/appevent/AppIDCardMountEvent.java @@ -1,7 +1,7 @@ package a8k.service.bases.appevent; -import a8k.type.projecttype.a8kidcard.A8kIdCardInfo; +import a8k.service.db.type.A8kIdCardInfo; public class AppIDCardMountEvent extends AppEvent { public A8kIdCardInfo projectInfo; diff --git a/src/main/java/a8k/service/bases/appevent/DoA8kStepActionEvent.java b/src/main/java/a8k/service/bases/appevent/DoA8kStepActionEvent.java index 8c782cb..42a8433 100644 --- a/src/main/java/a8k/service/bases/appevent/DoA8kStepActionEvent.java +++ b/src/main/java/a8k/service/bases/appevent/DoA8kStepActionEvent.java @@ -1,6 +1,6 @@ package a8k.service.bases.appevent; -import a8k.service.apps.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType; public class DoA8kStepActionEvent extends AppEvent { public A8kActionStepType actionStep; diff --git a/src/main/java/a8k/service/apps/dbservice/A8kProjIdCardDBService.java b/src/main/java/a8k/service/db/A8kProjIdCardDBService.java similarity index 94% rename from src/main/java/a8k/service/apps/dbservice/A8kProjIdCardDBService.java rename to src/main/java/a8k/service/db/A8kProjIdCardDBService.java index aff9075..e0e2759 100644 --- a/src/main/java/a8k/service/apps/dbservice/A8kProjIdCardDBService.java +++ b/src/main/java/a8k/service/db/A8kProjIdCardDBService.java @@ -1,7 +1,7 @@ -package a8k.service.apps.dbservice; +package a8k.service.db; -import a8k.service.apps.appdata.UtilsProjectColorAllocer; -import a8k.type.projecttype.a8kidcard.A8kIdCardInfo; +import a8k.service.app.appdata.UtilsProjectColorAllocer; +import a8k.service.db.type.A8kIdCardInfo; import a8k.utils.ZSqliteJdbcHelper; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/db/A8kProjInfoDBService.java b/src/main/java/a8k/service/db/A8kProjInfoDBService.java new file mode 100644 index 0000000..ec4f6d9 --- /dev/null +++ b/src/main/java/a8k/service/db/A8kProjInfoDBService.java @@ -0,0 +1,52 @@ +package a8k.service.db; + +import a8k.service.app.appdata.UtilsProjectColorAllocer; +import a8k.service.db.type.A8kProjectInfo; +import a8k.utils.ZSqliteJdbcHelper; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; +import lombok.SneakyThrows; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +import java.sql.ResultSet; +import java.util.List; + +@Component +public class A8kProjInfoDBService { + private static final Logger logger = LoggerFactory.getLogger(A8kProjInfoDBService.class); + private static final String tableName = "zapp_a8k_project_info"; + private static Class tClass = A8kProjectInfo.class; + + + @Resource + JdbcTemplate jdbcTemplate; + + @Resource + UtilsProjectColorAllocer colorAllocer; + + @PostConstruct + void init() { + if (!ZSqliteJdbcHelper.isTableExist(jdbcTemplate, tableName)) { + ZSqliteJdbcHelper.createTable(jdbcTemplate, tableName, tClass); + } + } + + @SneakyThrows private A8kProjectInfo rowMapper(ResultSet rs, int rowNum) { + return (A8kProjectInfo) ZSqliteJdbcHelper.rowMapper(rs, tClass); + } + + public A8kProjectInfo findByProjIndex(Integer projIndex) { + List list = jdbcTemplate.query("select * from " + tableName + " where projIndex = ?;", this::rowMapper, projIndex); + if (list.isEmpty()) { + return null; + } + return list.get(0); + } + + public void add(A8kProjectInfo val) { + ZSqliteJdbcHelper.addObj(jdbcTemplate, tableName, tClass, val); + } +} diff --git a/src/main/java/a8k/service/apps/dbservice/AppSettingDBService.java b/src/main/java/a8k/service/db/AppSettingDBService.java similarity index 95% rename from src/main/java/a8k/service/apps/dbservice/AppSettingDBService.java rename to src/main/java/a8k/service/db/AppSettingDBService.java index 5acb923..2d5a1b2 100644 --- a/src/main/java/a8k/service/apps/dbservice/AppSettingDBService.java +++ b/src/main/java/a8k/service/db/AppSettingDBService.java @@ -1,9 +1,9 @@ -package a8k.service.apps.dbservice; +package a8k.service.db; -import a8k.service.apps.dbservice.type.AppSetting; -import a8k.service.apps.dbservice.type.appsetting.AppSettingName; -import a8k.service.apps.dbservice.type.appsetting.AppSettingTab; -import a8k.service.apps.dbservice.type.appsetting.AppSettingType; +import a8k.service.db.type.AppSetting; +import a8k.service.db.type.appsetting.AppSettingName; +import a8k.service.db.type.appsetting.AppSettingTab; +import a8k.service.db.type.appsetting.AppSettingType; import a8k.utils.ZEnumHelper; import a8k.utils.ZSqliteJdbcHelper; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/service/apps/dbservice/AppUsrDBService.java b/src/main/java/a8k/service/db/AppUsrDBService.java similarity index 95% rename from src/main/java/a8k/service/apps/dbservice/AppUsrDBService.java rename to src/main/java/a8k/service/db/AppUsrDBService.java index e1d5e3d..021f878 100644 --- a/src/main/java/a8k/service/apps/dbservice/AppUsrDBService.java +++ b/src/main/java/a8k/service/db/AppUsrDBService.java @@ -1,8 +1,8 @@ -package a8k.service.apps.dbservice; +package a8k.service.db; -import a8k.service.apps.dbservice.type.AppUser; -import a8k.service.apps.dbservice.type.UsrRole; +import a8k.service.db.type.AppUser; +import a8k.service.db.type.UsrRole; import a8k.utils.ZSqliteJdbcHelper; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/dbservice/HardwareServiceSetting.java b/src/main/java/a8k/service/db/HardwareServiceSetting.java similarity index 98% rename from src/main/java/a8k/service/apps/dbservice/HardwareServiceSetting.java rename to src/main/java/a8k/service/db/HardwareServiceSetting.java index 926c0e7..96fb159 100644 --- a/src/main/java/a8k/service/apps/dbservice/HardwareServiceSetting.java +++ b/src/main/java/a8k/service/db/HardwareServiceSetting.java @@ -1,4 +1,4 @@ -package a8k.service.apps.dbservice; +package a8k.service.db; import a8k.hardware.type.a8kcanprotocol.A8kEcode; import a8k.type.exception.AppException; diff --git a/src/main/java/a8k/service/apps/dbservice/ReactionRecordDBService.java b/src/main/java/a8k/service/db/ReactionRecordDBService.java similarity index 93% rename from src/main/java/a8k/service/apps/dbservice/ReactionRecordDBService.java rename to src/main/java/a8k/service/db/ReactionRecordDBService.java index 2648d42..dc32e40 100644 --- a/src/main/java/a8k/service/apps/dbservice/ReactionRecordDBService.java +++ b/src/main/java/a8k/service/db/ReactionRecordDBService.java @@ -1,6 +1,6 @@ -package a8k.service.apps.dbservice; +package a8k.service.db; -import a8k.service.apps.dbservice.type.ReactionResultRecord; +import a8k.service.db.type.ReactionResultRecord; import a8k.utils.ZSqliteJdbcHelper; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/apps/dbservice/SampleRecordDBService.java b/src/main/java/a8k/service/db/SampleRecordDBService.java similarity index 91% rename from src/main/java/a8k/service/apps/dbservice/SampleRecordDBService.java rename to src/main/java/a8k/service/db/SampleRecordDBService.java index da80c47..4c4d15d 100644 --- a/src/main/java/a8k/service/apps/dbservice/SampleRecordDBService.java +++ b/src/main/java/a8k/service/db/SampleRecordDBService.java @@ -1,7 +1,7 @@ -package a8k.service.apps.dbservice; +package a8k.service.db; -import a8k.service.apps.dbservice.type.SampleRecord; -import a8k.service.apps.appdata.UtilsProjectColorAllocer; +import a8k.service.db.type.SampleRecord; +import a8k.service.app.appdata.UtilsProjectColorAllocer; import a8k.utils.ZSqliteJdbcHelper; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/type/projecttype/a8kidcard/A8kIdCardInfo.java b/src/main/java/a8k/service/db/type/A8kIdCardInfo.java similarity index 85% rename from src/main/java/a8k/type/projecttype/a8kidcard/A8kIdCardInfo.java rename to src/main/java/a8k/service/db/type/A8kIdCardInfo.java index aa7744c..e4bf099 100644 --- a/src/main/java/a8k/type/projecttype/a8kidcard/A8kIdCardInfo.java +++ b/src/main/java/a8k/service/db/type/A8kIdCardInfo.java @@ -1,18 +1,16 @@ -package a8k.type.projecttype.a8kidcard; +package a8k.service.db.type; -import a8k.type.projecttype.A8kReactionFlowType; +import a8k.service.db.type.a8kidcard.A8kIdCardFn; +import a8k.service.db.type.a8kidcard.zenum.A8kReactionFlowType; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.Date; public class A8kIdCardInfo { - - public int id; public String color;// - // content in idcard public String projName; // 项目名称 0x0001,15 public String lotId; // 批次名称 0x0010,12 @@ -21,8 +19,8 @@ public class A8kIdCardInfo { public Date expiryDate; // 有效日期 0x001C public Integer projIndex; // 项目名称代码 0x001F public Integer palteCode; // 板条条码代码 0x0020 - public Integer updateChipVersion; // 更新芯片版本号 0x0021 + public Float QCPeakMinVal; // 质控峰最小值 0x0022 public Float QCPeakMaxVal; // 质控峰最大值 设置值x10最大不超过250000 0x0027 public Integer optType; // 光学类型 光学类型(0=自动;1=F光学;2=T光学;3=F/T光学;其他=无效;) 0x002C @@ -38,8 +36,8 @@ public class A8kIdCardInfo { public Integer wBloodSampleVolUl; // 全血样本量 0x0037 public Integer serumSampleVolUl; // 血清/血浆样本量 0x0038 public Integer tubeMixingCount; // 试管混匀次数 0x0039 - public Integer bufferBottleSize; // 缓冲液瓶大小 0x003A - public Integer bufferBottleCapacity; // 缓冲液瓶容量 0x003B + public Integer bufferBottleSize; // 缓冲液瓶大小 0x003A ,没有的配置 + public Integer bufferBottleCapacity; // 缓冲液瓶容量 0x003B ,没有的配置 public Integer buffLiquidAspirMixingCnt; // 缓冲液吸吐混匀次数 0x003C public Integer buffLiquidAspirMixingVol; // 缓冲液吐混混匀量 0x003D public Integer buffLiquidReactionTime; // 缓冲液反应时间 0x003E @@ -48,11 +46,10 @@ public class A8kIdCardInfo { public Integer resultDecimalPlaces; // 结果小数点位数 0x0041 public Integer scanningRange; // 扫描范围 0x0042 - public A8kReactionFlowType reactionFlowType; //反应流程 - public Integer reactionTemperature; //反应温度 - - - public A8kIdCardProjectFormula projFormula = new A8kIdCardProjectFormula(); + public Integer projNum; // 当前项目是几联卡项目,val = 1,2,3 0x0100 + public A8kIdCardFn pj1FnInfo; + public A8kIdCardFn pj2FnInfo; + public A8kIdCardFn pj3FnInfo; public String toString() { ObjectMapper mapper = new ObjectMapper(); diff --git a/src/main/java/a8k/service/db/type/A8kProjectInfo.java b/src/main/java/a8k/service/db/type/A8kProjectInfo.java new file mode 100644 index 0000000..0919133 --- /dev/null +++ b/src/main/java/a8k/service/db/type/A8kProjectInfo.java @@ -0,0 +1,66 @@ +package a8k.service.db.type; + +import a8k.optalgo.type.Peak; +import a8k.service.db.type.a8kidcard.zenum.A8kOptType; +import a8k.service.db.type.a8kidcard.zenum.A8kReactionFlowType; +import a8k.service.db.type.a8kprojinfo.OptScanDirection; +import a8k.service.db.type.a8kprojinfo.PeakName; + +import java.util.List; + +public class A8kProjectInfo { + public int id; + public String color; //项目颜色 + public Integer projIndex; //项目index + public String projName; //项目名称 + + public Integer projNum; //是否是多联卡 + public Integer reactionTemperature; //反应温度 + + //流程类型 + public A8kReactionFlowType reactionFlowType; //反应流程 + + //样本配置 + public Integer wBloodSampleVolUl; // 全血样本量 0x0037 + public Integer serumSampleVolUl; // 血清/血浆样本量 0x0038 + public Integer shakeTimes; // 摇匀次数 + + //缓冲液配置 + public Integer bigBufferSampleUl; // 大瓶缓冲液取样量 + + //样本处理逻辑 + public Integer tubeMixingCount; //试管混匀次数 0x0039 + + //混合液配置 + public Integer mixLiquidReactionTime; // 混合液反应时间 + public Integer mixLiquidAspirMixingCnt; // 混合混匀次数 + + //孵育配置 + public Integer reactionPlateIncubationTime; // 反应板孵育时间 + public Integer reactionPlateDropletVol; // 反应板滴样量 + + //光学配置 + public String subProj0_name; //子项目名称 + public A8kOptType subProj0_optType; //F,T + public Integer subProj0_scanRange; //扫描范围 + public OptScanDirection subProj0_scanDirection; //扫描方向 + public Integer subProj0_peakNum; //峰的数量 + public List subProj0_peakNames; //峰的名称 + public List subProj0_peakPos; //峰的位置 + + public String subProj1_name; //子项目名称 + public A8kOptType subProj1_optType; //F,T + public Integer subProj1_scanRange; //扫描范围 + public OptScanDirection subProj1_scanDirection; //扫描方向 + public Integer subProj1_peakNum; //峰的数量 + public List subProj1_peakNames; //峰的名称 + public List subProj1_peakPos; //峰的位置 + + public String subProj2_name; //子项目名称 + public A8kOptType subProj2_optType; //F,T + public Integer subProj2_scanRange; //扫描范围 + public OptScanDirection subProj2_scanDirection; //扫描方向 + public Integer subProj2_peakNum; //峰的数量 + public List subProj2_peakNames; //峰的名称 + public List subProj2_peakPos; //峰的位置 +} diff --git a/src/main/java/a8k/service/apps/dbservice/type/AppSetting.java b/src/main/java/a8k/service/db/type/AppSetting.java similarity index 82% rename from src/main/java/a8k/service/apps/dbservice/type/AppSetting.java rename to src/main/java/a8k/service/db/type/AppSetting.java index 76dcb56..a8c2541 100644 --- a/src/main/java/a8k/service/apps/dbservice/type/AppSetting.java +++ b/src/main/java/a8k/service/db/type/AppSetting.java @@ -1,9 +1,9 @@ -package a8k.service.apps.dbservice.type; +package a8k.service.db.type; -import a8k.service.apps.dbservice.type.appsetting.AppSettingName; -import a8k.service.apps.dbservice.type.appsetting.AppSettingTab; -import a8k.service.apps.dbservice.type.appsetting.AppSettingType; +import a8k.service.db.type.appsetting.AppSettingName; +import a8k.service.db.type.appsetting.AppSettingTab; +import a8k.service.db.type.appsetting.AppSettingType; import a8k.utils.ZJsonHelper; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/a8k/service/apps/dbservice/type/AppUser.java b/src/main/java/a8k/service/db/type/AppUser.java similarity index 94% rename from src/main/java/a8k/service/apps/dbservice/type/AppUser.java rename to src/main/java/a8k/service/db/type/AppUser.java index 09296fa..d215eba 100644 --- a/src/main/java/a8k/service/apps/dbservice/type/AppUser.java +++ b/src/main/java/a8k/service/db/type/AppUser.java @@ -1,4 +1,4 @@ -package a8k.service.apps.dbservice.type; +package a8k.service.db.type; import a8k.utils.ZJsonHelper; diff --git a/src/main/java/a8k/service/apps/dbservice/type/ReactionResultRecord.java b/src/main/java/a8k/service/db/type/ReactionResultRecord.java similarity index 97% rename from src/main/java/a8k/service/apps/dbservice/type/ReactionResultRecord.java rename to src/main/java/a8k/service/db/type/ReactionResultRecord.java index 97f6807..42370d0 100644 --- a/src/main/java/a8k/service/apps/dbservice/type/ReactionResultRecord.java +++ b/src/main/java/a8k/service/db/type/ReactionResultRecord.java @@ -1,4 +1,4 @@ -package a8k.service.apps.dbservice.type; +package a8k.service.db.type; import a8k.type.reaction_result_type.ReactionResultStatus; import a8k.type.type.BloodType; diff --git a/src/main/java/a8k/service/apps/dbservice/type/SampleRecord.java b/src/main/java/a8k/service/db/type/SampleRecord.java similarity index 95% rename from src/main/java/a8k/service/apps/dbservice/type/SampleRecord.java rename to src/main/java/a8k/service/db/type/SampleRecord.java index 4a056d6..f26d02b 100644 --- a/src/main/java/a8k/service/apps/dbservice/type/SampleRecord.java +++ b/src/main/java/a8k/service/db/type/SampleRecord.java @@ -1,4 +1,4 @@ -package a8k.service.apps.dbservice.type; +package a8k.service.db.type; import a8k.type.type.BloodType; diff --git a/src/main/java/a8k/service/db/type/UsrRole.java b/src/main/java/a8k/service/db/type/UsrRole.java new file mode 100644 index 0000000..965f09f --- /dev/null +++ b/src/main/java/a8k/service/db/type/UsrRole.java @@ -0,0 +1,6 @@ +package a8k.service.db.type; + +public enum UsrRole { + Usr, + Admin +} diff --git a/src/main/java/a8k/type/projecttype/a8kidcard/A8kFnFormula.java b/src/main/java/a8k/service/db/type/a8kidcard/A8kFnFormula.java similarity index 74% rename from src/main/java/a8k/type/projecttype/a8kidcard/A8kFnFormula.java rename to src/main/java/a8k/service/db/type/a8kidcard/A8kFnFormula.java index 1793ff6..0eaa649 100644 --- a/src/main/java/a8k/type/projecttype/a8kidcard/A8kFnFormula.java +++ b/src/main/java/a8k/service/db/type/a8kidcard/A8kFnFormula.java @@ -1,5 +1,8 @@ -package a8k.type.projecttype.a8kidcard; +package a8k.service.db.type.a8kidcard; +/** + * 普通函数 + */ public class A8kFnFormula { public Float A;//015F public Float B;//0164 diff --git a/src/main/java/a8k/type/projecttype/a8kidcard/A8kIdCardFn.java b/src/main/java/a8k/service/db/type/a8kidcard/A8kIdCardFn.java similarity index 68% rename from src/main/java/a8k/type/projecttype/a8kidcard/A8kIdCardFn.java rename to src/main/java/a8k/service/db/type/a8kidcard/A8kIdCardFn.java index 5b1dd05..2113761 100644 --- a/src/main/java/a8k/type/projecttype/a8kidcard/A8kIdCardFn.java +++ b/src/main/java/a8k/service/db/type/a8kidcard/A8kIdCardFn.java @@ -1,20 +1,20 @@ -package a8k.type.projecttype.a8kidcard; +package a8k.service.db.type.a8kidcard; -import a8k.type.projecttype.A8kFnType; -import a8k.type.projecttype.A8kResultUnit; +import a8k.service.db.type.a8kidcard.zenum.A8kFnType; +import a8k.service.db.type.a8kidcard.zenum.A8kResultUnit; public class A8kIdCardFn { public A8kFnType fnType; // 非分段函数 - public Integer fnX; // 函数未知数是 0150 - public Float fnXMin; // 函数未知数下限闻值 0155 - public Float fnXMax; // 函数未知数上限闻值 015A + public Integer norFnX; // 函数未知数是 0150 + public Float norFnXMin; // 函数未知数下限闻值 0155 + public Float norFnXMax; // 函数未知数上限闻值 015A //血清函数系数 - public A8kFnFormula serumFn = new A8kFnFormula(); //015F + public A8kFnFormula norSerumFn = new A8kFnFormula(); //015F //全血函数系数 - public A8kFnFormula bloodFn = new A8kFnFormula(); //017D + public A8kFnFormula norBloodFn = new A8kFnFormula(); //017D // 分段函数 public Integer pwFnJudeX; // 分界判断数据来源 01F0 @@ -24,8 +24,10 @@ public class A8kIdCardFn { public Float pwFnXMin; // 函数未知数下限闻值 0204 public Float pwFnXMax; // 函数未知数上限闻值 0209 - public A8kPiecewiseFnFormula serumPiecewiseFn = new A8kPiecewiseFnFormula(); // 020E - public A8kPiecewiseFnFormula bloodPiecewiseFn = new A8kPiecewiseFnFormula(); // 0240 + // 血清分段函数系数 + public A8kPiecewiseFnFormula serumPiecewiseFn = new A8kPiecewiseFnFormula(); + // + public A8kPiecewiseFnFormula bloodPiecewiseFn = new A8kPiecewiseFnFormula(); // 结果 public A8kResultUnit ret1Unit; // 单位 02E0 diff --git a/src/main/java/a8k/service/db/type/a8kidcard/A8kIdCardProjectFormula.java b/src/main/java/a8k/service/db/type/a8kidcard/A8kIdCardProjectFormula.java new file mode 100644 index 0000000..c9c90af --- /dev/null +++ b/src/main/java/a8k/service/db/type/a8kidcard/A8kIdCardProjectFormula.java @@ -0,0 +1,11 @@ +package a8k.service.db.type.a8kidcard; + + +public class A8kIdCardProjectFormula { + // 项目头部信息 + public Integer projNum; // 当前项目是几联卡项目,val = 1,2,3 0x0100 + public A8kIdCardFn pj1FnInfo; + public A8kIdCardFn pj2FnInfo; + public A8kIdCardFn pj3FnInfo; + +} diff --git a/src/main/java/a8k/type/projecttype/a8kidcard/A8kPiecewiseFnFormula.java b/src/main/java/a8k/service/db/type/a8kidcard/A8kPiecewiseFnFormula.java similarity index 78% rename from src/main/java/a8k/type/projecttype/a8kidcard/A8kPiecewiseFnFormula.java rename to src/main/java/a8k/service/db/type/a8kidcard/A8kPiecewiseFnFormula.java index ea4f88f..76884c0 100644 --- a/src/main/java/a8k/type/projecttype/a8kidcard/A8kPiecewiseFnFormula.java +++ b/src/main/java/a8k/service/db/type/a8kidcard/A8kPiecewiseFnFormula.java @@ -1,5 +1,8 @@ -package a8k.type.projecttype.a8kidcard; +package a8k.service.db.type.a8kidcard; +/** + * 分段函数 + */ public class A8kPiecewiseFnFormula { public Float A0; public Float B0; diff --git a/src/main/java/a8k/type/projecttype/A8kFnType.java b/src/main/java/a8k/service/db/type/a8kidcard/zenum/A8kFnType.java similarity index 87% rename from src/main/java/a8k/type/projecttype/A8kFnType.java rename to src/main/java/a8k/service/db/type/a8kidcard/zenum/A8kFnType.java index db10844..ec9f568 100644 --- a/src/main/java/a8k/type/projecttype/A8kFnType.java +++ b/src/main/java/a8k/service/db/type/a8kidcard/zenum/A8kFnType.java @@ -1,4 +1,4 @@ -package a8k.type.projecttype; +package a8k.service.db.type.a8kidcard.zenum; public enum A8kFnType { NormalFn(1),//正常函数 diff --git a/src/main/java/a8k/service/db/type/a8kidcard/zenum/A8kOptType.java b/src/main/java/a8k/service/db/type/a8kidcard/zenum/A8kOptType.java new file mode 100644 index 0000000..6879ea3 --- /dev/null +++ b/src/main/java/a8k/service/db/type/a8kidcard/zenum/A8kOptType.java @@ -0,0 +1,6 @@ +package a8k.service.db.type.a8kidcard.zenum; + +public enum A8kOptType { + Fopt, + Topt, +} diff --git a/src/main/java/a8k/type/projecttype/A8kReactionFlowType.java b/src/main/java/a8k/service/db/type/a8kidcard/zenum/A8kReactionFlowType.java similarity index 94% rename from src/main/java/a8k/type/projecttype/A8kReactionFlowType.java rename to src/main/java/a8k/service/db/type/a8kidcard/zenum/A8kReactionFlowType.java index 92ffac1..894d1f5 100644 --- a/src/main/java/a8k/type/projecttype/A8kReactionFlowType.java +++ b/src/main/java/a8k/service/db/type/a8kidcard/zenum/A8kReactionFlowType.java @@ -1,4 +1,4 @@ -package a8k.type.projecttype; +package a8k.service.db.type.a8kidcard.zenum; public enum A8kReactionFlowType { /** diff --git a/src/main/java/a8k/type/projecttype/A8kResultUnit.java b/src/main/java/a8k/service/db/type/a8kidcard/zenum/A8kResultUnit.java similarity index 96% rename from src/main/java/a8k/type/projecttype/A8kResultUnit.java rename to src/main/java/a8k/service/db/type/a8kidcard/zenum/A8kResultUnit.java index c2e937a..eeebc01 100644 --- a/src/main/java/a8k/type/projecttype/A8kResultUnit.java +++ b/src/main/java/a8k/service/db/type/a8kidcard/zenum/A8kResultUnit.java @@ -1,4 +1,4 @@ -package a8k.type.projecttype; +package a8k.service.db.type.a8kidcard.zenum; public enum A8kResultUnit { Original(0, "original"), diff --git a/src/main/java/a8k/service/db/type/a8kprojinfo/OptScanDirection.java b/src/main/java/a8k/service/db/type/a8kprojinfo/OptScanDirection.java new file mode 100644 index 0000000..0122719 --- /dev/null +++ b/src/main/java/a8k/service/db/type/a8kprojinfo/OptScanDirection.java @@ -0,0 +1,6 @@ +package a8k.service.db.type.a8kprojinfo; + +public enum OptScanDirection { + Forward,//正向 + Reverse,//反向 +} diff --git a/src/main/java/a8k/service/db/type/a8kprojinfo/PeakName.java b/src/main/java/a8k/service/db/type/a8kprojinfo/PeakName.java new file mode 100644 index 0000000..4ed521c --- /dev/null +++ b/src/main/java/a8k/service/db/type/a8kprojinfo/PeakName.java @@ -0,0 +1,9 @@ +package a8k.service.db.type.a8kprojinfo; + +public enum PeakName { + T4, + R, + H, + T, + C, +} diff --git a/src/main/java/a8k/service/apps/dbservice/type/appsetting/AppSettingName.java b/src/main/java/a8k/service/db/type/appsetting/AppSettingName.java similarity index 85% rename from src/main/java/a8k/service/apps/dbservice/type/appsetting/AppSettingName.java rename to src/main/java/a8k/service/db/type/appsetting/AppSettingName.java index 4d5f064..2f7c7ea 100644 --- a/src/main/java/a8k/service/apps/dbservice/type/appsetting/AppSettingName.java +++ b/src/main/java/a8k/service/db/type/appsetting/AppSettingName.java @@ -1,4 +1,4 @@ -package a8k.service.apps.dbservice.type.appsetting; +package a8k.service.db.type.appsetting; public enum AppSettingName { SETTING_PAGE_VERSION,// 用来更新配置项目 diff --git a/src/main/java/a8k/service/apps/dbservice/type/appsetting/AppSettingTab.java b/src/main/java/a8k/service/db/type/appsetting/AppSettingTab.java similarity index 68% rename from src/main/java/a8k/service/apps/dbservice/type/appsetting/AppSettingTab.java rename to src/main/java/a8k/service/db/type/appsetting/AppSettingTab.java index e7d2367..8a0c800 100644 --- a/src/main/java/a8k/service/apps/dbservice/type/appsetting/AppSettingTab.java +++ b/src/main/java/a8k/service/db/type/appsetting/AppSettingTab.java @@ -1,4 +1,4 @@ -package a8k.service.apps.dbservice.type.appsetting; +package a8k.service.db.type.appsetting; /** * 配置页面 diff --git a/src/main/java/a8k/service/apps/dbservice/type/appsetting/AppSettingType.java b/src/main/java/a8k/service/db/type/appsetting/AppSettingType.java similarity index 87% rename from src/main/java/a8k/service/apps/dbservice/type/appsetting/AppSettingType.java rename to src/main/java/a8k/service/db/type/appsetting/AppSettingType.java index b78b422..f3903c6 100644 --- a/src/main/java/a8k/service/apps/dbservice/type/appsetting/AppSettingType.java +++ b/src/main/java/a8k/service/db/type/appsetting/AppSettingType.java @@ -1,4 +1,4 @@ -package a8k.service.apps.dbservice.type.appsetting; +package a8k.service.db.type.appsetting; // // 配置类型 diff --git a/src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/AutoLogoutOption.java b/src/main/java/a8k/service/db/type/appsetting/settingenum/AutoLogoutOption.java similarity index 84% rename from src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/AutoLogoutOption.java rename to src/main/java/a8k/service/db/type/appsetting/settingenum/AutoLogoutOption.java index 1d1a5b7..416d4d5 100644 --- a/src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/AutoLogoutOption.java +++ b/src/main/java/a8k/service/db/type/appsetting/settingenum/AutoLogoutOption.java @@ -1,4 +1,4 @@ -package a8k.service.apps.dbservice.type.appsetting.settingenum; +package a8k.service.db.type.appsetting.settingenum; public enum AutoLogoutOption { T00_00, diff --git a/src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LISIFType.java b/src/main/java/a8k/service/db/type/appsetting/settingenum/LISIFType.java similarity index 81% rename from src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LISIFType.java rename to src/main/java/a8k/service/db/type/appsetting/settingenum/LISIFType.java index 69e623a..fb2a738 100644 --- a/src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LISIFType.java +++ b/src/main/java/a8k/service/db/type/appsetting/settingenum/LISIFType.java @@ -1,4 +1,4 @@ -package a8k.service.apps.dbservice.type.appsetting.settingenum; +package a8k.service.db.type.appsetting.settingenum; public enum LISIFType { SERIAL, diff --git a/src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LISProtocolEnum.java b/src/main/java/a8k/service/db/type/appsetting/settingenum/LISProtocolEnum.java similarity index 82% rename from src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LISProtocolEnum.java rename to src/main/java/a8k/service/db/type/appsetting/settingenum/LISProtocolEnum.java index 03770aa..8e9d4bb 100644 --- a/src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LISProtocolEnum.java +++ b/src/main/java/a8k/service/db/type/appsetting/settingenum/LISProtocolEnum.java @@ -1,4 +1,4 @@ -package a8k.service.apps.dbservice.type.appsetting.settingenum; +package a8k.service.db.type.appsetting.settingenum; public enum LISProtocolEnum { Boditech, Simens; diff --git a/src/main/java/a8k/service/db/type/appsetting/settingenum/LISSerialBaudrate.java b/src/main/java/a8k/service/db/type/appsetting/settingenum/LISSerialBaudrate.java new file mode 100644 index 0000000..5cfe329 --- /dev/null +++ b/src/main/java/a8k/service/db/type/appsetting/settingenum/LISSerialBaudrate.java @@ -0,0 +1,6 @@ +package a8k.service.db.type.appsetting.settingenum; + +public enum LISSerialBaudrate { + B9600, + B115200, +} diff --git a/src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LISTypeEnum.java b/src/main/java/a8k/service/db/type/appsetting/settingenum/LISTypeEnum.java similarity index 82% rename from src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LISTypeEnum.java rename to src/main/java/a8k/service/db/type/appsetting/settingenum/LISTypeEnum.java index 6ae8542..ff98fae 100644 --- a/src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LISTypeEnum.java +++ b/src/main/java/a8k/service/db/type/appsetting/settingenum/LISTypeEnum.java @@ -1,4 +1,4 @@ -package a8k.service.apps.dbservice.type.appsetting.settingenum; +package a8k.service.db.type.appsetting.settingenum; public enum LISTypeEnum { //单向，双向 diff --git a/src/main/java/a8k/service/db/type/appsetting/settingenum/LanguageType.java b/src/main/java/a8k/service/db/type/appsetting/settingenum/LanguageType.java new file mode 100644 index 0000000..0f0bb7a --- /dev/null +++ b/src/main/java/a8k/service/db/type/appsetting/settingenum/LanguageType.java @@ -0,0 +1,5 @@ +package a8k.service.db.type.appsetting.settingenum; + +public enum LanguageType { + zh_CN, en_US +} diff --git a/src/main/java/a8k/type/projecttype/A8kOptType.java b/src/main/java/a8k/type/projecttype/A8kOptType.java deleted file mode 100644 index 3e5d21f..0000000 --- a/src/main/java/a8k/type/projecttype/A8kOptType.java +++ /dev/null @@ -1,25 +0,0 @@ -package a8k.type.projecttype; - -public enum A8kOptType { - Auto(0), - FOpt(1), - TOpt(2), - FAndTOpt(3), - ; - - public final int code; - static final int max = 4; - - A8kOptType(int code) { - this.code = code; - } - - public static A8kOptType valueOf(int code) { - if (code < 0 || code >= max) { - return null; - } - return values()[code]; - } - - -} diff --git a/src/main/java/a8k/type/projecttype/A8kPiecewiseFnFormula.java b/src/main/java/a8k/type/projecttype/A8kPiecewiseFnFormula.java deleted file mode 100644 index 1078ac8..0000000 --- a/src/main/java/a8k/type/projecttype/A8kPiecewiseFnFormula.java +++ /dev/null @@ -1,10 +0,0 @@ -package a8k.type.projecttype; - -public class A8kPiecewiseFnFormula { - Double A; - Double B; - Double C; - Double D; - Double lowLimit; - Double upLimit; -} diff --git a/src/main/java/a8k/type/projecttype/A8kSupportSampleType.java b/src/main/java/a8k/type/projecttype/A8kSupportSampleType.java deleted file mode 100644 index 4edb932..0000000 --- a/src/main/java/a8k/type/projecttype/A8kSupportSampleType.java +++ /dev/null @@ -1,7 +0,0 @@ -package a8k.type.projecttype; - -public enum A8kSupportSampleType { - WholeBlood,//全血 - Serum,//血清和血浆 - WholeBloodAndSerum,//全血和血清和血浆 -} diff --git a/src/main/java/a8k/type/projecttype/IndependentVariableType.java b/src/main/java/a8k/type/projecttype/IndependentVariableType.java deleted file mode 100644 index 1427ce4..0000000 --- a/src/main/java/a8k/type/projecttype/IndependentVariableType.java +++ /dev/null @@ -1,16 +0,0 @@ -package a8k.type.projecttype; - -public enum IndependentVariableType { - Ratio(1),// T/C - ATR(2), // H/C - AntiRatio(3), // T/H - RFRatio(4),// R/C - RTRatio(4),// T/R - ; - - int val = 0; - IndependentVariableType(int val) { - this.val = val; - } - -} diff --git a/src/main/java/a8k/type/projecttype/SampleType.java b/src/main/java/a8k/type/projecttype/SampleType.java deleted file mode 100644 index beb9e1f..0000000 --- a/src/main/java/a8k/type/projecttype/SampleType.java +++ /dev/null @@ -1,9 +0,0 @@ -package a8k.type.projecttype; - -public enum SampleType { - Auto, //默认 - WholeBlood, //全血 - Serum, //血清 - ; - int value; -} diff --git a/src/main/java/a8k/type/projecttype/a8kidcard/A8kIdCardProjectFormula.java b/src/main/java/a8k/type/projecttype/a8kidcard/A8kIdCardProjectFormula.java deleted file mode 100644 index 68266f4..0000000 --- a/src/main/java/a8k/type/projecttype/a8kidcard/A8kIdCardProjectFormula.java +++ /dev/null @@ -1,16 +0,0 @@ -package a8k.type.projecttype.a8kidcard; - -import a8k.type.projecttype.A8kFnType; - -public class A8kIdCardProjectFormula { - // 项目头部信息 - public Integer projNum; // 当前项目是几联卡项目,val = 1,2,3 0x0100 -// public A8kFnType pj1CurveType; // 项目1 结果曲线是否为分段函数, 1=非分段函数，2=分段函数 0x0105 -// public A8kFnType pj2CurveType; // 项目2 结果曲线是否为分段函数 0x010A -// public A8kFnType pj3CurveType; // 项目3 结果曲线是否为分段函数 0x010F - - public A8kIdCardFn pj1FnInfo; - public A8kIdCardFn pj2FnInfo; - public A8kIdCardFn pj3FnInfo; - -} diff --git a/src/main/java/a8k/utils/A8kIdCardDataParser.java b/src/main/java/a8k/utils/A8kIdCardDataParser.java index d9d367e..84d3fd1 100644 --- a/src/main/java/a8k/utils/A8kIdCardDataParser.java +++ b/src/main/java/a8k/utils/A8kIdCardDataParser.java @@ -1,9 +1,9 @@ package a8k.utils; -import a8k.type.projecttype.A8kFnType; -import a8k.type.projecttype.A8kResultUnit; -import a8k.type.projecttype.a8kidcard.A8kIdCardFn; -import a8k.type.projecttype.a8kidcard.A8kIdCardInfo; +import a8k.service.db.type.a8kidcard.zenum.A8kFnType; +import a8k.service.db.type.a8kidcard.zenum.A8kResultUnit; +import a8k.service.db.type.a8kidcard.A8kIdCardFn; +import a8k.service.db.type.A8kIdCardInfo; import org.slf4j.Logger; import java.util.Date; @@ -53,19 +53,19 @@ public class A8kIdCardDataParser { idCardInfo.scanningRange = parseAsByte("idcard.scanningRange ", 0x0042); - idCardInfo.projFormula.projNum = parseAsIntFrom5Bytes("idcard.projFormula.pjNum ", 0x0100); + idCardInfo.projNum = parseAsIntFrom5Bytes("idcard.projFormula.pjNum ", 0x0100); A8kFnType pj1CurveType = parseAsA8kFnType("idcard.projFormula.pj1CurveType ", 0x0105); A8kFnType pj2CurveType = parseAsA8kFnType("idcard.projFormula.pj2CurveType ", 0x010A); A8kFnType pj3CurveType = parseAsA8kFnType("idcard.projFormula.pj3CurveType ", 0x010F); if (pj1CurveType != null) { - idCardInfo.projFormula.pj1FnInfo = parseAsIdCarFn(pj1CurveType, 0x0150); + idCardInfo.pj1FnInfo = parseAsIdCarFn(pj1CurveType, 0x0150); } if (pj2CurveType != null) { - idCardInfo.projFormula.pj2FnInfo = parseAsIdCarFn(pj1CurveType, 0x0330); + idCardInfo.pj2FnInfo = parseAsIdCarFn(pj1CurveType, 0x0330); } if (pj3CurveType != null) { - idCardInfo.projFormula.pj3FnInfo = parseAsIdCarFn(pj1CurveType, 0x0510); + idCardInfo.pj3FnInfo = parseAsIdCarFn(pj1CurveType, 0x0510); } return idCardInfo; } @@ -168,21 +168,21 @@ public class A8kIdCardDataParser { A8kIdCardFn ret = new A8kIdCardFn(); ret.fnType = fnType; Integer startoff = off; - ret.fnX = parseAsIntFrom5Bytes("ret.fnX ", startoff); //0x0150 - ret.fnXMin = parseAsDouble("ret.fnXMin ", startoff + 0x0005); - ret.fnXMax = parseAsDouble("ret.fnXMax ", startoff + 0x0005 * 2); - ret.serumFn.A = parseAsDouble("ret.serumFn.A ", startoff + 0x0005 * 3); - ret.serumFn.B = parseAsDouble("ret.serumFn.B ", startoff + 0x0005 * 4); - ret.serumFn.C = parseAsDouble("ret.serumFn.C ", startoff + 0x0005 * 5); - ret.serumFn.D = parseAsDouble("ret.serumFn.D ", startoff + 0x0005 * 6); - ret.serumFn.lowLimit = parseAsDouble("ret.serumFn.lowLimit", startoff + 0x0005 * 7); - ret.serumFn.upLimit = parseAsDouble("ret.serumFn.upLimit ", startoff + 0x0005 * 8); - ret.bloodFn.A = parseAsDouble("ret.bloodFn.A ", startoff + 0x0005 * 9); - ret.bloodFn.B = parseAsDouble("ret.bloodFn.B ", startoff + 0x0005 * 10); - ret.bloodFn.C = parseAsDouble("ret.bloodFn.C ", startoff + 0x0005 * 11); - ret.bloodFn.D = parseAsDouble("ret.bloodFn.D ", startoff + 0x0005 * 12); - ret.bloodFn.lowLimit = parseAsDouble("ret.bloodFn.lowLimit", startoff + 0x0005 * 13); - ret.bloodFn.upLimit = parseAsDouble("ret.bloodFn.upLimit ", startoff + 0x0005 * 14);//ok + ret.norFnX = parseAsIntFrom5Bytes("ret.fnX ", startoff); //0x0150 + ret.norFnXMin = parseAsDouble("ret.fnXMin ", startoff + 0x0005); + ret.norFnXMax = parseAsDouble("ret.fnXMax ", startoff + 0x0005 * 2); + ret.norSerumFn.A = parseAsDouble("ret.serumFn.A ", startoff + 0x0005 * 3); + ret.norSerumFn.B = parseAsDouble("ret.serumFn.B ", startoff + 0x0005 * 4); + ret.norSerumFn.C = parseAsDouble("ret.serumFn.C ", startoff + 0x0005 * 5); + ret.norSerumFn.D = parseAsDouble("ret.serumFn.D ", startoff + 0x0005 * 6); + ret.norSerumFn.lowLimit = parseAsDouble("ret.serumFn.lowLimit", startoff + 0x0005 * 7); + ret.norSerumFn.upLimit = parseAsDouble("ret.serumFn.upLimit ", startoff + 0x0005 * 8); + ret.norBloodFn.A = parseAsDouble("ret.bloodFn.A ", startoff + 0x0005 * 9); + ret.norBloodFn.B = parseAsDouble("ret.bloodFn.B ", startoff + 0x0005 * 10); + ret.norBloodFn.C = parseAsDouble("ret.bloodFn.C ", startoff + 0x0005 * 11); + ret.norBloodFn.D = parseAsDouble("ret.bloodFn.D ", startoff + 0x0005 * 12); + ret.norBloodFn.lowLimit = parseAsDouble("ret.bloodFn.lowLimit", startoff + 0x0005 * 13); + ret.norBloodFn.upLimit = parseAsDouble("ret.bloodFn.upLimit ", startoff + 0x0005 * 14);//ok //0x01F0 startoff = off + (0x01F0 - 0x0150); diff --git a/src/main/java/a8k/utils/AppExceptionBuilder.java b/src/main/java/a8k/utils/AppExceptionBuilder.java index 1c27f00..6376974 100644 --- a/src/main/java/a8k/utils/AppExceptionBuilder.java +++ b/src/main/java/a8k/utils/AppExceptionBuilder.java @@ -8,7 +8,7 @@ import a8k.type.exception.AppException; import jakarta.annotation.Resource; import org.slf4j.Logger; import org.springframework.stereotype.Component; -import a8k.service.apps.appdata.AppProjInfoMgrService; +import a8k.service.app.appdata.AppProjInfoMgrService; import java.util.List;