update

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;

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;

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<TubeHolderSetting> tubeHolderSettings     = new ArrayList<>();
+	List<TubeHolderSetting> tubeHolderSettings = new ArrayList<>();
 
+	//主流程控制状态
 	public MainFlowCtrlState mainFlowCtrlState = new MainFlowCtrlState();
 
 	public Boolean isDeviceInited() {

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

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);
+		}
+	}
 }

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;
+	}
+
 }

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;

src/main/java/a8k/service/bak_appbase/progress/EmergencySampleState.java → src/main/java/a8k/service/appstate/type/state/EmergencySampleState.java

@@ -1,4 +1,4 @@
-package a8k.service.bak_appbase.progress;
+package a8k.service.appstate.type.state;
 
 public enum EmergencySampleState {
 	IDLE,//

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,  //孵育完成
+}

src/main/java/a8k/service/bak_appbase/progress/TubeHolderProgress.java → src/main/java/a8k/service/appstate/type/state/TubeHolderProgress.java

@@ -1,4 +1,4 @@
-package a8k.service.bak_appbase.progress;
+package a8k.service.appstate.type.state;
 
 public enum TubeHolderProgress {
 	Idle, //空闲

src/main/java/a8k/service/bak_appbase/progress/TubeProcessState.java → src/main/java/a8k/service/appstate/type/state/TubeProcessState.java

@@ -1,4 +1,4 @@
-package a8k.service.bak_appbase.progress;
+package a8k.service.appstate.type.state;
 
 public enum TubeProcessState {
 	//

src/main/java/a8k/service/bak_appbase/progress/ReactionPlateProgress.java

@@ -1,17 +0,0 @@
-package a8k.service.bak_appbase.progress;
-
-//反应板条状态
-public enum ReactionPlateProgress {
-	//板夹仓中
-	InThePlateBox,
-	//等待滴液
-	WaitingForDrip,
-	//赋予中
-	Incubating,
-	//孵育完成
-	Incubated,
-	//孵育异常
-	IncubateError,
-	//板条码异常
-	PlateCodeError,
-}

src/main/java/a8k/service/bak_appbase/result/ReactionResult.java

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

src/main/java/a8k/type/appret/AppRet.java

@@ -9,7 +9,7 @@ import lombok.Getter;
 
 public class AppRet<T> {
 
-	public AppRetType appRetType = AppRetType.NORMAL;
+	AppRetType appRetType = AppRetType.SUCCESS;
 
 	// 错误信息
 	@Getter
@@ -43,7 +43,7 @@ public class AppRet<T> {
 
 	public static <T> AppRet<T> message(String message, T data) {
 		AppRet<T> 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<T> {
 	public static <T> AppRet<T> success(T data) {
 		AppRet<T> 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 <T> AppRet<T> success() {
 		AppRet<T> r = new AppRet<>();
-		r.appRetType = AppRetType.NORMAL;
+		r.appRetType = AppRetType.SUCCESS;
 		return r;
 	}
 

src/main/java/a8k/type/appret/AppRetType.java

@@ -1,7 +1,6 @@
 package a8k.type.appret;
 
 public enum AppRetType {
-	NORMAL,
+	SUCCESS,
 	FAILURE,
-	MESSAGE,
 }

src/main/java/a8k/type/sampleinfo/SampleInfo.java

@@ -1,6 +0,0 @@
-package a8k.type.sampleinfo;
-
-import a8k.type.type.BloodType;
-
-import java.util.List;
-