Browse Source

update

tags/v0
zhaohe 10 months ago
parent
commit
5ce6a70551
  1. BIN
      app.db
  2. 3
      src/main/java/a8k/SpringBootBeanUtil.java
  3. 2
      src/main/java/a8k/extapi_controler/ExtApiControler.java
  4. 2
      src/main/java/a8k/extapi_controler/utils/EnginnerParamReader.java
  5. 10
      src/main/java/a8k/service/app/appctrl/AppDeviceCtrlService.java
  6. 12
      src/main/java/a8k/service/app/appctrl/ConsumablesScanService.java
  7. 4
      src/main/java/a8k/service/app/appctrl/DeviceInitCtrlService.java
  8. 22
      src/main/java/a8k/service/app/appctrl/MainFlowCtrlService.java
  9. 4
      src/main/java/a8k/service/app/appctrl/TubeSettingMgrService.java
  10. 16
      src/main/java/a8k/service/app/appctrl/mainflowctrl/CondtionMgrService.java
  11. 16
      src/main/java/a8k/service/app/appctrl/mainflowctrl/MainFlowCtrlScheduler.java
  12. 22
      src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_CLEAR_ERROR_BEFORE_WORK.java
  13. 16
      src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_PAUSE.java
  14. 22
      src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_PLATE.java
  15. 25
      src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_TUBE.java
  16. 16
      src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_RESUME.java
  17. 18
      src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_START.java
  18. 16
      src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_STOP.java
  19. 22
      src/main/java/a8k/service/app/appctrl/mainflowctrl/action/PLATE_OPT_SCAN.java
  20. 24
      src/main/java/a8k/service/app/appctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java
  21. 24
      src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java
  22. 22
      src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java
  23. 46
      src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java
  24. 26
      src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ4_PRE_PROCESS.java
  25. 18
      src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ5_PROCESS.java
  26. 18
      src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ6_POST_PROCESS.java
  27. 20
      src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ7_EJECT_TUBEHOLDER.java
  28. 2
      src/main/java/a8k/service/app/appctrl/mainflowctrl/base/A8kActionStepType.java
  29. 2
      src/main/java/a8k/service/app/appctrl/mainflowctrl/base/A8kErrorContext.java
  30. 4
      src/main/java/a8k/service/app/appctrl/mainflowctrl/base/A8kStepAction.java
  31. 22
      src/main/java/a8k/service/app/appdata/AppProjInfoMgrService.java
  32. 14
      src/main/java/a8k/service/app/appdata/AppReactionResultMgrService.java
  33. 8
      src/main/java/a8k/service/app/appdata/AppUserMgrService.java
  34. 2
      src/main/java/a8k/service/app/appdata/UtilsProjectColorAllocer.java
  35. 14
      src/main/java/a8k/service/app/appsetting/AppSettingsMgr.java
  36. 4
      src/main/java/a8k/service/app/appstate/ConsumablesMgrService.java
  37. 8
      src/main/java/a8k/service/app/appstate/EmergencySamplePosStateMgrService.java
  38. 8
      src/main/java/a8k/service/app/appstate/GStateService.java
  39. 10
      src/main/java/a8k/service/app/appstate/IncubationPlateMgrService.java
  40. 12
      src/main/java/a8k/service/app/appstate/OptScanModuleStateMgrService.java
  41. 4
      src/main/java/a8k/service/app/appstate/ResourceMgrService.java
  42. 16
      src/main/java/a8k/service/app/appstate/TubeStateMgrService.java
  43. 2
      src/main/java/a8k/service/app/appstate/resource/A8kPublicResourceType.java
  44. 2
      src/main/java/a8k/service/app/appstate/type/EmergencyTubePos.java
  45. 3
      src/main/java/a8k/service/app/appstate/type/IncubationPlate.java
  46. 4
      src/main/java/a8k/service/app/appstate/type/IncubationSubTank.java
  47. 6
      src/main/java/a8k/service/app/appstate/type/MainFlowCtrlState.java
  48. 4
      src/main/java/a8k/service/app/appstate/type/OptScanModule.java
  49. 4
      src/main/java/a8k/service/app/appstate/type/ProjProcessContext.java
  50. 4
      src/main/java/a8k/service/app/appstate/type/Tube.java
  51. 6
      src/main/java/a8k/service/app/appstate/type/TubeHolder.java
  52. 2
      src/main/java/a8k/service/app/appstate/type/TubeProcessContext.java
  53. 2
      src/main/java/a8k/service/app/appstate/type/state/A8kWorkState.java
  54. 2
      src/main/java/a8k/service/app/appstate/type/state/IncubationSubTankState.java
  55. 2
      src/main/java/a8k/service/app/appstate/type/state/OptScanModuleState.java
  56. 2
      src/main/java/a8k/service/app/appstate/type/state/TubeHolderProgress.java
  57. 2
      src/main/java/a8k/service/app/appstate/type/state/TubeHolderState.java
  58. 2
      src/main/java/a8k/service/app/appstate/type/state/TubeState.java
  59. 8
      src/main/java/a8k/service/app/devicedriver/calibration/PositionCalibration.java
  60. 6
      src/main/java/a8k/service/app/devicedriver/commonctrl/HardwareCommonCtrl.java
  61. 6
      src/main/java/a8k/service/app/devicedriver/ctrl/ConsumablesScanCtrl.java
  62. 6
      src/main/java/a8k/service/app/devicedriver/ctrl/HbotControlService.java
  63. 2
      src/main/java/a8k/service/app/devicedriver/ctrl/PipetteGunCtrlService.java
  64. 8
      src/main/java/a8k/service/app/devicedriver/ctrl/ReactionPlatesTransmitCtrl.java
  65. 4
      src/main/java/a8k/service/app/devicedriver/ctrl/SampleScanTransportCtrl.java
  66. 8
      src/main/java/a8k/service/app/devicedriver/ctrl/SamplesPreProcesCtrl.java
  67. 2
      src/main/java/a8k/service/app/devicedriver/param/DebugParam.java
  68. 2
      src/main/java/a8k/service/app/devicedriver/param/Hbot2DCodeScanPos.java
  69. 2
      src/main/java/a8k/service/app/devicedriver/param/PosParam.java
  70. 2
      src/main/java/a8k/service/app/devicedriver/param/SampleTransportParam.java
  71. 2
      src/main/java/a8k/service/app/devicedriver/param/TimeParam.java
  72. 2
      src/main/java/a8k/service/app/devicedriver/status/DeviceStatus.java
  73. 16
      src/main/java/a8k/service/app/devicedriver/testscript/TestScript.java
  74. 5
      src/main/java/a8k/service/apps/appstate/condtion/A8kCondition.java
  75. 6
      src/main/java/a8k/service/apps/appstate/condtion/CondtionFn.java
  76. 50
      src/main/java/a8k/service/apps/dbservice/A8kPresetProjInfoDBService.java
  77. 13
      src/main/java/a8k/service/apps/dbservice/type/A8kPresetProjInfo.java
  78. 6
      src/main/java/a8k/service/apps/dbservice/type/UsrRole.java
  79. 6
      src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LISSerialBaudrate.java
  80. 5
      src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LanguageType.java
  81. 3
      src/main/java/a8k/service/bases/AppFrontEndEventRouter.java
  82. 2
      src/main/java/a8k/service/bases/appevent/A8kEcodeContextListPromptEvent.java
  83. 2
      src/main/java/a8k/service/bases/appevent/AppIDCardMountEvent.java
  84. 2
      src/main/java/a8k/service/bases/appevent/DoA8kStepActionEvent.java
  85. 6
      src/main/java/a8k/service/db/A8kProjIdCardDBService.java
  86. 52
      src/main/java/a8k/service/db/A8kProjInfoDBService.java
  87. 10
      src/main/java/a8k/service/db/AppSettingDBService.java
  88. 6
      src/main/java/a8k/service/db/AppUsrDBService.java
  89. 2
      src/main/java/a8k/service/db/HardwareServiceSetting.java
  90. 4
      src/main/java/a8k/service/db/ReactionRecordDBService.java
  91. 6
      src/main/java/a8k/service/db/SampleRecordDBService.java
  92. 23
      src/main/java/a8k/service/db/type/A8kIdCardInfo.java
  93. 66
      src/main/java/a8k/service/db/type/A8kProjectInfo.java
  94. 8
      src/main/java/a8k/service/db/type/AppSetting.java
  95. 2
      src/main/java/a8k/service/db/type/AppUser.java
  96. 2
      src/main/java/a8k/service/db/type/ReactionResultRecord.java
  97. 2
      src/main/java/a8k/service/db/type/SampleRecord.java
  98. 6
      src/main/java/a8k/service/db/type/UsrRole.java
  99. 5
      src/main/java/a8k/service/db/type/a8kidcard/A8kFnFormula.java
  100. 22
      src/main/java/a8k/service/db/type/a8kidcard/A8kIdCardFn.java

BIN
app.db

3
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 + "========");
}
/**

2
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;

2
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;

10
src/main/java/a8k/service/apps/appctrl/AppDeviceCtrlService.java → 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;

12
src/main/java/a8k/service/apps/appctrl/ConsumablesScanService.java → 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;

4
src/main/java/a8k/service/apps/appctrl/DeviceInitCtrlService.java → 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;

22
src/main/java/a8k/service/apps/appctrl/MainFlowCtrlService.java → 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;

4
src/main/java/a8k/service/apps/appctrl/TubeSettingMgrService.java → 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;

16
src/main/java/a8k/service/apps/appctrl/mainflowctrl/CondtionMgrService.java → 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;

16
src/main/java/a8k/service/apps/appctrl/mainflowctrl/MainFlowCtrlScheduler.java → 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;

22
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_CLEAR_ERROR_BEFORE_WORK.java → 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;

16
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_PAUSE.java → 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;

22
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_PLATE.java → 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;

25
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_TUBE.java → 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;

16
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_RESUME.java → 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;

18
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_START.java → 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;

16
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_STOP.java → 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;

22
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/PLATE_OPT_SCAN.java → 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;

24
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java → 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;

24
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java → 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;

22
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java → 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;

46
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java → 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<A8kProjectInfo> projInfos = new ArrayList<>();
for (Consumable consumable : consumables) {
A8kProjectInfo projInfo = appProjInfoMgrService.getProjInfoByProjIndex(consumable.projIndex);
assert projInfo != null;
projInfos.add(projInfo);
}
//申请tip头
List<List<TipPos>> tipPos = new ArrayList<>();
for (int i = 0; i < projs.size(); i++) {
List<TipPos> tips = consumablesMgrService.takeTip(a8kIdCardInfo.get(i).reactionFlowType);
List<TipPos> tips = consumablesMgrService.takeTip(projInfos.get(i).reactionFlowType);
assert tips != null;
tipPos.add(tips);
}

26
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ4_PRE_PROCESS.java → 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;

18
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ5_PROCESS.java → 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;

18
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ6_POST_PROCESS.java → 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;

20
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ7_EJECT_TUBEHOLDER.java → 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;

2
src/main/java/a8k/service/apps/appctrl/mainflowctrl/base/A8kActionStepType.java → 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,//启动

2
src/main/java/a8k/service/apps/appctrl/mainflowctrl/base/A8kErrorContext.java → 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;

4
src/main/java/a8k/service/apps/appctrl/mainflowctrl/base/A8kStepAction.java → 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;

22
src/main/java/a8k/service/apps/appdata/AppProjInfoMgrService.java → 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;
}

14
src/main/java/a8k/service/apps/appdata/AppReactionResultMgrService.java → 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;

8
src/main/java/a8k/service/apps/appdata/AppUserMgrService.java → 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;

2
src/main/java/a8k/service/apps/appdata/UtilsProjectColorAllocer.java → 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;

14
src/main/java/a8k/service/apps/appsetting/AppSettingsMgr.java → 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;

4
src/main/java/a8k/service/apps/appstate/ConsumablesMgrService.java → 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;

8
src/main/java/a8k/service/apps/appstate/EmergencySamplePosStateMgrService.java → 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;

8
src/main/java/a8k/service/apps/appstate/GStateService.java → 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;

10
src/main/java/a8k/service/apps/appstate/IncubationPlateMgrService.java → 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;

12
src/main/java/a8k/service/apps/appstate/OptScanModuleStateMgrService.java → 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;

4
src/main/java/a8k/service/apps/appstate/ResourceMgrService.java → 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;

16
src/main/java/a8k/service/apps/appstate/TubeStateMgrService.java → 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 {

2
src/main/java/a8k/service/apps/appstate/resource/A8kPublicResourceType.java → 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,//样本平移电机

2
src/main/java/a8k/service/apps/appstate/type/EmergencyTubePos.java → 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;
/**
* 急诊位位置状态

3
src/main/java/a8k/service/apps/appstate/type/IncubationPlate.java → 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++) {

4
src/main/java/a8k/service/apps/appstate/type/IncubationSubTank.java → 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;

6
src/main/java/a8k/service/apps/appstate/type/MainFlowCtrlState.java → 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;

4
src/main/java/a8k/service/apps/appstate/type/OptScanModule.java → 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 {

4
src/main/java/a8k/service/apps/appstate/type/ProjProcessContext.java → 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;

4
src/main/java/a8k/service/apps/appstate/type/Tube.java → 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;

6
src/main/java/a8k/service/apps/appstate/type/TubeHolder.java → 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 {

2
src/main/java/a8k/service/apps/appstate/type/TubeProcessContext.java → 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;

2
src/main/java/a8k/service/apps/appstate/type/state/A8kWorkState.java → 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,

2
src/main/java/a8k/service/apps/appstate/type/state/IncubationSubTankState.java → 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 {

2
src/main/java/a8k/service/apps/appstate/type/state/OptScanModuleState.java → 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,

2
src/main/java/a8k/service/apps/appstate/type/state/TubeHolderProgress.java → 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, //空闲

2
src/main/java/a8k/service/apps/appstate/type/state/TubeHolderState.java → 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, //没有试管架

2
src/main/java/a8k/service/apps/appstate/type/state/TubeState.java → 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;

8
src/main/java/a8k/service/apps/devicedriver/calibration/PositionCalibration.java → 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;

6
src/main/java/a8k/service/apps/devicedriver/commonctrl/HardwareCommonCtrl.java → 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;

6
src/main/java/a8k/service/apps/devicedriver/ctrl/ConsumablesScanCtrl.java → 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;

6
src/main/java/a8k/service/apps/devicedriver/ctrl/HbotControlService.java → 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.*;

2
src/main/java/a8k/service/apps/devicedriver/ctrl/PipetteGunCtrlService.java → 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;

8
src/main/java/a8k/service/apps/devicedriver/ctrl/ReactionPlatesTransmitCtrl.java → 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;

4
src/main/java/a8k/service/apps/devicedriver/ctrl/SampleScanTransportCtrl.java → 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;

8
src/main/java/a8k/service/apps/devicedriver/ctrl/SamplesPreProcesCtrl.java → 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;

2
src/main/java/a8k/service/apps/devicedriver/param/DebugParam.java → 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;

2
src/main/java/a8k/service/apps/devicedriver/param/Hbot2DCodeScanPos.java → 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.*;

2
src/main/java/a8k/service/apps/devicedriver/param/PosParam.java → 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;

2
src/main/java/a8k/service/apps/devicedriver/param/SampleTransportParam.java → 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;

2
src/main/java/a8k/service/apps/devicedriver/param/TimeParam.java → 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;

2
src/main/java/a8k/service/apps/devicedriver/status/DeviceStatus.java → 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;

16
src/main/java/a8k/service/apps/devicedriver/testscript/TestScript.java → 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;

5
src/main/java/a8k/service/apps/appstate/condtion/A8kCondition.java

@ -1,5 +0,0 @@
package a8k.service.apps.appstate.condtion;
public enum A8kCondition {
}

6
src/main/java/a8k/service/apps/appstate/condtion/CondtionFn.java

@ -1,6 +0,0 @@
package a8k.service.apps.appstate.condtion;
@FunctionalInterface
public interface CondtionFn {
Boolean isTrigger();
}

50
src/main/java/a8k/service/apps/dbservice/A8kPresetProjInfoDBService.java

@ -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<A8kPresetProjInfo> 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;
}
}

13
src/main/java/a8k/service/apps/dbservice/type/A8kPresetProjInfo.java

@ -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; //反应温度
}

6
src/main/java/a8k/service/apps/dbservice/type/UsrRole.java

@ -1,6 +0,0 @@
package a8k.service.apps.dbservice.type;
public enum UsrRole {
Usr,
Admin
}

6
src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LISSerialBaudrate.java

@ -1,6 +0,0 @@
package a8k.service.apps.dbservice.type.appsetting.settingenum;
public enum LISSerialBaudrate {
B9600,
B115200,
}

5
src/main/java/a8k/service/apps/dbservice/type/appsetting/settingenum/LanguageType.java

@ -1,5 +0,0 @@
package a8k.service.apps.dbservice.type.appsetting.settingenum;
public enum LanguageType {
zh_CN, en_US
}

3
src/main/java/a8k/service/apps/appdata/AppFrontEndEventRouter.java → 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;

2
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;

2
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;

2
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;

6
src/main/java/a8k/service/apps/dbservice/A8kProjIdCardDBService.java → 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;

52
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<A8kProjectInfo> 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);
}
}

10
src/main/java/a8k/service/apps/dbservice/AppSettingDBService.java → 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;

6
src/main/java/a8k/service/apps/dbservice/AppUsrDBService.java → 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;

2
src/main/java/a8k/service/apps/dbservice/HardwareServiceSetting.java → 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;

4
src/main/java/a8k/service/apps/dbservice/ReactionRecordDBService.java → 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;

6
src/main/java/a8k/service/apps/dbservice/SampleRecordDBService.java → 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;

23
src/main/java/a8k/type/projecttype/a8kidcard/A8kIdCardInfo.java → 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();

66
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<PeakName> subProj0_peakNames; //峰的名称
public List<Integer> 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<PeakName> subProj1_peakNames; //峰的名称
public List<Integer> 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<PeakName> subProj2_peakNames; //峰的名称
public List<Integer> subProj2_peakPos; //峰的位置
}

8
src/main/java/a8k/service/apps/dbservice/type/AppSetting.java → 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;

2
src/main/java/a8k/service/apps/dbservice/type/AppUser.java → 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;

2
src/main/java/a8k/service/apps/dbservice/type/ReactionResultRecord.java → 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;

2
src/main/java/a8k/service/apps/dbservice/type/SampleRecord.java → 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;

6
src/main/java/a8k/service/db/type/UsrRole.java

@ -0,0 +1,6 @@
package a8k.service.db.type;
public enum UsrRole {
Usr,
Admin
}

5
src/main/java/a8k/type/projecttype/a8kidcard/A8kFnFormula.java → 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

22
src/main/java/a8k/type/projecttype/a8kidcard/A8kIdCardFn.java → 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

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save