Browse Source

update

tags/v0
zhaohe 10 months ago
parent
commit
eae0b3ac22
  1. 6
      src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_TUBE.java
  2. 4
      src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/PLATE_OPT_SCAN.java
  3. 4
      src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java
  4. 6
      src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java
  5. 4
      src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java
  6. 4
      src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java
  7. 4
      src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ4_PRE_PROCESS.java
  8. 6
      src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ5_PROCESS.java
  9. 6
      src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ6_POST_PROCESS.java
  10. 6
      src/main/java/a8k/service/apps/appdata/AppReactionResultMgrService.java
  11. 4
      src/main/java/a8k/service/apps/appstate/EmergencySamplePosStateMgrService.java
  12. 3
      src/main/java/a8k/service/apps/appstate/TubeProcessStateMgrService.java
  13. 4
      src/main/java/a8k/service/apps/appstate/TubeStateMgrService.java

6
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_TUBE.java

@ -7,7 +7,7 @@ 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.TubeProcessContextMgrService;
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;
@ -42,7 +42,7 @@ public class DO_PROCESS_ERROR_TUBE extends A8kStepAction {
@Resource
OptScanModuleStateMgrService optScanModuleStateMgrService;
@Resource
TubeProcessContextMgrService tubeProcessContextMgrService;
TubeStateMgrService tubeStateMgrService;
MainFlowCtrlState mfcs;
@ -65,7 +65,7 @@ public class DO_PROCESS_ERROR_TUBE extends A8kStepAction {
logger.info("复位HBOT");
//复位HBOT
OS.forceSleep(4000);
tubeProcessContextMgrService.setCurTubeState(TubeState.PROCESS_COMPLETE);
tubeStateMgrService.setCurTubeState(TubeState.PROCESS_COMPLETE);
}
@Override public Boolean checkCondition() {

4
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/PLATE_OPT_SCAN.java

@ -7,7 +7,7 @@ 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.TubeProcessContextMgrService;
import a8k.service.apps.appstate.TubeStateMgrService;
import a8k.service.apps.appstate.resource.A8kPublicResourceType;
import a8k.service.apps.appstate.type.MainFlowCtrlState;
@ -42,7 +42,7 @@ public class PLATE_OPT_SCAN extends A8kStepAction {
@Resource
OptScanModuleStateMgrService optScanModuleStateMgrService;
@Resource
TubeProcessContextMgrService tubeProcessContextMgrService;
TubeStateMgrService tubeStateMgrService;
@Resource
AppReactionResultMgrService appReactionResultMgrService;

4
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java

@ -7,7 +7,7 @@ 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.TubeProcessContextMgrService;
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;
@ -41,7 +41,7 @@ public class PROCESS_INCUBATE_COMPLETED_PLATE extends A8kStepAction {
@Resource
OptScanModuleStateMgrService optScanModuleStateMgrService;
@Resource
TubeProcessContextMgrService tubeProcessContextMgrService;
TubeStateMgrService tubeStateMgrService;
MainFlowCtrlState mfcs;

6
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java

@ -9,7 +9,7 @@ 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.TubeProcessContextMgrService;
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;
@ -71,7 +71,7 @@ public class SEQ1_ENTER_TUBEHOLDER_AND_SCAN extends A8kStepAction {
@Resource
TubeSettingMgrService tubeSettingMgrService;
@Resource
TubeProcessContextMgrService tubeProcessContextMgrService;
TubeStateMgrService tubeStateMgrService;
SampleScanResult scanTubeHodler() throws AppException {
@ -209,7 +209,7 @@ public class SEQ1_ENTER_TUBEHOLDER_AND_SCAN extends A8kStepAction {
}
logger.info("将样本信息写入数据库");
tubeProcessContextMgrService.createNewTubeContexts(state.tubes);
tubeStateMgrService.createNewTubeContexts(state.tubes);
logger.info("更新试管架状态");
gstate.setTubeHolder(state);

4
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java

@ -39,7 +39,7 @@ public class SEQ2_SWITCH_TO_THE_NEXT_TUBE extends A8kStepAction {
@Resource
SampleScanTransportCtrl sstc;
@Resource
TubeProcessContextMgrService tubeProcessContextMgrService;
TubeStateMgrService tubeStateMgrService;
@Resource
CondtionMgrService cms;
@ -93,7 +93,7 @@ public class SEQ2_SWITCH_TO_THE_NEXT_TUBE extends A8kStepAction {
sstc.moveTubeToPreProcessPos(nextTubeIndex);
}
tubeProcessContextMgrService.pendingTube(nextProcessTube);
tubeStateMgrService.pendingTube(nextProcessTube);
}
@Override public Boolean checkCondition() {

4
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java

@ -51,7 +51,7 @@ public class SEQ3_APPLAY_RESOURCE extends A8kStepAction {
@Resource
AppProjInfoMgrService appProjInfoMgrService; //项目信息管理
@Resource
TubeProcessContextMgrService tubeProcessContextMgrService;
TubeStateMgrService tubeStateMgrService;
@Resource
CondtionMgrService cms;
@ -112,7 +112,7 @@ public class SEQ3_APPLAY_RESOURCE extends A8kStepAction {
tipPos.add(tips);
}
//创建项目处理上下文
tubeProcessContextMgrService.setTubeResourceIsReady(a8kIdCardInfo, consumables, tipPos, incubatorPoss);
tubeStateMgrService.setTubeResourceIsReady(a8kIdCardInfo, consumables, tipPos, incubatorPoss);
logger.info("apply resource ok");
}

4
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ4_PRE_PROCESS.java

@ -63,7 +63,7 @@ public class SEQ4_PRE_PROCESS extends A8kStepAction {
AppExceptionBuilder ebuilder;
@Resource
TubeProcessContextMgrService tubeProcessContextMgrService;
TubeStateMgrService tubeStateMgrService;
@Resource
ReactionPlatesTransmitCtrl reactionPlatesTransmitCtrl;
@ -195,7 +195,7 @@ public class SEQ4_PRE_PROCESS extends A8kStepAction {
throw ebuilder.buildMutiErrorAppException(errors);
}
tubeProcessContextMgrService.setCurTubeState(TubeState.PRE_PROCESSED);
tubeStateMgrService.setCurTubeState(TubeState.PRE_PROCESSED);
incubationPlateMgrService.waitingForDrop(tube);
logger.info("pre process success");
}

6
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ5_PROCESS.java

@ -41,7 +41,7 @@ public class SEQ5_PROCESS extends A8kStepAction {
AppExceptionBuilder ebuilder;
@Resource
TubeProcessContextMgrService tubeProcessContextMgrService;
TubeStateMgrService tubeStateMgrService;
@Resource
IncubationPlateMgrService incubationPlateMgrService;
@ -63,10 +63,10 @@ public class SEQ5_PROCESS extends A8kStepAction {
// 2.取tip头
// 3.摇匀脱帽
//
tubeProcessContextMgrService.setCurTubeState(TubeState.PROCESSING);
tubeStateMgrService.setCurTubeState(TubeState.PROCESSING);
Tube tube = gstate.getCurProcessingTube();
OS.forceSleep(3000);
tubeProcessContextMgrService.setCurTubeState(TubeState.PROCESSED);
tubeStateMgrService.setCurTubeState(TubeState.PROCESSED);
incubationPlateMgrService.startIncubating(tube, 60 * 2);
logger.info("pre process success");
}

6
src/main/java/a8k/service/apps/appctrl/mainflowctrl/action/SEQ6_POST_PROCESS.java

@ -41,7 +41,7 @@ public class SEQ6_POST_PROCESS extends A8kStepAction {
AppExceptionBuilder ebuilder;
@Resource
TubeProcessContextMgrService tubeProcessContextMgrService;
TubeStateMgrService tubeStateMgrService;
@Resource
IncubationPlateMgrService incubationPlateMgrService;
@ -61,10 +61,10 @@ public class SEQ6_POST_PROCESS extends A8kStepAction {
}
@Override public void doaction() throws AppException {
tubeProcessContextMgrService.setCurTubeState(TubeState.POST_PROCESSING);
tubeStateMgrService.setCurTubeState(TubeState.POST_PROCESSING);
Tube tube = gstate.getCurProcessingTube();
OS.forceSleep(3000);
tubeProcessContextMgrService.setCurTubeState(TubeState.POST_PROCESSED);
tubeStateMgrService.setCurTubeState(TubeState.POST_PROCESSED);
}
@Override public Boolean checkCondition() {

6
src/main/java/a8k/service/apps/appdata/AppReactionResultMgrService.java

@ -6,7 +6,7 @@ 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.TubeProcessContextMgrService;
import a8k.service.apps.appstate.TubeStateMgrService;
import a8k.service.apps.appstate.type.ProjProcessContext;
import a8k.service.apps.appstate.type.TubeProcessContext;
import a8k.type.ReactionResult;
@ -29,7 +29,7 @@ public class AppReactionResultMgrService {
ReactionRecordDBService reactionRecordDBService;
@Resource
TubeProcessContextMgrService tubeProcessContextMgrService;
TubeStateMgrService tubeStateMgrService;
@Resource
AppUserMgrService appUserMgrService;
@ -48,7 +48,7 @@ public class AppReactionResultMgrService {
public void addRecord(ProjProcessContext projContext, ReactionResult... reactionResults) {
ReactionResultRecord record = new ReactionResultRecord();
TubeProcessContext tubeContext = tubeProcessContextMgrService.getTubeContext(projContext.sampleId);
TubeProcessContext tubeContext = tubeStateMgrService.getTubeContext(projContext.sampleId);
String operator = appUserMgrService.getLoginUsr() != null ? appUserMgrService.getLoginUsr().account : "UNLOGIN";

4
src/main/java/a8k/service/apps/appstate/EmergencySamplePosStateMgrService.java

@ -21,7 +21,7 @@ public class EmergencySamplePosStateMgrService {
GStateService gstate;
@Resource
TubeProcessContextMgrService tubeProcessContextMgrService;
TubeStateMgrService tubeStateMgrService;
/**
* 提交紧急样本设置
@ -47,7 +47,7 @@ public class EmergencySamplePosStateMgrService {
tube.projIndex.add(Integer.parseInt(index));
}
tube.state = TubeState.TO_BE_PROCESSED;
tubeProcessContextMgrService.createNewEmergencyTubeContext(tube);
tubeStateMgrService.createNewEmergencyTubeContext(tube);
} else {
throw new AppException(A8kEcode.EmergencySampleIsProcessing);
}

3
src/main/java/a8k/service/apps/appstate/TubeProcessStateMgrService.java

@ -1,3 +0,0 @@

4
src/main/java/a8k/service/apps/appstate/TubeProcessContextMgrService.java → src/main/java/a8k/service/apps/appstate/TubeStateMgrService.java

@ -22,7 +22,7 @@ import java.util.UUID;
import a8k.service.apps.dbservice.SampleRecordDBService;
@Component
public class TubeProcessContextMgrService {
public class TubeStateMgrService {
@Resource
@ -162,6 +162,4 @@ public class TubeProcessContextMgrService {
tube.state = TubeState.PENDING;
gstate.curProcessingTube = tube;
}
}
Loading…
Cancel
Save