update

src/main/java/a8k/OS.java

@@ -1,8 +1,5 @@
 package a8k;
 
-import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
-import a8k.app.type.exception.AppException;
-
 public class OS {
 	public static void hsleep(int ms) {
 		forceSleep(ms);

src/main/java/a8k/app/a8kproj/A8kIdCardDataParseService.java

@@ -1,18 +1,18 @@
 package a8k.app.a8kproj;
 
+import a8k.app.dao.db.ProjectBaseInfoDao;
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.app.a8ktype.opttype.A8kOptX;
-import a8k.app.service.dao.ProjectBaseInfoDao;
-import a8k.app.service.dao.type.ProjectBaseInfo;
-import a8k.app.service.dao.type.a8kidcard.A8kNormalFn;
-import a8k.app.service.dao.type.a8kidcard.A8kPiecewiseFn;
-import a8k.app.service.dao.type.a8kidcard.A8kResultBuilderFn;
-import a8k.app.service.dao.type.a8kidcard.zenum.A8kFnType;
-import a8k.app.service.dao.type.a8kidcard.zenum.A8kResultUnit;
-import a8k.app.service.dao.type.a8kidcard.A8kOptFnFormula;
-import a8k.app.service.dao.type.ProjExtInfoCard;
-import a8k.app.type.ecode.AppError;
-import a8k.app.type.exception.AppException;
+import a8k.app.dao.db.type.ProjectBaseInfo;
+import a8k.app.dao.db.type.a8kidcard.*;
+import a8k.app.dao.db.type.a8kidcard.A8kPiecewiseFn;
+import a8k.app.dao.db.type.a8kidcard.A8kResultBuilderFn;
+import a8k.app.dao.db.type.a8kidcard.zenum.A8kFnType;
+import a8k.app.dao.db.type.a8kidcard.zenum.A8kResultUnit;
+import a8k.app.dao.db.type.a8kidcard.A8kOptFnFormula;
+import a8k.app.dao.db.type.ProjExtInfoCard;
+import a8k.app.a8ktype.error.AppError;
+import a8k.app.a8ktype.exception.AppException;
 import a8k.app.utils.ZDateUtils;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;

src/main/java/a8k/app/a8kproj/A8kReactionResultComputer.java

@@ -5,14 +5,14 @@ import a8k.app.a8kproj.optanalyzer.A8kOptXGetter;
 import a8k.app.a8kproj.optanalyzer.OptChecker;
 import a8k.app.a8kproj.optanalyzer.context.OptAnalyzeContext;
 import a8k.app.a8kproj.optanalyzer.exception.A8kOptProcessException;
-import a8k.app.service.app.appstate.type.SampleInfo;
-import a8k.app.service.dao.type.a8kidcard.A8kNormalFn;
-import a8k.app.service.dao.type.a8kidcard.A8kOptFnFormula;
-import a8k.app.service.dao.type.a8kidcard.A8kPiecewiseFn;
-import a8k.app.service.dao.type.a8kidcard.A8kResultBuilderFn;
-import a8k.app.service.dao.type.a8kidcard.zenum.A8kFnType;
-import a8k.app.type.ReactionResult;
-import a8k.app.type.reaction_result_type.ReactionResultStatus;
+import a8k.app.a8ktype.state.SampleInfo;
+import a8k.app.dao.db.type.a8kidcard.A8kNormalFn;
+import a8k.app.dao.db.type.a8kidcard.A8kOptFnFormula;
+import a8k.app.dao.db.type.a8kidcard.A8kPiecewiseFn;
+import a8k.app.dao.db.type.a8kidcard.A8kResultBuilderFn;
+import a8k.app.dao.db.type.a8kidcard.zenum.A8kFnType;
+import a8k.app.a8ktype.type.ReactionResult;
+import a8k.app.a8ktype.opttype.ReactionResultStatus;
 import a8k.app.utils.ProjInfo;
 import a8k.app.utils.ProjInfoUtils;
 import lombok.extern.slf4j.Slf4j;

src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_01_FLOW1.java

@@ -1,7 +1,7 @@
 package a8k.app.a8kproj.fakeproj;
 
 
-import a8k.app.service.dao.type.a8kidcard.zenum.A8kReactionFlowType;
+import a8k.app.dao.db.type.a8kidcard.zenum.A8kReactionFlowType;
 
 public class FAKE_PROJ_01_FLOW1 extends FakeProjInfo {
 	public FAKE_PROJ_01_FLOW1() {

src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_02_FLOW2.java

@@ -1,7 +1,7 @@
 package a8k.app.a8kproj.fakeproj;
 
 
-import a8k.app.service.dao.type.a8kidcard.zenum.A8kReactionFlowType;
+import a8k.app.dao.db.type.a8kidcard.zenum.A8kReactionFlowType;
 
 public class FAKE_PROJ_02_FLOW2 extends FakeProjInfo {
 	public FAKE_PROJ_02_FLOW2() {

src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_03.java

@@ -1,7 +1,7 @@
 package a8k.app.a8kproj.fakeproj;
 
 
-import a8k.app.service.dao.type.a8kidcard.zenum.A8kReactionFlowType;
+import a8k.app.dao.db.type.a8kidcard.zenum.A8kReactionFlowType;
 
 public class FAKE_PROJ_03 extends FakeProjInfo {
 	public FAKE_PROJ_03() {

src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_04.java

@@ -1,7 +1,7 @@
 package a8k.app.a8kproj.fakeproj;
 
 
-import a8k.app.service.dao.type.a8kidcard.zenum.A8kReactionFlowType;
+import a8k.app.dao.db.type.a8kidcard.zenum.A8kReactionFlowType;
 
 public class FAKE_PROJ_04 extends FakeProjInfo {
 	public FAKE_PROJ_04() {

src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_05.java

@@ -1,7 +1,7 @@
 package a8k.app.a8kproj.fakeproj;
 
 
-import a8k.app.service.dao.type.a8kidcard.zenum.A8kReactionFlowType;
+import a8k.app.dao.db.type.a8kidcard.zenum.A8kReactionFlowType;
 
 public class FAKE_PROJ_05 extends FakeProjInfo {
 	public FAKE_PROJ_05() {

src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_06.java

@@ -1,7 +1,7 @@
 package a8k.app.a8kproj.fakeproj;
 
 
-import a8k.app.service.dao.type.a8kidcard.zenum.A8kReactionFlowType;
+import a8k.app.dao.db.type.a8kidcard.zenum.A8kReactionFlowType;
 
 public class FAKE_PROJ_06 extends FakeProjInfo {
 	public FAKE_PROJ_06() {

src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_07_EXPIRED.java

@@ -1,7 +1,7 @@
 package a8k.app.a8kproj.fakeproj;
 
 
-import a8k.app.service.dao.type.a8kidcard.zenum.A8kReactionFlowType;
+import a8k.app.dao.db.type.a8kidcard.zenum.A8kReactionFlowType;
 
 public class FAKE_PROJ_07_EXPIRED extends FakeProjInfo {
 	public FAKE_PROJ_07_EXPIRED() {

src/main/java/a8k/app/a8kproj/fakeproj/FakeProjInfo.java

@@ -1,10 +1,10 @@
 package a8k.app.a8kproj.fakeproj;
 
-import a8k.app.service.dao.type.ProjExtInfoCard;
-import a8k.app.service.dao.type.ProjOptInfo;
-import a8k.app.service.dao.type.ProjectBaseInfo;
-import a8k.app.service.dao.type.a8kidcard.zenum.A8kOptType;
-import a8k.app.service.dao.type.a8kidcard.zenum.A8kReactionFlowType;
+import a8k.app.dao.db.type.ProjExtInfoCard;
+import a8k.app.dao.db.type.ProjOptInfo;
+import a8k.app.dao.db.type.ProjectBaseInfo;
+import a8k.app.dao.db.type.a8kidcard.zenum.A8kOptType;
+import a8k.app.dao.db.type.a8kidcard.zenum.A8kReactionFlowType;
 import a8k.app.utils.ZDateUtils;
 
 import java.util.ArrayList;

src/main/java/a8k/app/a8kproj/fakeproj/FakeProjInfoFactory.java

@@ -1,9 +1,9 @@
 package a8k.app.a8kproj.fakeproj;
 
 
-import a8k.app.service.dao.type.ProjExtInfoCard;
-import a8k.app.service.dao.type.ProjOptInfo;
-import a8k.app.service.dao.type.ProjectBaseInfo;
+import a8k.app.dao.db.type.ProjExtInfoCard;
+import a8k.app.dao.db.type.ProjOptInfo;
+import a8k.app.dao.db.type.ProjectBaseInfo;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 

src/main/java/a8k/app/a8kproj/fakeprojcontext/FakeProjInfoContextFactory.java

@@ -1,18 +1,18 @@
 package a8k.app.a8kproj.fakeprojcontext;
 
 import a8k.app.a8ktype.opttype.A8kOptX;
-import a8k.app.service.app.appdata.UtilsProjectColorAllocer;
-import a8k.app.service.dao.type.ProjExtInfoCard;
-import a8k.app.service.dao.type.ProjOptInfo;
-import a8k.app.service.dao.type.ProjectBaseInfo;
-import a8k.app.service.dao.type.a8kidcard.A8kNormalFn;
-import a8k.app.service.dao.type.a8kidcard.A8kOptFnFormula;
-import a8k.app.service.dao.type.a8kidcard.A8kPiecewiseFn;
-import a8k.app.service.dao.type.a8kidcard.A8kResultBuilderFn;
-import a8k.app.service.dao.type.a8kidcard.zenum.A8kFnType;
-import a8k.app.service.dao.type.a8kidcard.zenum.A8kOptType;
-import a8k.app.service.dao.type.a8kidcard.zenum.A8kReactionFlowType;
-import a8k.app.service.dao.type.a8kidcard.zenum.A8kResultUnit;
+import a8k.app.service.data.UtilsProjectColorAllocer;
+import a8k.app.dao.db.type.ProjExtInfoCard;
+import a8k.app.dao.db.type.ProjOptInfo;
+import a8k.app.dao.db.type.ProjectBaseInfo;
+import a8k.app.dao.db.type.a8kidcard.A8kNormalFn;
+import a8k.app.dao.db.type.a8kidcard.A8kOptFnFormula;
+import a8k.app.dao.db.type.a8kidcard.A8kPiecewiseFn;
+import a8k.app.dao.db.type.a8kidcard.A8kResultBuilderFn;
+import a8k.app.dao.db.type.a8kidcard.zenum.A8kFnType;
+import a8k.app.dao.db.type.a8kidcard.zenum.A8kOptType;
+import a8k.app.dao.db.type.a8kidcard.zenum.A8kReactionFlowType;
+import a8k.app.dao.db.type.a8kidcard.zenum.A8kResultUnit;
 import a8k.app.utils.ProjInfo;
 import a8k.app.utils.ZDateUtils;
 

src/main/java/a8k/app/a8kproj/optalgo/A8kOptAlgoV2.java

@@ -6,8 +6,8 @@ import a8k.app.a8kproj.optanalyzer.PeakDivisionComputer;
 import a8k.app.a8kproj.optanalyzer.PeakNameAssigner;
 import a8k.app.a8ktype.opttype.PeakDivision;
 import a8k.app.a8ktype.opttype.PeakName;
-import a8k.app.service.dao.type.ProjOptInfo;
-import a8k.app.service.dao.type.ProjectBaseInfo;
+import a8k.app.dao.db.type.ProjOptInfo;
+import a8k.app.dao.db.type.ProjectBaseInfo;
 import lombok.extern.slf4j.Slf4j;
 
 

src/main/java/a8k/app/a8kproj/optalgo/type/OptScanResult.java

@@ -1,6 +1,6 @@
 package a8k.app.a8kproj.optalgo.type;
 
-import a8k.app.service.dao.type.OptRawScanData;
+import a8k.app.dao.db.type.OptRawScanData;
 
 public class OptScanResult {
 	public OptRawScanData      rawData;

src/main/java/a8k/app/a8kproj/optanalyzer/A8kOptXGetter.java

@@ -4,8 +4,8 @@ import a8k.app.a8kproj.optalgo.type.OptAlgoAnalysResult;
 import a8k.app.a8kproj.optanalyzer.exception.A8kOptProcessException;
 import a8k.app.a8ktype.opttype.A8kOptX;
 import a8k.app.a8ktype.opttype.PeakDivision;
-import a8k.app.service.dao.type.ProjOptInfo;
-import a8k.app.type.reaction_result_type.ReactionResultStatus;
+import a8k.app.dao.db.type.ProjOptInfo;
+import a8k.app.a8ktype.opttype.ReactionResultStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/a8k/app/a8kproj/optanalyzer/OptChecker.java

@@ -5,7 +5,7 @@ import a8k.app.a8kproj.optalgo.type.PeakFindState;
 import a8k.app.a8kproj.optanalyzer.exception.A8kOptProcessException;
 import a8k.app.a8ktype.opttype.PeakDivision;
 import a8k.app.a8ktype.opttype.PeakName;
-import a8k.app.type.reaction_result_type.ReactionResultStatus;
+import a8k.app.a8ktype.opttype.ReactionResultStatus;
 
 public class OptChecker {
 

src/main/java/a8k/app/a8kproj/optanalyzer/context/OptAnalyzeContext.java

@@ -1,7 +1,7 @@
 package a8k.app.a8kproj.optanalyzer.context;
 
-import a8k.app.service.app.appstate.type.SampleInfo;
-import a8k.app.service.dao.type.ProjOptInfo;
+import a8k.app.a8ktype.state.SampleInfo;
+import a8k.app.dao.db.type.ProjOptInfo;
 import a8k.app.utils.ProjInfo;
 
 public class OptAnalyzeContext {

src/main/java/a8k/app/a8kproj/optanalyzer/exception/A8kOptProcessException.java

@@ -1,6 +1,6 @@
 package a8k.app.a8kproj.optanalyzer.exception;
 
-import a8k.app.type.reaction_result_type.ReactionResultStatus;
+import a8k.app.a8ktype.opttype.ReactionResultStatus;
 
 public class A8kOptProcessException extends Exception {
 	public ReactionResultStatus status   = ReactionResultStatus.SUCCESS;

src/main/java/a8k/app/service/bases/appevent/A8kCanBusOnConnectEvent.java → src/main/java/a8k/app/a8ktype/appevent/A8kCanBusOnConnectEvent.java

@@ -1,4 +1,4 @@
-package a8k.app.service.bases.appevent;
+package a8k.app.a8ktype.appevent;
 
 public class A8kCanBusOnConnectEvent extends AppEvent {
 	public A8kCanBusOnConnectEvent() {

src/main/java/a8k/app/service/bases/appevent/A8kEcodeContextListPromptEvent.java → src/main/java/a8k/app/a8ktype/appevent/A8kEcodeContextListPromptEvent.java

@@ -1,6 +1,6 @@
-package a8k.app.service.bases.appevent;
+package a8k.app.a8ktype.appevent;
 
-import a8k.app.service.app.appctrl.mainflowctrl.base.AppActionErrorContext;
+import a8k.app.service.mainctrl.mainflowctrl.base.AppActionErrorContext;
 import a8k.app.utils.ZList;
 
 import java.util.List;

src/main/java/a8k/app/service/bases/appevent/A8kErrorsPromptEvent.java → src/main/java/a8k/app/a8ktype/appevent/A8kErrorsPromptEvent.java

@@ -1,7 +1,7 @@
-package a8k.app.service.bases.appevent;
+package a8k.app.a8ktype.appevent;
 
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
-import a8k.app.type.ecode.AppError;
+import a8k.app.a8ktype.error.AppError;
 import a8k.app.utils.ZList;
 
 import java.util.List;

src/main/java/a8k/app/service/bases/appevent/A8kHardwareReport.java → src/main/java/a8k/app/a8ktype/appevent/A8kHardwareReport.java

@@ -1,4 +1,4 @@
-package a8k.app.service.bases.appevent;
+package a8k.app.a8ktype.appevent;
 
 import a8k.app.hardware.type.a8kcanprotocol.A8kPacket;
 import org.springframework.lang.NonNull;

src/main/java/a8k/app/service/bases/appevent/AppEvent.java → src/main/java/a8k/app/a8ktype/appevent/AppEvent.java

@@ -1,7 +1,6 @@
-package a8k.app.service.bases.appevent;
+package a8k.app.a8ktype.appevent;
 
 import java.util.Date;
-import java.util.UUID;
 
 public class AppEvent {
 	public String  typeName;

src/main/java/a8k/app/service/bases/appevent/AppExceptionEvent.java → src/main/java/a8k/app/a8ktype/appevent/AppExceptionEvent.java

@@ -1,4 +1,4 @@
-package a8k.app.service.bases.appevent;
+package a8k.app.a8ktype.appevent;
 
 public class AppExceptionEvent extends AppEvent {
 	public Exception exception;

src/main/java/a8k/app/service/bases/appevent/AppIDCardMountEvent.java → src/main/java/a8k/app/a8ktype/appevent/AppIDCardMountEvent.java

@@ -1,8 +1,8 @@
-package a8k.app.service.bases.appevent;
+package a8k.app.a8ktype.appevent;
 
 
-import a8k.app.service.dao.type.A8kProjInfoCardBreif;
-import a8k.app.service.dao.type.ProjExtInfoCard;
+import a8k.app.dao.db.type.A8kProjInfoCardBreif;
+import a8k.app.dao.db.type.ProjExtInfoCard;
 
 public class AppIDCardMountEvent extends AppEvent {
 	public A8kProjInfoCardBreif projectInfo;

src/main/java/a8k/app/service/bases/appevent/AppIDCardUnmountEvent.java → src/main/java/a8k/app/a8ktype/appevent/AppIDCardUnmountEvent.java

@@ -1,4 +1,4 @@
-package a8k.app.service.bases.appevent;
+package a8k.app.a8ktype.appevent;
 
 public class AppIDCardUnmountEvent extends AppEvent {
 	public AppIDCardUnmountEvent() {

src/main/java/a8k/app/service/bases/appevent/AppPromptEvents.java → src/main/java/a8k/app/a8ktype/appevent/AppPromptEvents.java

@@ -1,6 +1,6 @@
-package a8k.app.service.bases.appevent;
+package a8k.app.a8ktype.appevent;
 
-import a8k.app.type.ui.ZAppPromopt;
+import a8k.app.a8ktype.ui.ZAppPromopt;
 
 import java.util.List;
 

src/main/java/a8k/app/service/bases/appevent/AppTubeholderSettingUpdateEvent.java → src/main/java/a8k/app/a8ktype/appevent/AppTubeholderSettingUpdateEvent.java

@@ -1,4 +1,4 @@
-package a8k.app.service.bases.appevent;
+package a8k.app.a8ktype.appevent;
 
 /**
  * 试管架配置被后端更新事件

src/main/java/a8k/app/service/bases/appevent/AppWarningNotifyEvent.java → src/main/java/a8k/app/a8ktype/appevent/AppWarningNotifyEvent.java

@@ -1,7 +1,7 @@
-package a8k.app.service.bases.appevent;
+package a8k.app.a8ktype.appevent;
 
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
-import a8k.app.type.ecode.AppError;
+import a8k.app.a8ktype.error.AppError;
 
 public class AppWarningNotifyEvent extends AppEvent {
 	public AppError error;

src/main/java/a8k/app/service/bases/appevent/DoA8kStepActionEvent.java → src/main/java/a8k/app/a8ktype/appevent/DoA8kStepActionEvent.java

@@ -1,7 +1,7 @@
-package a8k.app.service.bases.appevent;
+package a8k.app.a8ktype.appevent;
 
 import a8k.app.i18n.Internationalization;
-import a8k.app.service.app.appctrl.mainflowctrl.base.A8kActionStepType;
+import a8k.app.service.mainctrl.mainflowctrl.base.A8kActionStepType;
 
 public class DoA8kStepActionEvent extends AppEvent {
 	public A8kActionStepType actionStep;

src/main/java/a8k/app/type/db/CommonPage.java → src/main/java/a8k/app/a8ktype/db/CommonPage.java

@@ -1,4 +1,4 @@
-package a8k.app.type.db;
+package a8k.app.a8ktype.db;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/a8k/app/type/type/A8kTubeHolderType.java → src/main/java/a8k/app/a8ktype/device/A8kTubeHolderType.java

@@ -1,4 +1,4 @@
-package a8k.app.type.type;
+package a8k.app.a8ktype.device;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

src/main/java/a8k/app/type/type/BloodType.java → src/main/java/a8k/app/a8ktype/device/BloodType.java

@@ -1,4 +1,4 @@
-package a8k.app.type.type;
+package a8k.app.a8ktype.device;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

src/main/java/a8k/app/type/pos/Consumable.java → src/main/java/a8k/app/a8ktype/device/Consumable.java

@@ -1,6 +1,5 @@
-package a8k.app.type.pos;
+package a8k.app.a8ktype.device;
 
-import a8k.app.a8ktype.device.ConsumableGroup;
 import lombok.Getter;
 
 import java.io.Serializable;

src/main/java/a8k/app/type/LittleBottleConsumableType.java → src/main/java/a8k/app/a8ktype/device/LittleBottleConsumableType.java

@@ -1,4 +1,4 @@
-package a8k.app.type;
+package a8k.app.a8ktype.device;
 
 public enum LittleBottleConsumableType {
 	BufferSolution, //缓冲液

src/main/java/a8k/app/type/cfg/Pos2d.java → src/main/java/a8k/app/a8ktype/device/Pos2d.java

@@ -1,4 +1,4 @@
-package a8k.app.type.cfg;
+package a8k.app.a8ktype.device;
 
 public class Pos2d {
 

src/main/java/a8k/app/type/cfg/Pos3d.java → src/main/java/a8k/app/a8ktype/device/Pos3d.java

@@ -1,4 +1,4 @@
-package a8k.app.type.cfg;
+package a8k.app.a8ktype.device;
 
 public class Pos3d {
 	public Integer x = 0;

src/main/java/a8k/app/type/type/SupportBloodType.java → src/main/java/a8k/app/a8ktype/device/SupportBloodType.java

@@ -1,4 +1,4 @@
-package a8k.app.type.type;
+package a8k.app.a8ktype.device;
 
 //ID卡中的类型
 public enum SupportBloodType {

src/main/java/a8k/app/type/TipColumnNum.java → src/main/java/a8k/app/a8ktype/device/TipColumnNum.java

@@ -1,4 +1,4 @@
-package a8k.app.type;
+package a8k.app.a8ktype.device;
 
 public enum TipColumnNum {
 	Colu00,

src/main/java/a8k/app/type/pos/TipPos.java → src/main/java/a8k/app/a8ktype/device/TipPos.java

@@ -1,6 +1,4 @@
-package a8k.app.type.pos;
-
-import a8k.app.a8ktype.device.TipGroup;
+package a8k.app.a8ktype.device;
 
 import java.io.Serializable;
 

src/main/java/a8k/app/type/TipRowNum.java → src/main/java/a8k/app/a8ktype/device/TipRowNum.java

@@ -1,4 +1,4 @@
-package a8k.app.type;
+package a8k.app.a8ktype.device;
 
 public enum TipRowNum {
 	ROW00,

src/main/java/a8k/app/type/consumables/ConsumableState.java → src/main/java/a8k/app/a8ktype/device/consumables/ConsumableState.java

@@ -1,4 +1,4 @@
-package a8k.app.type.consumables;
+package a8k.app.a8ktype.device.consumables;
 
 import a8k.app.constant.AppConstant;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/a8k/app/type/consumables/LarBottleGroup.java → src/main/java/a8k/app/a8ktype/device/consumables/LarBottleGroup.java

@@ -1,4 +1,4 @@
-package a8k.app.type.consumables;
+package a8k.app.a8ktype.device.consumables;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

src/main/java/a8k/app/type/consumables/LittBottleGroup.java → src/main/java/a8k/app/a8ktype/device/consumables/LittBottleGroup.java

@@ -1,6 +1,6 @@
-package a8k.app.type.consumables;
+package a8k.app.a8ktype.device.consumables;
 
-import a8k.app.type.LittleBottleConsumableType;
+import a8k.app.a8ktype.device.LittleBottleConsumableType;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.io.Serializable;

src/main/java/a8k/app/type/consumables/ReactionPlateGroup.java → src/main/java/a8k/app/a8ktype/device/consumables/ReactionPlateGroup.java

@@ -1,4 +1,4 @@
-package a8k.app.type.consumables;
+package a8k.app.a8ktype.device.consumables;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

src/main/java/a8k/app/type/consumables/Tips.java → src/main/java/a8k/app/a8ktype/device/consumables/Tips.java

@@ -1,4 +1,4 @@
-package a8k.app.type.consumables;
+package a8k.app.a8ktype.device.consumables;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

src/main/java/a8k/app/type/ecode/AECodeError.java → src/main/java/a8k/app/a8ktype/error/AECodeError.java

@@ -1,10 +1,8 @@
-package a8k.app.type.ecode;
+package a8k.app.a8ktype.error;
 
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
-import a8k.app.type.exception.AppException;
 import a8k.app.utils.ZJsonHelper;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.v3.oas.annotations.media.Schema;
 
 public class AECodeError extends AppError {
 	@JsonIgnore

src/main/java/a8k/app/type/ecode/AEConsumeNotEnoughError.java → src/main/java/a8k/app/a8ktype/error/AEConsumeNotEnoughError.java

@@ -1,4 +1,4 @@
-package a8k.app.type.ecode;
+package a8k.app.a8ktype.error;
 
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/a8k/app/type/ecode/AEHardwareError.java → src/main/java/a8k/app/a8ktype/error/AEHardwareError.java

@@ -1,4 +1,4 @@
-package a8k.app.type.ecode;
+package a8k.app.a8ktype.error;
 
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.app.hardware.type.a8kcanprotocol.CmdId;

src/main/java/a8k/app/type/ecode/AESimpleErrorPrompt.java → src/main/java/a8k/app/a8ktype/error/AESimpleErrorPrompt.java

@@ -1,8 +1,6 @@
-package a8k.app.type.ecode;
+package a8k.app.a8ktype.error;
 
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
-import a8k.app.utils.ZJsonHelper;
-import io.swagger.v3.oas.annotations.media.Schema;
 
 public class AESimpleErrorPrompt extends AppError {
 	public AESimpleErrorPrompt(String exmsg) {

src/main/java/a8k/app/type/ecode/AETubeError.java → src/main/java/a8k/app/a8ktype/error/AETubeError.java

@@ -1,4 +1,4 @@
-package a8k.app.type.ecode;
+package a8k.app.a8ktype.error;
 
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/a8k/app/type/ecode/AppError.java → src/main/java/a8k/app/a8ktype/error/AppError.java

@@ -1,4 +1,4 @@
-package a8k.app.type.ecode;
+package a8k.app.a8ktype.error;
 
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.app.utils.ZJsonHelper;

src/main/java/a8k/app/type/consumables/ConsumablesScanReportErrorType.java → src/main/java/a8k/app/a8ktype/error/ConsumablesScanReportErrorType.java

@@ -1,4 +1,4 @@
-package a8k.app.type.consumables;
+package a8k.app.a8ktype.error;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

src/main/java/a8k/app/type/exception/AppException.java → src/main/java/a8k/app/a8ktype/exception/AppException.java

@@ -1,12 +1,12 @@
-package a8k.app.type.exception;
+package a8k.app.a8ktype.exception;
 
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.app.hardware.type.a8kcanprotocol.CmdId;
 import a8k.app.hardware.type.a8kcanprotocol.MId;
-import a8k.app.type.ecode.AECodeError;
-import a8k.app.type.ecode.AESimpleErrorPrompt;
-import a8k.app.type.ecode.AppError;
-import a8k.app.type.ecode.AEHardwareError;
+import a8k.app.a8ktype.error.AECodeError;
+import a8k.app.a8ktype.error.AESimpleErrorPrompt;
+import a8k.app.a8ktype.error.AppError;
+import a8k.app.a8ktype.error.AEHardwareError;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/a8k/app/type/exception/ZAppInterruptException.java → src/main/java/a8k/app/a8ktype/exception/ZAppInterruptException.java

@@ -1,4 +1,4 @@
-package a8k.app.type.exception;
+package a8k.app.a8ktype.exception;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/a8k/app/type/OptScanDirection.java → src/main/java/a8k/app/a8ktype/opttype/OptScanDirection.java

@@ -1,4 +1,4 @@
-package a8k.app.type;
+package a8k.app.a8ktype.opttype;
 
 public enum OptScanDirection {
 	FORWARD, //从左向右扫描

src/main/java/a8k/app/type/reaction_result_type/ReactionResultStatus.java → src/main/java/a8k/app/a8ktype/opttype/ReactionResultStatus.java

@@ -1,4 +1,4 @@
-package a8k.app.type.reaction_result_type;
+package a8k.app.a8ktype.opttype;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

src/main/java/a8k/app/type/CheckPointType.java → src/main/java/a8k/app/a8ktype/others/CheckPointType.java

@@ -1,4 +1,4 @@
-package a8k.app.type;
+package a8k.app.a8ktype.others;
 
 public enum CheckPointType {
 	CHECK_TUBE_XCHANNEL_IS_EMPTY,//入料通道是否为空

src/main/java/a8k/app/type/checkpoint/CheckFn.java → src/main/java/a8k/app/a8ktype/others/checkpoint/CheckFn.java

@@ -1,6 +1,6 @@
-package a8k.app.type.checkpoint;
+package a8k.app.a8ktype.others.checkpoint;
 
-import a8k.app.type.exception.AppException;
+import a8k.app.a8ktype.exception.AppException;
 
 @FunctionalInterface
 public interface CheckFn {

src/main/java/a8k/app/type/checkpoint/CheckResult.java → src/main/java/a8k/app/a8ktype/others/checkpoint/CheckResult.java

@@ -1,4 +1,4 @@
-package a8k.app.type.checkpoint;
+package a8k.app.a8ktype.others.checkpoint;
 
 public class CheckResult {
 	public String  typechinfo;

src/main/java/a8k/app/type/checkpoint/Checkpoint.java → src/main/java/a8k/app/a8ktype/others/checkpoint/Checkpoint.java

@@ -1,4 +1,4 @@
-package a8k.app.type.checkpoint;
+package a8k.app.a8ktype.others.checkpoint;
 
 
 public class Checkpoint {

src/main/java/a8k/app/a8ktype/param/Hbot2DCodeScanPos.java

@@ -1,6 +1,6 @@
 package a8k.app.a8ktype.param;
 
-import a8k.app.type.cfg.Pos2d;
+import a8k.app.a8ktype.device.Pos2d;
 
 public enum Hbot2DCodeScanPos {
 	PBScanPos0("板夹仓扫码位置0", Pos2d.class),

src/main/java/a8k/app/a8ktype/param/HbotLargeBottleBSPos.java

@@ -1,6 +1,6 @@
 package a8k.app.a8ktype.param;
 
-import a8k.app.type.cfg.Pos2d;
+import a8k.app.a8ktype.device.Pos2d;
 
 
 public enum HbotLargeBottleBSPos {

src/main/java/a8k/app/a8ktype/param/HbotLittleBSPos.java

@@ -1,6 +1,6 @@
 package a8k.app.a8ktype.param;
 
-import a8k.app.type.cfg.Pos2d;
+import a8k.app.a8ktype.device.Pos2d;
 
 public enum HbotLittleBSPos {
 	LittleBufferGroup0_000Pos("第1组小瓶缓冲液的第1个位置", Pos2d.class),

src/main/java/a8k/app/a8ktype/param/HbotProbeSubstancePos.java

@@ -1,6 +1,6 @@
 package a8k.app.a8ktype.param;
 
-import a8k.app.type.cfg.Pos3d;
+import a8k.app.a8ktype.device.Pos3d;
 
 public enum HbotProbeSubstancePos {
 	ProbeSubstanceGroup0_000Pos("第1组探测物质的第1个位置", Pos3d.class),

src/main/java/a8k/app/a8ktype/param/HbotSamplePos.java

@@ -1,6 +1,6 @@
 package a8k.app.a8ktype.param;
 
-import a8k.app.type.cfg.Pos3d;
+import a8k.app.a8ktype.device.Pos3d;
 
 public enum HbotSamplePos {
 	EmergencyTubeSamplePos("<急诊位>取样位置", Pos3d.class),

src/main/java/a8k/app/a8ktype/param/HbotTipPosParam.java

@@ -1,6 +1,6 @@
 package a8k.app.a8ktype.param;
 
-import a8k.app.type.cfg.Pos3d;
+import a8k.app.a8ktype.device.Pos3d;
 
 public enum HbotTipPosParam {
 	TipGroup0_000Pos("第1组TIP的第1个位置", Pos3d.class),

src/main/java/a8k/app/type/TubeFeedingModulePos.java → src/main/java/a8k/app/a8ktype/param/TubeFeedingModulePos.java

@@ -1,4 +1,4 @@
-package a8k.app.type;
+package a8k.app.a8ktype.param;
 
 public enum TubeFeedingModulePos {
 	TubeHolderEnterXPos("入料位置", Integer.class), //

src/main/java/a8k/app/type/TubeFeedingModuleSetting.java → src/main/java/a8k/app/a8ktype/param/TubeFeedingModuleSetting.java

@@ -1,4 +1,4 @@
-package a8k.app.type;
+package a8k.app.a8ktype.param;
 
 public enum TubeFeedingModuleSetting {
 	TubeScanServoTorque("试管扫描伺服力矩",Integer.class), //

src/main/java/a8k/app/type/TubePreProcessGripperPos.java → src/main/java/a8k/app/a8ktype/param/TubePreProcessGripperPos.java

@@ -1,4 +1,4 @@
-package a8k.app.type;
+package a8k.app.a8ktype.param;
 
 public enum TubePreProcessGripperPos {
 	GripperServoOpenPos("<抓手>张开位置", Integer.class),//

src/main/java/a8k/app/type/TubePreProcessTubeClamp.java → src/main/java/a8k/app/a8ktype/param/TubePreProcessTubeClamp.java

@@ -1,4 +1,4 @@
-package a8k.app.type;
+package a8k.app.a8ktype.param;
 
 public enum TubePreProcessTubeClamp {
 	ShakeClampMotorClampPos("<摇匀试管夹>夹紧位",Integer.class),//

src/main/java/a8k/app/type/TubePreProcessYPos.java → src/main/java/a8k/app/a8ktype/param/TubePreProcessYPos.java

@@ -1,4 +1,4 @@
-package a8k.app.type;
+package a8k.app.a8ktype.param;
 
 public enum TubePreProcessYPos {
 

src/main/java/a8k/app/service/app/appstate/type/DeviceWorkState.java → src/main/java/a8k/app/a8ktype/state/DeviceWorkState.java

@@ -1,11 +1,9 @@
-package a8k.app.service.app.appstate.type;
+package a8k.app.a8ktype.state;
 
-import a8k.app.service.app.appctrl.mainflowctrl.base.AppActionErrorContext;
-import a8k.app.service.app.appstate.type.state.A8kWorkState;
+import a8k.app.service.mainctrl.mainflowctrl.base.AppActionErrorContext;
+import a8k.app.a8ktype.state.enumtype.A8kWorkState;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.stereotype.Component;
 
 import java.io.Serializable;
 import java.util.ArrayList;

src/main/java/a8k/app/service/app/appstate/type/EmergencyTubePos.java → src/main/java/a8k/app/a8ktype/state/EmergencyTubePos.java

@@ -1,4 +1,4 @@
-package a8k.app.service.app.appstate.type;
+package a8k.app.a8ktype.state;
 
 import java.io.Serializable;
 

src/main/java/a8k/app/service/app/appstate/type/IncubationPlate.java → src/main/java/a8k/app/a8ktype/state/IncubationPlate.java

@@ -1,4 +1,4 @@
-package a8k.app.service.app.appstate.type;
+package a8k.app.a8ktype.state;
 
 import a8k.app.a8ktype.device.IncubatorPos;
 

src/main/java/a8k/app/service/app/appstate/type/IncubationSubTank.java → src/main/java/a8k/app/a8ktype/state/IncubationSubTank.java

@@ -1,10 +1,10 @@
-package a8k.app.service.app.appstate.type;
+package a8k.app.a8ktype.state;
 
-import a8k.app.service.app.appstate.type.state.IncubationSubTankState;
+import a8k.app.a8ktype.state.enumtype.IncubationSubTankState;
 import a8k.app.a8ktype.device.IncubatorPos;
-import a8k.app.type.ecode.AppError;
-import a8k.app.type.type.BloodType;
-import a8k.app.type.ProjBriefInfo;
+import a8k.app.a8ktype.error.AppError;
+import a8k.app.a8ktype.device.BloodType;
+import a8k.app.a8ktype.type.ProjBriefInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/a8k/app/service/app/appstate/type/OptScanModule.java → src/main/java/a8k/app/a8ktype/state/OptScanModule.java

@@ -1,12 +1,10 @@
-package a8k.app.service.app.appstate.type;
+package a8k.app.a8ktype.state;
 
-import a8k.app.service.app.appstate.type.state.IncubationSubTankState;
-import a8k.app.service.app.appstate.type.state.OptScanModuleState;
-import a8k.app.type.type.BloodType;
-import a8k.app.type.ProjBriefInfo;
+import a8k.app.a8ktype.state.enumtype.OptScanModuleState;
+import a8k.app.a8ktype.device.BloodType;
+import a8k.app.a8ktype.type.ProjBriefInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import lombok.Getter;
 
 import java.io.Serializable;
 

src/main/java/a8k/app/service/app/appstate/type/ProjProcessRecourcePacket.java → src/main/java/a8k/app/a8ktype/state/ProjProcessRecourcePacket.java

@@ -1,8 +1,8 @@
-package a8k.app.service.app.appstate.type;
+package a8k.app.a8ktype.state;
 
 import a8k.app.a8ktype.device.IncubatorPos;
-import a8k.app.type.pos.Consumable;
-import a8k.app.type.pos.TipPos;
+import a8k.app.a8ktype.device.Consumable;
+import a8k.app.a8ktype.device.TipPos;
 
 import java.io.Serializable;
 import java.util.List;

src/main/java/a8k/app/service/app/appstate/type/ProjectTaskContext.java → src/main/java/a8k/app/a8ktype/state/ProjectTaskContext.java

@@ -1,10 +1,11 @@
-package a8k.app.service.app.appstate.type;
+package a8k.app.a8ktype.state;
 
 import a8k.app.a8kproj.optalgo.type.OptScanResult;
-import a8k.app.service.dao.type.ProjExtInfoCard;
-import a8k.app.service.dao.type.a8kidcard.zenum.A8kOptType;
+import a8k.app.a8ktype.device.Consumable;
+import a8k.app.a8ktype.device.TipPos;
+import a8k.app.dao.db.type.ProjExtInfoCard;
+import a8k.app.dao.db.type.a8kidcard.zenum.A8kOptType;
 import a8k.app.a8ktype.device.IncubatorPos;
-import a8k.app.type.pos.*;
 import a8k.app.utils.ProjBuildinInfo;
 import a8k.app.utils.ZJsonHelper;
 import cn.hutool.core.util.ObjectUtil;

src/main/java/a8k/app/service/app/appstate/type/SampleInfo.java → src/main/java/a8k/app/a8ktype/state/SampleInfo.java

@@ -1,7 +1,7 @@
-package a8k.app.service.app.appstate.type;
+package a8k.app.a8ktype.state;
 
-import a8k.app.type.type.A8kTubeHolderType;
-import a8k.app.type.type.BloodType;
+import a8k.app.a8ktype.device.A8kTubeHolderType;
+import a8k.app.a8ktype.device.BloodType;
 
 import java.io.Serializable;
 

src/main/java/a8k/app/service/app/appstate/SensorState.java → src/main/java/a8k/app/a8ktype/state/SensorState.java

@@ -1,7 +1,6 @@
-package a8k.app.service.app.appstate;
+package a8k.app.a8ktype.state;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
 
 
 public class SensorState {

src/main/java/a8k/app/service/app/appstate/type/Tube.java → src/main/java/a8k/app/a8ktype/state/Tube.java

@@ -1,15 +1,13 @@
-package a8k.app.service.app.appstate.type;
+package a8k.app.a8ktype.state;
 
-import a8k.app.service.app.appstate.type.state.TubeState;
-import a8k.app.type.ecode.AppError;
-import a8k.app.type.type.BloodType;
-import a8k.app.type.ProjBriefInfo;
+import a8k.app.a8ktype.state.enumtype.TubeState;
+import a8k.app.a8ktype.error.AppError;
+import a8k.app.a8ktype.device.BloodType;
+import a8k.app.a8ktype.type.ProjBriefInfo;
 import a8k.app.utils.ProjBuildinInfo;
-import a8k.app.utils.ProjInfoUtils;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import lombok.Getter;
 
 import java.io.Serializable;
 import java.util.ArrayList;

src/main/java/a8k/app/service/app/appstate/type/TubeHolder.java → src/main/java/a8k/app/a8ktype/state/TubeHolder.java

@@ -1,12 +1,9 @@
-package a8k.app.service.app.appstate.type;
+package a8k.app.a8ktype.state;
 
-import a8k.app.service.app.appstate.type.state.TubeHolderState;
-import a8k.app.service.app.appstate.type.state.TubeState;
-import a8k.app.type.type.A8kTubeHolderType;
+import a8k.app.a8ktype.state.enumtype.TubeHolderState;
+import a8k.app.a8ktype.device.A8kTubeHolderType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.io.Serializable;
 

src/main/java/a8k/app/service/app/appstate/type/state/A8kWorkState.java → src/main/java/a8k/app/a8ktype/state/enumtype/A8kWorkState.java

@@ -1,4 +1,4 @@
-package a8k.app.service.app.appstate.type.state;
+package a8k.app.a8ktype.state.enumtype;
 
 public enum A8kWorkState {
 	IDLE,

src/main/java/a8k/app/service/app/appstate/type/state/IncubationSubTankState.java → src/main/java/a8k/app/a8ktype/state/enumtype/IncubationSubTankState.java

@@ -1,4 +1,4 @@
-package a8k.app.service.app.appstate.type.state;
+package a8k.app.a8ktype.state.enumtype;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

src/main/java/a8k/app/service/app/appstate/type/state/OptScanModuleState.java → src/main/java/a8k/app/a8ktype/state/enumtype/OptScanModuleState.java

@@ -1,4 +1,4 @@
-package a8k.app.service.app.appstate.type.state;
+package a8k.app.a8ktype.state.enumtype;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

src/main/java/a8k/app/service/app/appstate/type/state/ProjProcessState.java → src/main/java/a8k/app/a8ktype/state/enumtype/ProjProcessState.java

@@ -1,4 +1,4 @@
-package a8k.app.service.app.appstate.type.state;
+package a8k.app.a8ktype.state.enumtype;
 
 public enum ProjProcessState {
 	INIT,

src/main/java/a8k/app/service/app/appstate/type/state/TubeHolderProgress.java → src/main/java/a8k/app/a8ktype/state/enumtype/TubeHolderProgress.java

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

src/main/java/a8k/app/service/app/appstate/type/state/TubeHolderState.java → src/main/java/a8k/app/a8ktype/state/enumtype/TubeHolderState.java

@@ -1,4 +1,4 @@
-package a8k.app.service.app.appstate.type.state;
+package a8k.app.a8ktype.state.enumtype;
 
 public enum TubeHolderState {
 	IDLE, //没有试管架

src/main/java/a8k/app/service/app/appstate/type/state/TubeState.java → src/main/java/a8k/app/a8ktype/state/enumtype/TubeState.java

@@ -1,4 +1,4 @@
-package a8k.app.service.app.appstate.type.state;
+package a8k.app.a8ktype.state.enumtype;
 
 import java.util.List;
 

src/main/java/a8k/app/type/ConsumableOneChRawResult.java → src/main/java/a8k/app/a8ktype/type/ConsumableOneChRawResult.java

@@ -1,4 +1,4 @@
-package a8k.app.type;
+package a8k.app.a8ktype.type;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

src/main/java/a8k/app/type/ConsumableScanRawResult.java → src/main/java/a8k/app/a8ktype/type/ConsumableScanRawResult.java

@@ -1,4 +1,4 @@
-package a8k.app.type;
+package a8k.app.a8ktype.type;
 
 import a8k.app.utils.ZJsonHelper;
 

src/main/java/a8k/app/type/ConsumablesOneChannelScanResultPacket.java → src/main/java/a8k/app/a8ktype/type/ConsumablesOneChannelScanResultPacket.java

@@ -1,6 +1,6 @@
-package a8k.app.type;
+package a8k.app.a8ktype.type;
 
-import a8k.app.type.consumables.ConsumableState;
+import a8k.app.a8ktype.device.consumables.ConsumableState;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 public class ConsumablesOneChannelScanResultPacket {

src/main/java/a8k/app/type/ConsumablesScanReport.java → src/main/java/a8k/app/a8ktype/type/ConsumablesScanReport.java

@@ -1,6 +1,6 @@
-package a8k.app.type;
+package a8k.app.a8ktype.type;
 
-import a8k.app.type.consumables.ConsumablesScanReportErrorType;
+import a8k.app.a8ktype.error.ConsumablesScanReportErrorType;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 @Schema(description = "耗材扫描报告")

src/main/java/a8k/app/type/ConsumablesScanResultPacket.java → src/main/java/a8k/app/a8ktype/type/ConsumablesScanResultPacket.java

@@ -1,6 +1,6 @@
-package a8k.app.type;
+package a8k.app.a8ktype.type;
 
-import a8k.app.type.consumables.ConsumableState;
+import a8k.app.a8ktype.device.consumables.ConsumableState;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.util.List;

src/main/java/a8k/app/type/LittleBottleConsumableRefPoint.java → src/main/java/a8k/app/a8ktype/type/LittleBottleConsumableRefPoint.java

@@ -1,8 +1,8 @@
-package a8k.app.type;
+package a8k.app.a8ktype.type;
 
 import a8k.app.a8ktype.device.ConsumableGroup;
 import a8k.app.constant.AppConstant;
-import a8k.app.type.cfg.Pos3d;
+import a8k.app.a8ktype.device.Pos3d;
 
 public class LittleBottleConsumableRefPoint {
 	public ConsumableGroup group;

src/main/java/a8k/app/type/PlateInfo.java → src/main/java/a8k/app/a8ktype/type/PlateInfo.java

@@ -1,4 +1,4 @@
-package a8k.app.type;
+package a8k.app.a8ktype.type;
 
 
 public class PlateInfo {

src/main/java/a8k/app/type/ProjBriefInfo.java → src/main/java/a8k/app/a8ktype/type/ProjBriefInfo.java

@@ -1,4 +1,4 @@
-package a8k.app.type;
+package a8k.app.a8ktype.type;
 
 import java.io.Serializable;
 import java.util.ArrayList;