From 63a89c379a0897429340870916f9dba537769c50 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Fri, 4 Oct 2024 22:46:03 +0800 Subject: [PATCH] update --- .../AppEmergencySamplePosStateMgrService.java | 2 +- .../action/DO_SWITCH_TO_THE_NEXT_TUBE.java | 2 +- .../a8k/service/appstate/AppA8kGStateService.java | 10 +++----- .../appstate/type/EmergencyPosRunState.java | 5 +++- .../appstate/type/IncubationPlateStatus.java | 8 ++++++- .../service/appstate/type/ReactingPlateState.java | 27 +++++++++++++++------- .../java/a8k/service/appstate/type/TubeState.java | 2 +- .../appstate/type/state/EmergencySampleState.java | 8 +++++++ .../appstate/type/state/ReactionPlateState.java | 9 ++++++++ .../appstate/type/state/TubeHolderProgress.java | 7 ++++++ .../appstate/type/state/TubeProcessState.java | 10 ++++++++ .../bak_appbase/progress/EmergencySampleState.java | 8 ------- .../progress/ReactionPlateProgress.java | 17 -------------- .../bak_appbase/progress/TubeHolderProgress.java | 7 ------ .../bak_appbase/progress/TubeProcessState.java | 10 -------- .../service/bak_appbase/result/ReactionResult.java | 13 ----------- src/main/java/a8k/type/appret/AppRet.java | 8 +++---- src/main/java/a8k/type/appret/AppRetType.java | 3 +-- src/main/java/a8k/type/sampleinfo/SampleInfo.java | 6 ----- 19 files changed, 75 insertions(+), 87 deletions(-) create mode 100644 src/main/java/a8k/service/appstate/type/state/EmergencySampleState.java create mode 100644 src/main/java/a8k/service/appstate/type/state/ReactionPlateState.java create mode 100644 src/main/java/a8k/service/appstate/type/state/TubeHolderProgress.java create mode 100644 src/main/java/a8k/service/appstate/type/state/TubeProcessState.java delete mode 100644 src/main/java/a8k/service/bak_appbase/progress/EmergencySampleState.java delete mode 100644 src/main/java/a8k/service/bak_appbase/progress/ReactionPlateProgress.java delete mode 100644 src/main/java/a8k/service/bak_appbase/progress/TubeHolderProgress.java delete mode 100644 src/main/java/a8k/service/bak_appbase/progress/TubeProcessState.java delete mode 100644 src/main/java/a8k/service/bak_appbase/result/ReactionResult.java delete mode 100644 src/main/java/a8k/type/sampleinfo/SampleInfo.java diff --git a/src/main/java/a8k/service/appdevicectrl/AppEmergencySamplePosStateMgrService.java b/src/main/java/a8k/service/appdevicectrl/AppEmergencySamplePosStateMgrService.java index 275981b..862346a 100644 --- a/src/main/java/a8k/service/appdevicectrl/AppEmergencySamplePosStateMgrService.java +++ b/src/main/java/a8k/service/appdevicectrl/AppEmergencySamplePosStateMgrService.java @@ -7,7 +7,7 @@ import a8k.controler.extapi.utils.ExtApiTab; import a8k.hardware.type.a8kcanprotocol.A8kEcode; import a8k.service.appstate.AppA8kGStateService; import a8k.service.appstate.type.EmergencyPosRunState; -import a8k.service.bak_appbase.progress.EmergencySampleState; +import a8k.service.appstate.type.state.EmergencySampleState; import a8k.type.exception.AppException; import a8k.type.type.BloodType; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/service/appdevicectrl/action/DO_SWITCH_TO_THE_NEXT_TUBE.java b/src/main/java/a8k/service/appdevicectrl/action/DO_SWITCH_TO_THE_NEXT_TUBE.java index 14f2184..1272648 100644 --- a/src/main/java/a8k/service/appdevicectrl/action/DO_SWITCH_TO_THE_NEXT_TUBE.java +++ b/src/main/java/a8k/service/appdevicectrl/action/DO_SWITCH_TO_THE_NEXT_TUBE.java @@ -6,7 +6,7 @@ import a8k.service.appstate.type.TubeHolderState; import a8k.service.appstate.type.TubeState; import a8k.service.appstate.type.state.A8kWorkState; import a8k.service.appstate.type.state.TubeHolderProcessState; -import a8k.service.bak_appbase.progress.TubeProcessState; +import a8k.service.appstate.type.state.TubeProcessState; import a8k.service.devicedriver.ctrl.SampleScanTransportCtrl; import a8k.type.exception.AppException; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/service/appstate/AppA8kGStateService.java b/src/main/java/a8k/service/appstate/AppA8kGStateService.java index f27b77d..6e2fcca 100644 --- a/src/main/java/a8k/service/appstate/AppA8kGStateService.java +++ b/src/main/java/a8k/service/appstate/AppA8kGStateService.java @@ -1,10 +1,8 @@ package a8k.service.appstate; -import a8k.service.appdevicectrl.type.A8kEcodeContext; import a8k.service.appdevicectrl.type.app_consumables_mgr_service.ConsumableState; import a8k.service.appstate.type.*; import a8k.service.appstate.type.state.A8kWorkState; -import a8k.service.bak_appbase.progress.TubeHolderProgress; import a8k.type.tube_setting.TubeHolderSetting; import lombok.Data; import org.slf4j.Logger; @@ -19,8 +17,6 @@ import java.util.List; public class AppA8kGStateService { public static final Logger logger = LoggerFactory.getLogger(AppA8kGStateService.class); - public TubeHolderProgress tubeHolderProgress = TubeHolderProgress.Idle; - //温度 Integer temperature = 25; //设备是否初始化过 @@ -28,7 +24,6 @@ public class AppA8kGStateService { //设备工作状态标识位 A8kWorkState workState = A8kWorkState.IDLE; // - //当前正在被处理的试管架状态 TubeHolderState tubeHolderState = new TubeHolderState(); //急诊为状态 @@ -40,10 +35,11 @@ public class AppA8kGStateService { // //耗材状态 - ConsumableState consumableState = new ConsumableState(); + ConsumableState consumableState = new ConsumableState(); //试管配置 - List tubeHolderSettings = new ArrayList<>(); + List tubeHolderSettings = new ArrayList<>(); + //主流程控制状态 public MainFlowCtrlState mainFlowCtrlState = new MainFlowCtrlState(); public Boolean isDeviceInited() { diff --git a/src/main/java/a8k/service/appstate/type/EmergencyPosRunState.java b/src/main/java/a8k/service/appstate/type/EmergencyPosRunState.java index 4ea6bb8..00df162 100644 --- a/src/main/java/a8k/service/appstate/type/EmergencyPosRunState.java +++ b/src/main/java/a8k/service/appstate/type/EmergencyPosRunState.java @@ -1,11 +1,14 @@ package a8k.service.appstate.type; -import a8k.service.bak_appbase.progress.EmergencySampleState; +import a8k.service.appstate.type.state.EmergencySampleState; import a8k.type.type.BloodType; import java.util.ArrayList; import java.util.List; +/** + * 急诊位位置状态 + */ public class EmergencyPosRunState { public String userid = ""; //用户输入的样本ID，不做逻辑，只做展示 public String sampleBarcode = ""; //用于请求用户信息的条码ID diff --git a/src/main/java/a8k/service/appstate/type/IncubationPlateStatus.java b/src/main/java/a8k/service/appstate/type/IncubationPlateStatus.java index 8cfb593..eb6b8a3 100644 --- a/src/main/java/a8k/service/appstate/type/IncubationPlateStatus.java +++ b/src/main/java/a8k/service/appstate/type/IncubationPlateStatus.java @@ -1,5 +1,11 @@ package a8k.service.appstate.type; public class IncubationPlateStatus { - public ReactingPlateState[] plateStates = new ReactingPlateState[20]; + public ReactingPlateState[] plateStates = new ReactingPlateState[20]; + public Integer incubationPos = 0;//0->360,只做显示，不参与任何业务 + public IncubationPlateStatus() { + for (int i = 0; i < plateStates.length; i++) { + plateStates[i] = new ReactingPlateState(i); + } + } } diff --git a/src/main/java/a8k/service/appstate/type/ReactingPlateState.java b/src/main/java/a8k/service/appstate/type/ReactingPlateState.java index c45500e..c01d007 100644 --- a/src/main/java/a8k/service/appstate/type/ReactingPlateState.java +++ b/src/main/java/a8k/service/appstate/type/ReactingPlateState.java @@ -1,20 +1,31 @@ package a8k.service.appstate.type; -import a8k.service.bak_appbase.result.ReactionResult; -import a8k.service.bak_appbase.progress.ReactionPlateProgress; +import a8k.service.appstate.type.state.ReactionPlateState; +import a8k.type.type.BloodType; import java.util.Date; public class ReactingPlateState { - String uuid; - ReactionPlateProgress progress; //孵育盘状态 + //位置 + Integer index; - String sampleUUID; //样本UUID 系统自动生成 - String projectId; //项目id + //孵育时间 + public ReactionPlateState state; //孵育盘状态 - Integer incubationPos; //孵育盘中的位置 0->19 + //Info + public BloodType bloodType = BloodType.WHOLE_BLOOD; //血液类型 + public String sampleBarcode = ""; //用于请求用户信息的条码ID + public String userid = ""; //用户输入的样本ID，不做逻辑，只做展示 + public Integer projIndex = 0; //项目代码 + public String projName = ""; //项目名称 + + //孵育时间 Date startIncubatedTime; //开始孵育时间 Integer targetIncubatedTimeS; //目标孵育时间 - ReactionResult reactionResult; //反应结果 + public ReactingPlateState(Integer index) { + this.index = index; + this.state = ReactionPlateState.EMPTY; + } + } diff --git a/src/main/java/a8k/service/appstate/type/TubeState.java b/src/main/java/a8k/service/appstate/type/TubeState.java index 0baebe5..7e5645f 100644 --- a/src/main/java/a8k/service/appstate/type/TubeState.java +++ b/src/main/java/a8k/service/appstate/type/TubeState.java @@ -1,6 +1,6 @@ package a8k.service.appstate.type; -import a8k.service.bak_appbase.progress.TubeProcessState; +import a8k.service.appstate.type.state.TubeProcessState; import a8k.type.type.BloodType; import java.util.ArrayList; diff --git a/src/main/java/a8k/service/appstate/type/state/EmergencySampleState.java b/src/main/java/a8k/service/appstate/type/state/EmergencySampleState.java new file mode 100644 index 0000000..6e58342 --- /dev/null +++ b/src/main/java/a8k/service/appstate/type/state/EmergencySampleState.java @@ -0,0 +1,8 @@ +package a8k.service.appstate.type.state; + +public enum EmergencySampleState { + IDLE,// + PENDING,// + PROCESSING,// + FINISHED,// +} diff --git a/src/main/java/a8k/service/appstate/type/state/ReactionPlateState.java b/src/main/java/a8k/service/appstate/type/state/ReactionPlateState.java new file mode 100644 index 0000000..3f1027b --- /dev/null +++ b/src/main/java/a8k/service/appstate/type/state/ReactionPlateState.java @@ -0,0 +1,9 @@ +package a8k.service.appstate.type.state; + +//反应板条状态 +public enum ReactionPlateState { + EMPTY,//板夹仓中 + WAITING_FOR_DROP,//等待滴液 + INCUBATING, //孵育中 + INCUBATED, //孵育完成 +} diff --git a/src/main/java/a8k/service/appstate/type/state/TubeHolderProgress.java b/src/main/java/a8k/service/appstate/type/state/TubeHolderProgress.java new file mode 100644 index 0000000..10cb8fa --- /dev/null +++ b/src/main/java/a8k/service/appstate/type/state/TubeHolderProgress.java @@ -0,0 +1,7 @@ +package a8k.service.appstate.type.state; + +public enum TubeHolderProgress { + Idle, //空闲 + Processing, //处理中 + Scaning, //处理中 +} diff --git a/src/main/java/a8k/service/appstate/type/state/TubeProcessState.java b/src/main/java/a8k/service/appstate/type/state/TubeProcessState.java new file mode 100644 index 0000000..642cc2d --- /dev/null +++ b/src/main/java/a8k/service/appstate/type/state/TubeProcessState.java @@ -0,0 +1,10 @@ +package a8k.service.appstate.type.state; + +public enum TubeProcessState { + // + TO_BE_PROCESSED,//待处理 + PRE_PROCESSING, //预处理 + PROCESSING,//预处理 + POST_PROCESSING, //后处理 + PROCESS_COMPLETE,//处理完成 +} diff --git a/src/main/java/a8k/service/bak_appbase/progress/EmergencySampleState.java b/src/main/java/a8k/service/bak_appbase/progress/EmergencySampleState.java deleted file mode 100644 index 8a18320..0000000 --- a/src/main/java/a8k/service/bak_appbase/progress/EmergencySampleState.java +++ /dev/null @@ -1,8 +0,0 @@ -package a8k.service.bak_appbase.progress; - -public enum EmergencySampleState { - IDLE,// - PENDING,// - PROCESSING,// - FINISHED,// -} diff --git a/src/main/java/a8k/service/bak_appbase/progress/ReactionPlateProgress.java b/src/main/java/a8k/service/bak_appbase/progress/ReactionPlateProgress.java deleted file mode 100644 index d450b86..0000000 --- a/src/main/java/a8k/service/bak_appbase/progress/ReactionPlateProgress.java +++ /dev/null @@ -1,17 +0,0 @@ -package a8k.service.bak_appbase.progress; - -//反应板条状态 -public enum ReactionPlateProgress { - //板夹仓中 - InThePlateBox, - //等待滴液 - WaitingForDrip, - //赋予中 - Incubating, - //孵育完成 - Incubated, - //孵育异常 - IncubateError, - //板条码异常 - PlateCodeError, -} diff --git a/src/main/java/a8k/service/bak_appbase/progress/TubeHolderProgress.java b/src/main/java/a8k/service/bak_appbase/progress/TubeHolderProgress.java deleted file mode 100644 index de0dca4..0000000 --- a/src/main/java/a8k/service/bak_appbase/progress/TubeHolderProgress.java +++ /dev/null @@ -1,7 +0,0 @@ -package a8k.service.bak_appbase.progress; - -public enum TubeHolderProgress { - Idle, //空闲 - Processing, //处理中 - Scaning, //处理中 -} diff --git a/src/main/java/a8k/service/bak_appbase/progress/TubeProcessState.java b/src/main/java/a8k/service/bak_appbase/progress/TubeProcessState.java deleted file mode 100644 index 7da110e..0000000 --- a/src/main/java/a8k/service/bak_appbase/progress/TubeProcessState.java +++ /dev/null @@ -1,10 +0,0 @@ -package a8k.service.bak_appbase.progress; - -public enum TubeProcessState { - // - TO_BE_PROCESSED,//待处理 - PRE_PROCESSING, //预处理 - PROCESSING,//预处理 - POST_PROCESSING, //后处理 - PROCESS_COMPLETE,//处理完成 -} diff --git a/src/main/java/a8k/service/bak_appbase/result/ReactionResult.java b/src/main/java/a8k/service/bak_appbase/result/ReactionResult.java deleted file mode 100644 index 1c7026f..0000000 --- a/src/main/java/a8k/service/bak_appbase/result/ReactionResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package a8k.service.bak_appbase.result; - -public class ReactionResult { - - public Boolean result0Error; - public Boolean result1Error; - public Boolean result2Error; - - public String result0; - public String result1; - public String result2; - -} diff --git a/src/main/java/a8k/type/appret/AppRet.java b/src/main/java/a8k/type/appret/AppRet.java index 20d8f9c..374e80f 100644 --- a/src/main/java/a8k/type/appret/AppRet.java +++ b/src/main/java/a8k/type/appret/AppRet.java @@ -9,7 +9,7 @@ import lombok.Getter; public class AppRet { - public AppRetType appRetType = AppRetType.NORMAL; + AppRetType appRetType = AppRetType.SUCCESS; // 错误信息 @Getter @@ -43,7 +43,7 @@ public class AppRet { public static AppRet message(String message, T data) { AppRet r = new AppRet<>(); - r.appRetType = AppRetType.MESSAGE; + r.appRetType = AppRetType.SUCCESS; r.message = message; r.dataType = null == data ? null : data.getClass().getSimpleName(); return r; @@ -52,14 +52,14 @@ public class AppRet { public static AppRet success(T data) { AppRet r = new AppRet<>(); r.data = data; - r.appRetType = AppRetType.NORMAL; + r.appRetType = AppRetType.SUCCESS; r.dataType = null == data ? null : data.getClass().getSimpleName(); return r; } public static AppRet success() { AppRet r = new AppRet<>(); - r.appRetType = AppRetType.NORMAL; + r.appRetType = AppRetType.SUCCESS; return r; } diff --git a/src/main/java/a8k/type/appret/AppRetType.java b/src/main/java/a8k/type/appret/AppRetType.java index 01f5c7b..447dcf9 100644 --- a/src/main/java/a8k/type/appret/AppRetType.java +++ b/src/main/java/a8k/type/appret/AppRetType.java @@ -1,7 +1,6 @@ package a8k.type.appret; public enum AppRetType { - NORMAL, + SUCCESS, FAILURE, - MESSAGE, } diff --git a/src/main/java/a8k/type/sampleinfo/SampleInfo.java b/src/main/java/a8k/type/sampleinfo/SampleInfo.java deleted file mode 100644 index 5303397..0000000 --- a/src/main/java/a8k/type/sampleinfo/SampleInfo.java +++ /dev/null @@ -1,6 +0,0 @@ -package a8k.type.sampleinfo; - -import a8k.type.type.BloodType; - -import java.util.List; -