diff --git a/appresource/db/app.db b/appresource/db/app.db index 25080b3..90bd0ce 100644 Binary files a/appresource/db/app.db and b/appresource/db/app.db differ diff --git a/src/main/java/a8k/OS.java b/src/main/java/a8k/OS.java index 0bb3a22..42c0ff3 100644 --- a/src/main/java/a8k/OS.java +++ b/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); diff --git a/src/main/java/a8k/app/a8kproj/A8kIdCardDataParseService.java b/src/main/java/a8k/app/a8kproj/A8kIdCardDataParseService.java index 0aa9873..2234c5f 100644 --- a/src/main/java/a8k/app/a8kproj/A8kIdCardDataParseService.java +++ b/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; diff --git a/src/main/java/a8k/app/a8kproj/A8kReactionResultComputer.java b/src/main/java/a8k/app/a8kproj/A8kReactionResultComputer.java index c70ef00..19ea5e0 100644 --- a/src/main/java/a8k/app/a8kproj/A8kReactionResultComputer.java +++ b/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; diff --git a/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_01_FLOW1.java b/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_01_FLOW1.java index bda1e09..685da6e 100644 --- a/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_01_FLOW1.java +++ b/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() { diff --git a/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_02_FLOW2.java b/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_02_FLOW2.java index 4c743a3..697aa93 100644 --- a/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_02_FLOW2.java +++ b/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() { diff --git a/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_03.java b/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_03.java index 128bd9b..c17f565 100644 --- a/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_03.java +++ b/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() { diff --git a/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_04.java b/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_04.java index 8033057..fb51d7c 100644 --- a/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_04.java +++ b/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() { diff --git a/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_05.java b/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_05.java index 8ca6c17..33a1bc2 100644 --- a/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_05.java +++ b/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() { diff --git a/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_06.java b/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_06.java index 6afff9d..7af10c7 100644 --- a/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_06.java +++ b/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() { diff --git a/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_07_EXPIRED.java b/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_07_EXPIRED.java index 4107ffa..0ca3ce5 100644 --- a/src/main/java/a8k/app/a8kproj/fakeproj/FAKE_PROJ_07_EXPIRED.java +++ b/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() { diff --git a/src/main/java/a8k/app/a8kproj/fakeproj/FakeProjInfo.java b/src/main/java/a8k/app/a8kproj/fakeproj/FakeProjInfo.java index a86243f..62996d6 100644 --- a/src/main/java/a8k/app/a8kproj/fakeproj/FakeProjInfo.java +++ b/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; diff --git a/src/main/java/a8k/app/a8kproj/fakeproj/FakeProjInfoFactory.java b/src/main/java/a8k/app/a8kproj/fakeproj/FakeProjInfoFactory.java index 7df9b69..3c8ea27 100644 --- a/src/main/java/a8k/app/a8kproj/fakeproj/FakeProjInfoFactory.java +++ b/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; diff --git a/src/main/java/a8k/app/a8kproj/fakeprojcontext/FakeProjInfoContextFactory.java b/src/main/java/a8k/app/a8kproj/fakeprojcontext/FakeProjInfoContextFactory.java index f0a7277..9dd3de7 100644 --- a/src/main/java/a8k/app/a8kproj/fakeprojcontext/FakeProjInfoContextFactory.java +++ b/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; diff --git a/src/main/java/a8k/app/a8kproj/optalgo/A8kOptAlgoV2.java b/src/main/java/a8k/app/a8kproj/optalgo/A8kOptAlgoV2.java index b545d05..ac0f6e6 100644 --- a/src/main/java/a8k/app/a8kproj/optalgo/A8kOptAlgoV2.java +++ b/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; diff --git a/src/main/java/a8k/app/a8kproj/optalgo/type/OptScanResult.java b/src/main/java/a8k/app/a8kproj/optalgo/type/OptScanResult.java index 757dc57..a90c019 100644 --- a/src/main/java/a8k/app/a8kproj/optalgo/type/OptScanResult.java +++ b/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; diff --git a/src/main/java/a8k/app/a8kproj/optanalyzer/A8kOptXGetter.java b/src/main/java/a8k/app/a8kproj/optanalyzer/A8kOptXGetter.java index b79f879..d79f2e7 100644 --- a/src/main/java/a8k/app/a8kproj/optanalyzer/A8kOptXGetter.java +++ b/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; diff --git a/src/main/java/a8k/app/a8kproj/optanalyzer/OptChecker.java b/src/main/java/a8k/app/a8kproj/optanalyzer/OptChecker.java index 5b5bd17..2149435 100644 --- a/src/main/java/a8k/app/a8kproj/optanalyzer/OptChecker.java +++ b/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 { diff --git a/src/main/java/a8k/app/a8kproj/optanalyzer/context/OptAnalyzeContext.java b/src/main/java/a8k/app/a8kproj/optanalyzer/context/OptAnalyzeContext.java index fba74a3..4d8de41 100644 --- a/src/main/java/a8k/app/a8kproj/optanalyzer/context/OptAnalyzeContext.java +++ b/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 { diff --git a/src/main/java/a8k/app/a8kproj/optanalyzer/exception/A8kOptProcessException.java b/src/main/java/a8k/app/a8kproj/optanalyzer/exception/A8kOptProcessException.java index 42c84a6..1399fa6 100644 --- a/src/main/java/a8k/app/a8kproj/optanalyzer/exception/A8kOptProcessException.java +++ b/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; diff --git a/src/main/java/a8k/app/service/bases/appevent/A8kCanBusOnConnectEvent.java b/src/main/java/a8k/app/a8ktype/appevent/A8kCanBusOnConnectEvent.java similarity index 79% rename from src/main/java/a8k/app/service/bases/appevent/A8kCanBusOnConnectEvent.java rename to src/main/java/a8k/app/a8ktype/appevent/A8kCanBusOnConnectEvent.java index f41bcd9..d8fa565 100644 --- a/src/main/java/a8k/app/service/bases/appevent/A8kCanBusOnConnectEvent.java +++ b/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() { diff --git a/src/main/java/a8k/app/service/bases/appevent/A8kEcodeContextListPromptEvent.java b/src/main/java/a8k/app/a8ktype/appevent/A8kEcodeContextListPromptEvent.java similarity index 84% rename from src/main/java/a8k/app/service/bases/appevent/A8kEcodeContextListPromptEvent.java rename to src/main/java/a8k/app/a8ktype/appevent/A8kEcodeContextListPromptEvent.java index e50d846..0ba1a65 100644 --- a/src/main/java/a8k/app/service/bases/appevent/A8kEcodeContextListPromptEvent.java +++ b/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; diff --git a/src/main/java/a8k/app/service/bases/appevent/A8kErrorsPromptEvent.java b/src/main/java/a8k/app/a8ktype/appevent/A8kErrorsPromptEvent.java similarity index 89% rename from src/main/java/a8k/app/service/bases/appevent/A8kErrorsPromptEvent.java rename to src/main/java/a8k/app/a8ktype/appevent/A8kErrorsPromptEvent.java index 4c02f87..c951de8 100644 --- a/src/main/java/a8k/app/service/bases/appevent/A8kErrorsPromptEvent.java +++ b/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; diff --git a/src/main/java/a8k/app/service/bases/appevent/A8kHardwareReport.java b/src/main/java/a8k/app/a8ktype/appevent/A8kHardwareReport.java similarity index 92% rename from src/main/java/a8k/app/service/bases/appevent/A8kHardwareReport.java rename to src/main/java/a8k/app/a8ktype/appevent/A8kHardwareReport.java index 562652c..bc6558a 100644 --- a/src/main/java/a8k/app/service/bases/appevent/A8kHardwareReport.java +++ b/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; diff --git a/src/main/java/a8k/app/service/bases/appevent/AppEvent.java b/src/main/java/a8k/app/a8ktype/appevent/AppEvent.java similarity index 81% rename from src/main/java/a8k/app/service/bases/appevent/AppEvent.java rename to src/main/java/a8k/app/a8ktype/appevent/AppEvent.java index 4c1c824..251c63b 100644 --- a/src/main/java/a8k/app/service/bases/appevent/AppEvent.java +++ b/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; diff --git a/src/main/java/a8k/app/service/bases/appevent/AppExceptionEvent.java b/src/main/java/a8k/app/a8ktype/appevent/AppExceptionEvent.java similarity index 83% rename from src/main/java/a8k/app/service/bases/appevent/AppExceptionEvent.java rename to src/main/java/a8k/app/a8ktype/appevent/AppExceptionEvent.java index 5bb63f9..a8ee951 100644 --- a/src/main/java/a8k/app/service/bases/appevent/AppExceptionEvent.java +++ b/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; diff --git a/src/main/java/a8k/app/service/bases/appevent/AppIDCardMountEvent.java b/src/main/java/a8k/app/a8ktype/appevent/AppIDCardMountEvent.java similarity index 64% rename from src/main/java/a8k/app/service/bases/appevent/AppIDCardMountEvent.java rename to src/main/java/a8k/app/a8ktype/appevent/AppIDCardMountEvent.java index a45b364..c9a82c5 100644 --- a/src/main/java/a8k/app/service/bases/appevent/AppIDCardMountEvent.java +++ b/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; diff --git a/src/main/java/a8k/app/service/bases/appevent/AppIDCardUnmountEvent.java b/src/main/java/a8k/app/a8ktype/appevent/AppIDCardUnmountEvent.java similarity index 78% rename from src/main/java/a8k/app/service/bases/appevent/AppIDCardUnmountEvent.java rename to src/main/java/a8k/app/a8ktype/appevent/AppIDCardUnmountEvent.java index 24825f0..e9efa11 100644 --- a/src/main/java/a8k/app/service/bases/appevent/AppIDCardUnmountEvent.java +++ b/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() { diff --git a/src/main/java/a8k/app/service/bases/appevent/AppPromptEvents.java b/src/main/java/a8k/app/a8ktype/appevent/AppPromptEvents.java similarity index 75% rename from src/main/java/a8k/app/service/bases/appevent/AppPromptEvents.java rename to src/main/java/a8k/app/a8ktype/appevent/AppPromptEvents.java index 6ade96f..a45a3bb 100644 --- a/src/main/java/a8k/app/service/bases/appevent/AppPromptEvents.java +++ b/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; diff --git a/src/main/java/a8k/app/service/bases/appevent/AppTubeholderSettingUpdateEvent.java b/src/main/java/a8k/app/a8ktype/appevent/AppTubeholderSettingUpdateEvent.java similarity index 88% rename from src/main/java/a8k/app/service/bases/appevent/AppTubeholderSettingUpdateEvent.java rename to src/main/java/a8k/app/a8ktype/appevent/AppTubeholderSettingUpdateEvent.java index 2fb0ea8..a67970f 100644 --- a/src/main/java/a8k/app/service/bases/appevent/AppTubeholderSettingUpdateEvent.java +++ b/src/main/java/a8k/app/a8ktype/appevent/AppTubeholderSettingUpdateEvent.java @@ -1,4 +1,4 @@ -package a8k.app.service.bases.appevent; +package a8k.app.a8ktype.appevent; /** * 试管架配置被后端更新事件 diff --git a/src/main/java/a8k/app/service/bases/appevent/AppWarningNotifyEvent.java b/src/main/java/a8k/app/a8ktype/appevent/AppWarningNotifyEvent.java similarity index 84% rename from src/main/java/a8k/app/service/bases/appevent/AppWarningNotifyEvent.java rename to src/main/java/a8k/app/a8ktype/appevent/AppWarningNotifyEvent.java index c060f2b..11754f9 100644 --- a/src/main/java/a8k/app/service/bases/appevent/AppWarningNotifyEvent.java +++ b/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; diff --git a/src/main/java/a8k/app/service/bases/appevent/DoA8kStepActionEvent.java b/src/main/java/a8k/app/a8ktype/appevent/DoA8kStepActionEvent.java similarity index 81% rename from src/main/java/a8k/app/service/bases/appevent/DoA8kStepActionEvent.java rename to src/main/java/a8k/app/a8ktype/appevent/DoA8kStepActionEvent.java index 525184b..b73073c 100644 --- a/src/main/java/a8k/app/service/bases/appevent/DoA8kStepActionEvent.java +++ b/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; diff --git a/src/main/java/a8k/app/type/db/CommonPage.java b/src/main/java/a8k/app/a8ktype/db/CommonPage.java similarity index 95% rename from src/main/java/a8k/app/type/db/CommonPage.java rename to src/main/java/a8k/app/a8ktype/db/CommonPage.java index cf7a7e0..da96cb9 100644 --- a/src/main/java/a8k/app/type/db/CommonPage.java +++ b/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; diff --git a/src/main/java/a8k/app/type/type/A8kTubeHolderType.java b/src/main/java/a8k/app/a8ktype/device/A8kTubeHolderType.java similarity index 95% rename from src/main/java/a8k/app/type/type/A8kTubeHolderType.java rename to src/main/java/a8k/app/a8ktype/device/A8kTubeHolderType.java index 2ae7977..ed433b9 100644 --- a/src/main/java/a8k/app/type/type/A8kTubeHolderType.java +++ b/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; diff --git a/src/main/java/a8k/app/type/type/BloodType.java b/src/main/java/a8k/app/a8ktype/device/BloodType.java similarity index 88% rename from src/main/java/a8k/app/type/type/BloodType.java rename to src/main/java/a8k/app/a8ktype/device/BloodType.java index 6538bed..b85195b 100644 --- a/src/main/java/a8k/app/type/type/BloodType.java +++ b/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; diff --git a/src/main/java/a8k/app/type/pos/Consumable.java b/src/main/java/a8k/app/a8ktype/device/Consumable.java similarity index 82% rename from src/main/java/a8k/app/type/pos/Consumable.java rename to src/main/java/a8k/app/a8ktype/device/Consumable.java index 78ca2a4..e3c33fd 100644 --- a/src/main/java/a8k/app/type/pos/Consumable.java +++ b/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; diff --git a/src/main/java/a8k/app/type/LittleBottleConsumableType.java b/src/main/java/a8k/app/a8ktype/device/LittleBottleConsumableType.java similarity index 76% rename from src/main/java/a8k/app/type/LittleBottleConsumableType.java rename to src/main/java/a8k/app/a8ktype/device/LittleBottleConsumableType.java index af53b47..7521630 100644 --- a/src/main/java/a8k/app/type/LittleBottleConsumableType.java +++ b/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, //缓冲液 diff --git a/src/main/java/a8k/app/type/cfg/Pos2d.java b/src/main/java/a8k/app/a8ktype/device/Pos2d.java similarity index 94% rename from src/main/java/a8k/app/type/cfg/Pos2d.java rename to src/main/java/a8k/app/a8ktype/device/Pos2d.java index b5e9153..d31837b 100644 --- a/src/main/java/a8k/app/type/cfg/Pos2d.java +++ b/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 { diff --git a/src/main/java/a8k/app/type/cfg/Pos3d.java b/src/main/java/a8k/app/a8ktype/device/Pos3d.java similarity index 90% rename from src/main/java/a8k/app/type/cfg/Pos3d.java rename to src/main/java/a8k/app/a8ktype/device/Pos3d.java index 6022d94..909943f 100644 --- a/src/main/java/a8k/app/type/cfg/Pos3d.java +++ b/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; diff --git a/src/main/java/a8k/app/type/type/SupportBloodType.java b/src/main/java/a8k/app/a8ktype/device/SupportBloodType.java similarity index 92% rename from src/main/java/a8k/app/type/type/SupportBloodType.java rename to src/main/java/a8k/app/a8ktype/device/SupportBloodType.java index f23d172..b072ca2 100644 --- a/src/main/java/a8k/app/type/type/SupportBloodType.java +++ b/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 { diff --git a/src/main/java/a8k/app/type/TipColumnNum.java b/src/main/java/a8k/app/a8ktype/device/TipColumnNum.java similarity index 81% rename from src/main/java/a8k/app/type/TipColumnNum.java rename to src/main/java/a8k/app/a8ktype/device/TipColumnNum.java index 81bbc4d..a482187 100644 --- a/src/main/java/a8k/app/type/TipColumnNum.java +++ b/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, diff --git a/src/main/java/a8k/app/type/pos/TipPos.java b/src/main/java/a8k/app/a8ktype/device/TipPos.java similarity index 75% rename from src/main/java/a8k/app/type/pos/TipPos.java rename to src/main/java/a8k/app/a8ktype/device/TipPos.java index b602734..8ddad17 100644 --- a/src/main/java/a8k/app/type/pos/TipPos.java +++ b/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; diff --git a/src/main/java/a8k/app/type/TipRowNum.java b/src/main/java/a8k/app/a8ktype/device/TipRowNum.java similarity index 76% rename from src/main/java/a8k/app/type/TipRowNum.java rename to src/main/java/a8k/app/a8ktype/device/TipRowNum.java index 603c473..aa4da91 100644 --- a/src/main/java/a8k/app/type/TipRowNum.java +++ b/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, diff --git a/src/main/java/a8k/app/type/consumables/ConsumableState.java b/src/main/java/a8k/app/a8ktype/device/consumables/ConsumableState.java similarity index 96% rename from src/main/java/a8k/app/type/consumables/ConsumableState.java rename to src/main/java/a8k/app/a8ktype/device/consumables/ConsumableState.java index 74e968b..f8de083 100644 --- a/src/main/java/a8k/app/type/consumables/ConsumableState.java +++ b/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; diff --git a/src/main/java/a8k/app/type/consumables/LarBottleGroup.java b/src/main/java/a8k/app/a8ktype/device/consumables/LarBottleGroup.java similarity index 96% rename from src/main/java/a8k/app/type/consumables/LarBottleGroup.java rename to src/main/java/a8k/app/a8ktype/device/consumables/LarBottleGroup.java index 861c9ef..3e5eb79 100644 --- a/src/main/java/a8k/app/type/consumables/LarBottleGroup.java +++ b/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; diff --git a/src/main/java/a8k/app/type/consumables/LittBottleGroup.java b/src/main/java/a8k/app/a8ktype/device/consumables/LittBottleGroup.java similarity index 92% rename from src/main/java/a8k/app/type/consumables/LittBottleGroup.java rename to src/main/java/a8k/app/a8ktype/device/consumables/LittBottleGroup.java index 80e97e4..5e6dab9 100644 --- a/src/main/java/a8k/app/type/consumables/LittBottleGroup.java +++ b/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; diff --git a/src/main/java/a8k/app/type/consumables/ReactionPlateGroup.java b/src/main/java/a8k/app/a8ktype/device/consumables/ReactionPlateGroup.java similarity index 95% rename from src/main/java/a8k/app/type/consumables/ReactionPlateGroup.java rename to src/main/java/a8k/app/a8ktype/device/consumables/ReactionPlateGroup.java index ac68c66..33923af 100644 --- a/src/main/java/a8k/app/type/consumables/ReactionPlateGroup.java +++ b/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; diff --git a/src/main/java/a8k/app/type/consumables/Tips.java b/src/main/java/a8k/app/a8ktype/device/consumables/Tips.java similarity index 83% rename from src/main/java/a8k/app/type/consumables/Tips.java rename to src/main/java/a8k/app/a8ktype/device/consumables/Tips.java index f04453c..fbc1a80 100644 --- a/src/main/java/a8k/app/type/consumables/Tips.java +++ b/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; diff --git a/src/main/java/a8k/app/type/ecode/AECodeError.java b/src/main/java/a8k/app/a8ktype/error/AECodeError.java similarity index 88% rename from src/main/java/a8k/app/type/ecode/AECodeError.java rename to src/main/java/a8k/app/a8ktype/error/AECodeError.java index fd0edb6..753e57e 100644 --- a/src/main/java/a8k/app/type/ecode/AECodeError.java +++ b/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 diff --git a/src/main/java/a8k/app/type/ecode/AEConsumeNotEnoughError.java b/src/main/java/a8k/app/a8ktype/error/AEConsumeNotEnoughError.java similarity index 92% rename from src/main/java/a8k/app/type/ecode/AEConsumeNotEnoughError.java rename to src/main/java/a8k/app/a8ktype/error/AEConsumeNotEnoughError.java index 885f247..0f9c6b9 100644 --- a/src/main/java/a8k/app/type/ecode/AEConsumeNotEnoughError.java +++ b/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; diff --git a/src/main/java/a8k/app/type/ecode/AEHardwareError.java b/src/main/java/a8k/app/a8ktype/error/AEHardwareError.java similarity index 95% rename from src/main/java/a8k/app/type/ecode/AEHardwareError.java rename to src/main/java/a8k/app/a8ktype/error/AEHardwareError.java index 42236e8..3a0623d 100644 --- a/src/main/java/a8k/app/type/ecode/AEHardwareError.java +++ b/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; diff --git a/src/main/java/a8k/app/type/ecode/AESimpleErrorPrompt.java b/src/main/java/a8k/app/a8ktype/error/AESimpleErrorPrompt.java similarity index 75% rename from src/main/java/a8k/app/type/ecode/AESimpleErrorPrompt.java rename to src/main/java/a8k/app/a8ktype/error/AESimpleErrorPrompt.java index da2b1dd..b092532 100644 --- a/src/main/java/a8k/app/type/ecode/AESimpleErrorPrompt.java +++ b/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) { diff --git a/src/main/java/a8k/app/type/ecode/AETubeError.java b/src/main/java/a8k/app/a8ktype/error/AETubeError.java similarity index 91% rename from src/main/java/a8k/app/type/ecode/AETubeError.java rename to src/main/java/a8k/app/a8ktype/error/AETubeError.java index f20cd65..7d14277 100644 --- a/src/main/java/a8k/app/type/ecode/AETubeError.java +++ b/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; diff --git a/src/main/java/a8k/app/type/ecode/AppError.java b/src/main/java/a8k/app/a8ktype/error/AppError.java similarity index 95% rename from src/main/java/a8k/app/type/ecode/AppError.java rename to src/main/java/a8k/app/a8ktype/error/AppError.java index 335f42d..df4abfb 100644 --- a/src/main/java/a8k/app/type/ecode/AppError.java +++ b/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; diff --git a/src/main/java/a8k/app/type/consumables/ConsumablesScanReportErrorType.java b/src/main/java/a8k/app/a8ktype/error/ConsumablesScanReportErrorType.java similarity index 97% rename from src/main/java/a8k/app/type/consumables/ConsumablesScanReportErrorType.java rename to src/main/java/a8k/app/a8ktype/error/ConsumablesScanReportErrorType.java index 513a77d..14c1b0c 100644 --- a/src/main/java/a8k/app/type/consumables/ConsumablesScanReportErrorType.java +++ b/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; diff --git a/src/main/java/a8k/app/type/exception/AppException.java b/src/main/java/a8k/app/a8ktype/exception/AppException.java similarity index 86% rename from src/main/java/a8k/app/type/exception/AppException.java rename to src/main/java/a8k/app/a8ktype/exception/AppException.java index 96c4462..705caf8 100644 --- a/src/main/java/a8k/app/type/exception/AppException.java +++ b/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; diff --git a/src/main/java/a8k/app/type/exception/ZAppInterruptException.java b/src/main/java/a8k/app/a8ktype/exception/ZAppInterruptException.java similarity index 78% rename from src/main/java/a8k/app/type/exception/ZAppInterruptException.java rename to src/main/java/a8k/app/a8ktype/exception/ZAppInterruptException.java index 9e767bb..868d048 100644 --- a/src/main/java/a8k/app/type/exception/ZAppInterruptException.java +++ b/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; diff --git a/src/main/java/a8k/app/type/OptScanDirection.java b/src/main/java/a8k/app/a8ktype/opttype/OptScanDirection.java similarity index 81% rename from src/main/java/a8k/app/type/OptScanDirection.java rename to src/main/java/a8k/app/a8ktype/opttype/OptScanDirection.java index 1e716a4..f71a7e4 100644 --- a/src/main/java/a8k/app/type/OptScanDirection.java +++ b/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, //从左向右扫描 diff --git a/src/main/java/a8k/app/type/reaction_result_type/ReactionResultStatus.java b/src/main/java/a8k/app/a8ktype/opttype/ReactionResultStatus.java similarity index 97% rename from src/main/java/a8k/app/type/reaction_result_type/ReactionResultStatus.java rename to src/main/java/a8k/app/a8ktype/opttype/ReactionResultStatus.java index 86ac385..388d0dd 100644 --- a/src/main/java/a8k/app/type/reaction_result_type/ReactionResultStatus.java +++ b/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; diff --git a/src/main/java/a8k/app/type/CheckPointType.java b/src/main/java/a8k/app/a8ktype/others/CheckPointType.java similarity index 92% rename from src/main/java/a8k/app/type/CheckPointType.java rename to src/main/java/a8k/app/a8ktype/others/CheckPointType.java index 62990ad..cb7c170 100644 --- a/src/main/java/a8k/app/type/CheckPointType.java +++ b/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,//入料通道是否为空 diff --git a/src/main/java/a8k/app/type/checkpoint/CheckFn.java b/src/main/java/a8k/app/a8ktype/others/checkpoint/CheckFn.java similarity index 50% rename from src/main/java/a8k/app/type/checkpoint/CheckFn.java rename to src/main/java/a8k/app/a8ktype/others/checkpoint/CheckFn.java index e4a4cb0..b434222 100644 --- a/src/main/java/a8k/app/type/checkpoint/CheckFn.java +++ b/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 { diff --git a/src/main/java/a8k/app/type/checkpoint/CheckResult.java b/src/main/java/a8k/app/a8ktype/others/checkpoint/CheckResult.java similarity index 70% rename from src/main/java/a8k/app/type/checkpoint/CheckResult.java rename to src/main/java/a8k/app/a8ktype/others/checkpoint/CheckResult.java index bf95640..ffcfe63 100644 --- a/src/main/java/a8k/app/type/checkpoint/CheckResult.java +++ b/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; diff --git a/src/main/java/a8k/app/type/checkpoint/Checkpoint.java b/src/main/java/a8k/app/a8ktype/others/checkpoint/Checkpoint.java similarity index 86% rename from src/main/java/a8k/app/type/checkpoint/Checkpoint.java rename to src/main/java/a8k/app/a8ktype/others/checkpoint/Checkpoint.java index fef0224..b55609f 100644 --- a/src/main/java/a8k/app/type/checkpoint/Checkpoint.java +++ b/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 { diff --git a/src/main/java/a8k/app/a8ktype/param/Hbot2DCodeScanPos.java b/src/main/java/a8k/app/a8ktype/param/Hbot2DCodeScanPos.java index f87b31b..8f73496 100644 --- a/src/main/java/a8k/app/a8ktype/param/Hbot2DCodeScanPos.java +++ b/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), diff --git a/src/main/java/a8k/app/a8ktype/param/HbotLargeBottleBSPos.java b/src/main/java/a8k/app/a8ktype/param/HbotLargeBottleBSPos.java index 501dc09..f882c92 100644 --- a/src/main/java/a8k/app/a8ktype/param/HbotLargeBottleBSPos.java +++ b/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 { diff --git a/src/main/java/a8k/app/a8ktype/param/HbotLittleBSPos.java b/src/main/java/a8k/app/a8ktype/param/HbotLittleBSPos.java index 7898ff7..b84c276 100644 --- a/src/main/java/a8k/app/a8ktype/param/HbotLittleBSPos.java +++ b/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), diff --git a/src/main/java/a8k/app/a8ktype/param/HbotProbeSubstancePos.java b/src/main/java/a8k/app/a8ktype/param/HbotProbeSubstancePos.java index e5a6c30..a44c971 100644 --- a/src/main/java/a8k/app/a8ktype/param/HbotProbeSubstancePos.java +++ b/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), diff --git a/src/main/java/a8k/app/a8ktype/param/HbotSamplePos.java b/src/main/java/a8k/app/a8ktype/param/HbotSamplePos.java index 5779e8b..67cc1c8 100644 --- a/src/main/java/a8k/app/a8ktype/param/HbotSamplePos.java +++ b/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), diff --git a/src/main/java/a8k/app/a8ktype/param/HbotTipPosParam.java b/src/main/java/a8k/app/a8ktype/param/HbotTipPosParam.java index 93e03cb..c26a0c8 100644 --- a/src/main/java/a8k/app/a8ktype/param/HbotTipPosParam.java +++ b/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), diff --git a/src/main/java/a8k/app/type/TubeFeedingModulePos.java b/src/main/java/a8k/app/a8ktype/param/TubeFeedingModulePos.java similarity index 95% rename from src/main/java/a8k/app/type/TubeFeedingModulePos.java rename to src/main/java/a8k/app/a8ktype/param/TubeFeedingModulePos.java index 9d03eb8..81f4262 100644 --- a/src/main/java/a8k/app/type/TubeFeedingModulePos.java +++ b/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), // diff --git a/src/main/java/a8k/app/type/TubeFeedingModuleSetting.java b/src/main/java/a8k/app/a8ktype/param/TubeFeedingModuleSetting.java similarity index 91% rename from src/main/java/a8k/app/type/TubeFeedingModuleSetting.java rename to src/main/java/a8k/app/a8ktype/param/TubeFeedingModuleSetting.java index 5c01d74..5e763b8 100644 --- a/src/main/java/a8k/app/type/TubeFeedingModuleSetting.java +++ b/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), // diff --git a/src/main/java/a8k/app/type/TubePreProcessGripperPos.java b/src/main/java/a8k/app/a8ktype/param/TubePreProcessGripperPos.java similarity index 92% rename from src/main/java/a8k/app/type/TubePreProcessGripperPos.java rename to src/main/java/a8k/app/a8ktype/param/TubePreProcessGripperPos.java index 4c0b0b3..2ed19be 100644 --- a/src/main/java/a8k/app/type/TubePreProcessGripperPos.java +++ b/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),// diff --git a/src/main/java/a8k/app/type/TubePreProcessTubeClamp.java b/src/main/java/a8k/app/a8ktype/param/TubePreProcessTubeClamp.java similarity index 91% rename from src/main/java/a8k/app/type/TubePreProcessTubeClamp.java rename to src/main/java/a8k/app/a8ktype/param/TubePreProcessTubeClamp.java index ba3eea2..baf8599 100644 --- a/src/main/java/a8k/app/type/TubePreProcessTubeClamp.java +++ b/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),// diff --git a/src/main/java/a8k/app/type/TubePreProcessYPos.java b/src/main/java/a8k/app/a8ktype/param/TubePreProcessYPos.java similarity index 91% rename from src/main/java/a8k/app/type/TubePreProcessYPos.java rename to src/main/java/a8k/app/a8ktype/param/TubePreProcessYPos.java index fa4deb3..22931af 100644 --- a/src/main/java/a8k/app/type/TubePreProcessYPos.java +++ b/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 { diff --git a/src/main/java/a8k/app/service/app/appstate/type/DeviceWorkState.java b/src/main/java/a8k/app/a8ktype/state/DeviceWorkState.java similarity index 86% rename from src/main/java/a8k/app/service/app/appstate/type/DeviceWorkState.java rename to src/main/java/a8k/app/a8ktype/state/DeviceWorkState.java index ec33d26..5412b44 100644 --- a/src/main/java/a8k/app/service/app/appstate/type/DeviceWorkState.java +++ b/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; diff --git a/src/main/java/a8k/app/service/app/appstate/type/EmergencyTubePos.java b/src/main/java/a8k/app/a8ktype/state/EmergencyTubePos.java similarity index 83% rename from src/main/java/a8k/app/service/app/appstate/type/EmergencyTubePos.java rename to src/main/java/a8k/app/a8ktype/state/EmergencyTubePos.java index 6ee2b3d..d48a8e0 100644 --- a/src/main/java/a8k/app/service/app/appstate/type/EmergencyTubePos.java +++ b/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; diff --git a/src/main/java/a8k/app/service/app/appstate/type/IncubationPlate.java b/src/main/java/a8k/app/a8ktype/state/IncubationPlate.java similarity index 88% rename from src/main/java/a8k/app/service/app/appstate/type/IncubationPlate.java rename to src/main/java/a8k/app/a8ktype/state/IncubationPlate.java index 2753966..50e1be3 100644 --- a/src/main/java/a8k/app/service/app/appstate/type/IncubationPlate.java +++ b/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; diff --git a/src/main/java/a8k/app/service/app/appstate/type/IncubationSubTank.java b/src/main/java/a8k/app/a8ktype/state/IncubationSubTank.java similarity index 89% rename from src/main/java/a8k/app/service/app/appstate/type/IncubationSubTank.java rename to src/main/java/a8k/app/a8ktype/state/IncubationSubTank.java index 72b5bc8..405dacf 100644 --- a/src/main/java/a8k/app/service/app/appstate/type/IncubationSubTank.java +++ b/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; diff --git a/src/main/java/a8k/app/service/app/appstate/type/OptScanModule.java b/src/main/java/a8k/app/a8ktype/state/OptScanModule.java similarity index 77% rename from src/main/java/a8k/app/service/app/appstate/type/OptScanModule.java rename to src/main/java/a8k/app/a8ktype/state/OptScanModule.java index 0242eb8..7f9d6e8 100644 --- a/src/main/java/a8k/app/service/app/appstate/type/OptScanModule.java +++ b/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; diff --git a/src/main/java/a8k/app/service/app/appstate/type/ProjProcessRecourcePacket.java b/src/main/java/a8k/app/a8ktype/state/ProjProcessRecourcePacket.java similarity index 82% rename from src/main/java/a8k/app/service/app/appstate/type/ProjProcessRecourcePacket.java rename to src/main/java/a8k/app/a8ktype/state/ProjProcessRecourcePacket.java index 70b3d86..7ffb8cf 100644 --- a/src/main/java/a8k/app/service/app/appstate/type/ProjProcessRecourcePacket.java +++ b/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; diff --git a/src/main/java/a8k/app/service/app/appstate/type/ProjectTaskContext.java b/src/main/java/a8k/app/a8ktype/state/ProjectTaskContext.java similarity index 94% rename from src/main/java/a8k/app/service/app/appstate/type/ProjectTaskContext.java rename to src/main/java/a8k/app/a8ktype/state/ProjectTaskContext.java index 5d8d33d..8507ae7 100644 --- a/src/main/java/a8k/app/service/app/appstate/type/ProjectTaskContext.java +++ b/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; diff --git a/src/main/java/a8k/app/service/app/appstate/type/SampleInfo.java b/src/main/java/a8k/app/a8ktype/state/SampleInfo.java similarity index 86% rename from src/main/java/a8k/app/service/app/appstate/type/SampleInfo.java rename to src/main/java/a8k/app/a8ktype/state/SampleInfo.java index 67b9a7a..dcf9dab 100644 --- a/src/main/java/a8k/app/service/app/appstate/type/SampleInfo.java +++ b/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; diff --git a/src/main/java/a8k/app/service/app/appstate/SensorState.java b/src/main/java/a8k/app/a8ktype/state/SensorState.java similarity index 94% rename from src/main/java/a8k/app/service/app/appstate/SensorState.java rename to src/main/java/a8k/app/a8ktype/state/SensorState.java index 3dcc079..78fdafb 100644 --- a/src/main/java/a8k/app/service/app/appstate/SensorState.java +++ b/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 { diff --git a/src/main/java/a8k/app/service/app/appstate/type/Tube.java b/src/main/java/a8k/app/a8ktype/state/Tube.java similarity index 86% rename from src/main/java/a8k/app/service/app/appstate/type/Tube.java rename to src/main/java/a8k/app/a8ktype/state/Tube.java index 6280af0..1b5076e 100644 --- a/src/main/java/a8k/app/service/app/appstate/type/Tube.java +++ b/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; diff --git a/src/main/java/a8k/app/service/app/appstate/type/TubeHolder.java b/src/main/java/a8k/app/a8ktype/state/TubeHolder.java similarity index 76% rename from src/main/java/a8k/app/service/app/appstate/type/TubeHolder.java rename to src/main/java/a8k/app/a8ktype/state/TubeHolder.java index cc7bf58..7a52fcb 100644 --- a/src/main/java/a8k/app/service/app/appstate/type/TubeHolder.java +++ b/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; diff --git a/src/main/java/a8k/app/service/app/appstate/type/state/A8kWorkState.java b/src/main/java/a8k/app/a8ktype/state/enumtype/A8kWorkState.java similarity index 52% rename from src/main/java/a8k/app/service/app/appstate/type/state/A8kWorkState.java rename to src/main/java/a8k/app/a8ktype/state/enumtype/A8kWorkState.java index 3c22caf..7dd924a 100644 --- a/src/main/java/a8k/app/service/app/appstate/type/state/A8kWorkState.java +++ b/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, diff --git a/src/main/java/a8k/app/service/app/appstate/type/state/IncubationSubTankState.java b/src/main/java/a8k/app/a8ktype/state/enumtype/IncubationSubTankState.java similarity index 86% rename from src/main/java/a8k/app/service/app/appstate/type/state/IncubationSubTankState.java rename to src/main/java/a8k/app/a8ktype/state/enumtype/IncubationSubTankState.java index 4b7dabb..db8cbfb 100644 --- a/src/main/java/a8k/app/service/app/appstate/type/state/IncubationSubTankState.java +++ b/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; diff --git a/src/main/java/a8k/app/service/app/appstate/type/state/OptScanModuleState.java b/src/main/java/a8k/app/a8ktype/state/enumtype/OptScanModuleState.java similarity index 81% rename from src/main/java/a8k/app/service/app/appstate/type/state/OptScanModuleState.java rename to src/main/java/a8k/app/a8ktype/state/enumtype/OptScanModuleState.java index a898bb9..5b13c4f 100644 --- a/src/main/java/a8k/app/service/app/appstate/type/state/OptScanModuleState.java +++ b/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; diff --git a/src/main/java/a8k/app/service/app/appstate/type/state/ProjProcessState.java b/src/main/java/a8k/app/a8ktype/state/enumtype/ProjProcessState.java similarity index 67% rename from src/main/java/a8k/app/service/app/appstate/type/state/ProjProcessState.java rename to src/main/java/a8k/app/a8ktype/state/enumtype/ProjProcessState.java index a711c03..c6b1454 100644 --- a/src/main/java/a8k/app/service/app/appstate/type/state/ProjProcessState.java +++ b/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, diff --git a/src/main/java/a8k/app/service/app/appstate/type/state/TubeHolderProgress.java b/src/main/java/a8k/app/a8ktype/state/enumtype/TubeHolderProgress.java similarity index 66% rename from src/main/java/a8k/app/service/app/appstate/type/state/TubeHolderProgress.java rename to src/main/java/a8k/app/a8ktype/state/enumtype/TubeHolderProgress.java index 19e4cd9..01e16ca 100644 --- a/src/main/java/a8k/app/service/app/appstate/type/state/TubeHolderProgress.java +++ b/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, //空闲 diff --git a/src/main/java/a8k/app/service/app/appstate/type/state/TubeHolderState.java b/src/main/java/a8k/app/a8ktype/state/enumtype/TubeHolderState.java similarity index 65% rename from src/main/java/a8k/app/service/app/appstate/type/state/TubeHolderState.java rename to src/main/java/a8k/app/a8ktype/state/enumtype/TubeHolderState.java index b6a2ace..a427589 100644 --- a/src/main/java/a8k/app/service/app/appstate/type/state/TubeHolderState.java +++ b/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, //没有试管架 diff --git a/src/main/java/a8k/app/service/app/appstate/type/state/TubeState.java b/src/main/java/a8k/app/a8ktype/state/enumtype/TubeState.java similarity index 90% rename from src/main/java/a8k/app/service/app/appstate/type/state/TubeState.java rename to src/main/java/a8k/app/a8ktype/state/enumtype/TubeState.java index 7914dc9..94125eb 100644 --- a/src/main/java/a8k/app/service/app/appstate/type/state/TubeState.java +++ b/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; diff --git a/src/main/java/a8k/app/type/ConsumableOneChRawResult.java b/src/main/java/a8k/app/a8ktype/type/ConsumableOneChRawResult.java similarity index 94% rename from src/main/java/a8k/app/type/ConsumableOneChRawResult.java rename to src/main/java/a8k/app/a8ktype/type/ConsumableOneChRawResult.java index 6f78611..fcdb41a 100644 --- a/src/main/java/a8k/app/type/ConsumableOneChRawResult.java +++ b/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; diff --git a/src/main/java/a8k/app/type/ConsumableScanRawResult.java b/src/main/java/a8k/app/a8ktype/type/ConsumableScanRawResult.java similarity index 91% rename from src/main/java/a8k/app/type/ConsumableScanRawResult.java rename to src/main/java/a8k/app/a8ktype/type/ConsumableScanRawResult.java index 1a799ac..8aedcaa 100644 --- a/src/main/java/a8k/app/type/ConsumableScanRawResult.java +++ b/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; diff --git a/src/main/java/a8k/app/type/ConsumablesOneChannelScanResultPacket.java b/src/main/java/a8k/app/a8ktype/type/ConsumablesOneChannelScanResultPacket.java similarity index 79% rename from src/main/java/a8k/app/type/ConsumablesOneChannelScanResultPacket.java rename to src/main/java/a8k/app/a8ktype/type/ConsumablesOneChannelScanResultPacket.java index 922452b..7c193cd 100644 --- a/src/main/java/a8k/app/type/ConsumablesOneChannelScanResultPacket.java +++ b/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 { diff --git a/src/main/java/a8k/app/type/ConsumablesScanReport.java b/src/main/java/a8k/app/a8ktype/type/ConsumablesScanReport.java similarity index 83% rename from src/main/java/a8k/app/type/ConsumablesScanReport.java rename to src/main/java/a8k/app/a8ktype/type/ConsumablesScanReport.java index 22dfc33..2b52005 100644 --- a/src/main/java/a8k/app/type/ConsumablesScanReport.java +++ b/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 = "耗材扫描报告") diff --git a/src/main/java/a8k/app/type/ConsumablesScanResultPacket.java b/src/main/java/a8k/app/a8ktype/type/ConsumablesScanResultPacket.java similarity index 80% rename from src/main/java/a8k/app/type/ConsumablesScanResultPacket.java rename to src/main/java/a8k/app/a8ktype/type/ConsumablesScanResultPacket.java index efe4703..e2089fe 100644 --- a/src/main/java/a8k/app/type/ConsumablesScanResultPacket.java +++ b/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; diff --git a/src/main/java/a8k/app/type/LittleBottleConsumableRefPoint.java b/src/main/java/a8k/app/a8ktype/type/LittleBottleConsumableRefPoint.java similarity index 89% rename from src/main/java/a8k/app/type/LittleBottleConsumableRefPoint.java rename to src/main/java/a8k/app/a8ktype/type/LittleBottleConsumableRefPoint.java index ee34019..422ad0b 100644 --- a/src/main/java/a8k/app/type/LittleBottleConsumableRefPoint.java +++ b/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; diff --git a/src/main/java/a8k/app/type/PlateInfo.java b/src/main/java/a8k/app/a8ktype/type/PlateInfo.java similarity index 91% rename from src/main/java/a8k/app/type/PlateInfo.java rename to src/main/java/a8k/app/a8ktype/type/PlateInfo.java index a96212c..f8cb0f1 100644 --- a/src/main/java/a8k/app/type/PlateInfo.java +++ b/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 { diff --git a/src/main/java/a8k/app/type/ProjBriefInfo.java b/src/main/java/a8k/app/a8ktype/type/ProjBriefInfo.java similarity index 96% rename from src/main/java/a8k/app/type/ProjBriefInfo.java rename to src/main/java/a8k/app/a8ktype/type/ProjBriefInfo.java index 078fa9d..896c394 100644 --- a/src/main/java/a8k/app/type/ProjBriefInfo.java +++ b/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; diff --git a/src/main/java/a8k/app/type/ReactionResult.java b/src/main/java/a8k/app/a8ktype/type/ReactionResult.java similarity index 93% rename from src/main/java/a8k/app/type/ReactionResult.java rename to src/main/java/a8k/app/a8ktype/type/ReactionResult.java index 7dfca00..7095036 100644 --- a/src/main/java/a8k/app/type/ReactionResult.java +++ b/src/main/java/a8k/app/a8ktype/type/ReactionResult.java @@ -1,7 +1,7 @@ -package a8k.app.type; +package a8k.app.a8ktype.type; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kResultUnit; -import a8k.app.type.reaction_result_type.ReactionResultStatus; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kResultUnit; +import a8k.app.a8ktype.opttype.ReactionResultStatus; import a8k.app.utils.ZJsonHelper; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/a8k/app/type/TargetPosMeasureDirection.java b/src/main/java/a8k/app/a8ktype/type/TargetPosMeasureDirection.java similarity index 70% rename from src/main/java/a8k/app/type/TargetPosMeasureDirection.java rename to src/main/java/a8k/app/a8ktype/type/TargetPosMeasureDirection.java index 653798a..c7e6b8d 100644 --- a/src/main/java/a8k/app/type/TargetPosMeasureDirection.java +++ b/src/main/java/a8k/app/a8ktype/type/TargetPosMeasureDirection.java @@ -1,4 +1,4 @@ -package a8k.app.type; +package a8k.app.a8ktype.type; public enum TargetPosMeasureDirection { NOTCARE, POSITIVE, NEGATIVE; diff --git a/src/main/java/a8k/app/type/TipPosConfig.java b/src/main/java/a8k/app/a8ktype/type/TipPosConfig.java similarity index 72% rename from src/main/java/a8k/app/type/TipPosConfig.java rename to src/main/java/a8k/app/a8ktype/type/TipPosConfig.java index 5f296e1..b8b68dc 100644 --- a/src/main/java/a8k/app/type/TipPosConfig.java +++ b/src/main/java/a8k/app/a8ktype/type/TipPosConfig.java @@ -1,6 +1,6 @@ -package a8k.app.type; +package a8k.app.a8ktype.type; -import a8k.app.type.cfg.Pos3d; +import a8k.app.a8ktype.device.Pos3d; import a8k.app.a8ktype.device.TipGroup; public class TipPosConfig { diff --git a/src/main/java/a8k/app/type/TubeHolderScanResult.java b/src/main/java/a8k/app/a8ktype/type/TubeHolderScanResult.java similarity index 93% rename from src/main/java/a8k/app/type/TubeHolderScanResult.java rename to src/main/java/a8k/app/a8ktype/type/TubeHolderScanResult.java index d30ca10..80c2fd1 100644 --- a/src/main/java/a8k/app/type/TubeHolderScanResult.java +++ b/src/main/java/a8k/app/a8ktype/type/TubeHolderScanResult.java @@ -1,4 +1,4 @@ -package a8k.app.type; +package a8k.app.a8ktype.type; import java.util.Arrays; diff --git a/src/main/java/a8k/app/type/TubesScanResult.java b/src/main/java/a8k/app/a8ktype/type/TubesScanResult.java similarity index 94% rename from src/main/java/a8k/app/type/TubesScanResult.java rename to src/main/java/a8k/app/a8ktype/type/TubesScanResult.java index fe30103..72ee191 100644 --- a/src/main/java/a8k/app/type/TubesScanResult.java +++ b/src/main/java/a8k/app/a8ktype/type/TubesScanResult.java @@ -1,4 +1,4 @@ -package a8k.app.type; +package a8k.app.a8ktype.type; public class TubesScanResult { public Boolean isTubeExist = false; diff --git a/src/main/java/a8k/app/type/appret/ApiRet.java b/src/main/java/a8k/app/a8ktype/ui/ApiRet.java similarity index 91% rename from src/main/java/a8k/app/type/appret/ApiRet.java rename to src/main/java/a8k/app/a8ktype/ui/ApiRet.java index 569c3b1..308854e 100644 --- a/src/main/java/a8k/app/type/appret/ApiRet.java +++ b/src/main/java/a8k/app/a8ktype/ui/ApiRet.java @@ -1,9 +1,8 @@ -package a8k.app.type.appret; +package a8k.app.a8ktype.ui; import a8k.app.factory.ZAppPromoptFactory; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.app.type.exception.AppException; -import a8k.app.type.ui.ZAppPromopt; +import a8k.app.a8ktype.exception.AppException; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Getter; diff --git a/src/main/java/a8k/app/type/tube_setting/TubeHolderSetting.java b/src/main/java/a8k/app/a8ktype/ui/TubeHolderSetting.java similarity index 88% rename from src/main/java/a8k/app/type/tube_setting/TubeHolderSetting.java rename to src/main/java/a8k/app/a8ktype/ui/TubeHolderSetting.java index 21a7023..70832ef 100644 --- a/src/main/java/a8k/app/type/tube_setting/TubeHolderSetting.java +++ b/src/main/java/a8k/app/a8ktype/ui/TubeHolderSetting.java @@ -1,12 +1,9 @@ -package a8k.app.type.tube_setting; +package a8k.app.a8ktype.ui; -import a8k.app.type.type.A8kTubeHolderType; -import a8k.app.type.type.BloodType; -import com.fasterxml.jackson.annotation.JsonIgnore; +import a8k.app.a8ktype.device.BloodType; import io.swagger.v3.oas.annotations.media.Schema; import java.io.Serializable; -import java.util.ArrayList; import java.util.UUID; diff --git a/src/main/java/a8k/app/type/tube_setting/TubeSetting.java b/src/main/java/a8k/app/a8ktype/ui/TubeSetting.java similarity index 95% rename from src/main/java/a8k/app/type/tube_setting/TubeSetting.java rename to src/main/java/a8k/app/a8ktype/ui/TubeSetting.java index 916a4ee..a616a9d 100644 --- a/src/main/java/a8k/app/type/tube_setting/TubeSetting.java +++ b/src/main/java/a8k/app/a8ktype/ui/TubeSetting.java @@ -1,6 +1,6 @@ -package a8k.app.type.tube_setting; +package a8k.app.a8ktype.ui; -import a8k.app.type.type.BloodType; +import a8k.app.a8ktype.device.BloodType; import cn.hutool.core.util.ObjectUtil; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/a8k/app/a8ktype/ui/ZAppErrorStackInfo.java b/src/main/java/a8k/app/a8ktype/ui/ZAppErrorStackInfo.java new file mode 100644 index 0000000..d871e3a --- /dev/null +++ b/src/main/java/a8k/app/a8ktype/ui/ZAppErrorStackInfo.java @@ -0,0 +1,5 @@ +package a8k.app.a8ktype.ui; + +public class ZAppErrorStackInfo { + public String[] stackTraceElements; +} diff --git a/src/main/java/a8k/app/type/ui/ZAppPromopt.java b/src/main/java/a8k/app/a8ktype/ui/ZAppPromopt.java similarity index 94% rename from src/main/java/a8k/app/type/ui/ZAppPromopt.java rename to src/main/java/a8k/app/a8ktype/ui/ZAppPromopt.java index 2b8689f..dd31541 100644 --- a/src/main/java/a8k/app/type/ui/ZAppPromopt.java +++ b/src/main/java/a8k/app/a8ktype/ui/ZAppPromopt.java @@ -1,4 +1,4 @@ -package a8k.app.type.ui; +package a8k.app.a8ktype.ui; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/a8k/app/type/ui/ZAppPromoptDetailInfo.java b/src/main/java/a8k/app/a8ktype/ui/ZAppPromoptDetailInfo.java similarity index 88% rename from src/main/java/a8k/app/type/ui/ZAppPromoptDetailInfo.java rename to src/main/java/a8k/app/a8ktype/ui/ZAppPromoptDetailInfo.java index a49b7d4..3707630 100644 --- a/src/main/java/a8k/app/type/ui/ZAppPromoptDetailInfo.java +++ b/src/main/java/a8k/app/a8ktype/ui/ZAppPromoptDetailInfo.java @@ -1,4 +1,4 @@ -package a8k.app.type.ui; +package a8k.app.a8ktype.ui; public class ZAppPromoptDetailInfo { public String name; diff --git a/src/main/java/a8k/app/type/ui/ZAppPromoptType.java b/src/main/java/a8k/app/a8ktype/ui/ZAppPromoptType.java similarity index 79% rename from src/main/java/a8k/app/type/ui/ZAppPromoptType.java rename to src/main/java/a8k/app/a8ktype/ui/ZAppPromoptType.java index 8801bf4..242be5c 100644 --- a/src/main/java/a8k/app/type/ui/ZAppPromoptType.java +++ b/src/main/java/a8k/app/a8ktype/ui/ZAppPromoptType.java @@ -1,4 +1,4 @@ -package a8k.app.type.ui; +package a8k.app.a8ktype.ui; public enum ZAppPromoptType { Notify, //通知 diff --git a/src/main/java/a8k/app/checker/ProjInfoChecker.java b/src/main/java/a8k/app/checker/ProjInfoChecker.java index 07c4b2f..5cf6b64 100644 --- a/src/main/java/a8k/app/checker/ProjInfoChecker.java +++ b/src/main/java/a8k/app/checker/ProjInfoChecker.java @@ -1,7 +1,7 @@ package a8k.app.checker; -import a8k.app.service.dao.ProjOptInfoDao; -import a8k.app.service.dao.ProjectBaseInfoDao; +import a8k.app.dao.db.ProjOptInfoDao; +import a8k.app.dao.db.ProjectBaseInfoDao; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import org.slf4j.Logger; diff --git a/src/main/java/a8k/app/constant/MiniServoConstant.java b/src/main/java/a8k/app/constant/MiniServoConstant.java index 50449a5..f48fe57 100644 --- a/src/main/java/a8k/app/constant/MiniServoConstant.java +++ b/src/main/java/a8k/app/constant/MiniServoConstant.java @@ -1,6 +1,6 @@ package a8k.app.constant; -import a8k.app.service.app.driver.base.type.MiniServoMId; +import a8k.app.hardware.driver.type.MiniServoMId; import org.springframework.util.Assert; public class MiniServoConstant { diff --git a/src/main/java/a8k/app/controler/api/v1/ApiV1ControllerAdvice.java b/src/main/java/a8k/app/controler/api/v1/ApiV1ControllerAdvice.java index 05c3719..d152db1 100644 --- a/src/main/java/a8k/app/controler/api/v1/ApiV1ControllerAdvice.java +++ b/src/main/java/a8k/app/controler/api/v1/ApiV1ControllerAdvice.java @@ -1,7 +1,6 @@ package a8k.app.controler.api.v1; -import a8k.app.type.appret.ApiRet; -import a8k.app.type.ecode.AppError; +import a8k.app.a8ktype.ui.ApiRet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.ControllerAdvice; diff --git a/src/main/java/a8k/app/controler/api/v1/app/assistant/ApiRetTestControler.java b/src/main/java/a8k/app/controler/api/v1/app/assistant/ApiRetTestControler.java index 08aefe1..d6fcdce 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/assistant/ApiRetTestControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/assistant/ApiRetTestControler.java @@ -3,9 +3,9 @@ package a8k.app.controler.api.v1.app.assistant; 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.appret.ApiRet; -import a8k.app.type.ecode.*; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.ui.ApiRet; +import a8k.app.a8ktype.error.*; +import a8k.app.a8ktype.exception.AppException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/a8k/app/controler/api/v1/app/basic/AppEventBusControler.java b/src/main/java/a8k/app/controler/api/v1/app/basic/AppEventBusControler.java index d3add68..60a1150 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/basic/AppEventBusControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/basic/AppEventBusControler.java @@ -1,8 +1,8 @@ package a8k.app.controler.api.v1.app.basic; import a8k.app.service.bases.FrontEndEventRouter; -import a8k.app.service.bases.appevent.AppEvent; -import a8k.app.type.appret.ApiRet; +import a8k.app.a8ktype.appevent.AppEvent; +import a8k.app.a8ktype.ui.ApiRet; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/controler/api/v1/app/ctrl/ConsumableScanControler.java b/src/main/java/a8k/app/controler/api/v1/app/ctrl/ConsumableScanControler.java index f305bf0..3df1bef 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/ctrl/ConsumableScanControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/ctrl/ConsumableScanControler.java @@ -1,12 +1,12 @@ package a8k.app.controler.api.v1.app.ctrl; -import a8k.app.service.app.appctrl.AppConsumablesScanService; -import a8k.app.service.app.appstate.statemgr.ConsumablesMgrService; +import a8k.app.service.mainctrl.AppConsumablesScanService; +import a8k.app.service.statemgr.ConsumablesMgrService; import a8k.app.a8ktype.device.ConsumableGroup; -import a8k.app.type.ConsumablesOneChannelScanResultPacket; -import a8k.app.type.ConsumablesScanResultPacket; -import a8k.app.type.appret.ApiRet; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.type.ConsumablesOneChannelScanResultPacket; +import a8k.app.a8ktype.type.ConsumablesScanResultPacket; +import a8k.app.a8ktype.ui.ApiRet; +import a8k.app.a8ktype.exception.AppException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/controler/api/v1/app/ctrl/DeviceCtrlControler.java b/src/main/java/a8k/app/controler/api/v1/app/ctrl/DeviceCtrlControler.java index 6730d65..ca8ecb7 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/ctrl/DeviceCtrlControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/ctrl/DeviceCtrlControler.java @@ -1,8 +1,8 @@ package a8k.app.controler.api.v1.app.ctrl; -import a8k.app.service.app.appctrl.AppDeviceCtrlService; -import a8k.app.type.appret.ApiRet; -import a8k.app.type.exception.AppException; +import a8k.app.service.mainctrl.AppDeviceCtrlService; +import a8k.app.a8ktype.ui.ApiRet; +import a8k.app.a8ktype.exception.AppException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/controler/api/v1/app/ctrl/DeviceInit.java b/src/main/java/a8k/app/controler/api/v1/app/ctrl/DeviceInit.java index 7e16ebd..2c722ef 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/ctrl/DeviceInit.java +++ b/src/main/java/a8k/app/controler/api/v1/app/ctrl/DeviceInit.java @@ -1,10 +1,10 @@ package a8k.app.controler.api.v1.app.ctrl; -import a8k.app.service.app.background.BackgroudProcessCtrlService; -import a8k.app.service.app.driver.ctrlservice.DeviceInitCtrlService; -import a8k.app.type.appret.ApiRet; -import a8k.app.type.checkpoint.CheckResult; -import a8k.app.type.exception.AppException; +import a8k.app.service.background.BackgroudProcessCtrlService; +import a8k.app.service.lowerctrl.DeviceInitCtrlService; +import a8k.app.a8ktype.ui.ApiRet; +import a8k.app.a8ktype.others.checkpoint.CheckResult; +import a8k.app.a8ktype.exception.AppException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/controler/api/v1/app/ctrl/OsCtrlControler.java b/src/main/java/a8k/app/controler/api/v1/app/ctrl/OsCtrlControler.java index 069152e..eabc432 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/ctrl/OsCtrlControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/ctrl/OsCtrlControler.java @@ -2,8 +2,8 @@ package a8k.app.controler.api.v1.app.ctrl; import a8k.OS; import a8k.app.controler.api.v1.type.OsInfoPack; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.type.appret.ApiRet; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.a8ktype.ui.ApiRet; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody; public class OsCtrlControler { @Resource - GStateService gstate; + GStateMgrService gstate; /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ * 系统控制 diff --git a/src/main/java/a8k/app/controler/api/v1/app/data/A8kProjectCardControler.java b/src/main/java/a8k/app/controler/api/v1/app/data/A8kProjectCardControler.java index 0b8ef79..4756e1d 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/data/A8kProjectCardControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/data/A8kProjectCardControler.java @@ -1,11 +1,11 @@ package a8k.app.controler.api.v1.app.data; -import a8k.app.service.app.appdata.ProjIdCardInfoMgrService; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.service.dao.type.A8kProjInfoCardBreif; -import a8k.app.type.appret.ApiRet; -import a8k.app.type.db.CommonPage; -import a8k.app.type.exception.AppException; +import a8k.app.service.data.ProjIdCardInfoMgrService; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.dao.db.type.A8kProjInfoCardBreif; +import a8k.app.a8ktype.ui.ApiRet; +import a8k.app.a8ktype.db.CommonPage; +import a8k.app.a8ktype.exception.AppException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.ResponseBody; public class A8kProjectCardControler { @Resource - GStateService gstate; + GStateMgrService gstate; @Resource ProjIdCardInfoMgrService projIdCardInfoMgrService; diff --git a/src/main/java/a8k/app/controler/api/v1/app/data/A8kProjectInfoControler.java b/src/main/java/a8k/app/controler/api/v1/app/data/A8kProjectInfoControler.java index 8b55dda..5f47a95 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/data/A8kProjectInfoControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/data/A8kProjectInfoControler.java @@ -1,9 +1,9 @@ package a8k.app.controler.api.v1.app.data; -import a8k.app.service.dao.ProjectBaseInfoDao; -import a8k.app.service.dao.type.ProjectBaseInfo; -import a8k.app.type.appret.ApiRet; -import a8k.app.type.exception.AppException; +import a8k.app.dao.db.ProjectBaseInfoDao; +import a8k.app.dao.db.type.ProjectBaseInfo; +import a8k.app.a8ktype.ui.ApiRet; +import a8k.app.a8ktype.exception.AppException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/controler/api/v1/app/data/ReactionResultControler.java b/src/main/java/a8k/app/controler/api/v1/app/data/ReactionResultControler.java index f008e73..9a1c470 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/data/ReactionResultControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/data/ReactionResultControler.java @@ -1,10 +1,10 @@ package a8k.app.controler.api.v1.app.data; -import a8k.app.service.app.appdata.ReactionRecordMgrService; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.service.dao.type.ReactionResultRecord; -import a8k.app.type.appret.ApiRet; -import a8k.app.type.db.CommonPage; +import a8k.app.service.data.ReactionRecordMgrService; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.dao.db.type.ReactionResultRecord; +import a8k.app.a8ktype.ui.ApiRet; +import a8k.app.a8ktype.db.CommonPage; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; @@ -23,7 +23,7 @@ import java.util.List; public class ReactionResultControler { @Resource - GStateService gstate; + GStateMgrService gstate; @Resource ReactionRecordMgrService reactionRecordMgrService; diff --git a/src/main/java/a8k/app/controler/api/v1/app/data/UsrControler.java b/src/main/java/a8k/app/controler/api/v1/app/data/UsrControler.java index 2df8adb..5c0b183 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/data/UsrControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/data/UsrControler.java @@ -1,10 +1,10 @@ package a8k.app.controler.api.v1.app.data; -import a8k.app.service.app.appdata.AppUserMgrService; -import a8k.app.service.dao.type.AppUser; -import a8k.app.service.dao.type.UsrRole; -import a8k.app.type.appret.ApiRet; -import a8k.app.type.exception.AppException; +import a8k.app.service.data.AppUserMgrService; +import a8k.app.dao.db.type.AppUser; +import a8k.app.dao.db.type.UsrRole; +import a8k.app.a8ktype.ui.ApiRet; +import a8k.app.a8ktype.exception.AppException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/controler/api/v1/app/setting/AppSettingControler.java b/src/main/java/a8k/app/controler/api/v1/app/setting/AppSettingControler.java index 6619f72..e2ce4ec 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/setting/AppSettingControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/setting/AppSettingControler.java @@ -1,9 +1,9 @@ package a8k.app.controler.api.v1.app.setting; -import a8k.app.service.app.appsetting.AppSettingsMgrService; -import a8k.app.service.dao.type.AppSetting; -import a8k.app.service.dao.type.appsetting.settingenum.*; -import a8k.app.type.appret.ApiRet; +import a8k.app.service.setting.AppSettingsMgrService; +import a8k.app.dao.db.type.AppSetting; +import a8k.app.dao.db.type.appsetting.settingenum.*; +import a8k.app.a8ktype.ui.ApiRet; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/controler/api/v1/app/state/AppTubeSettingMgrControler.java b/src/main/java/a8k/app/controler/api/v1/app/state/AppTubeSettingMgrControler.java index 2f85d7f..b1f70f9 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/state/AppTubeSettingMgrControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/state/AppTubeSettingMgrControler.java @@ -1,11 +1,11 @@ package a8k.app.controler.api.v1.app.state; -import a8k.app.service.app.appctrl.AppTubeSettingMgrService; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.type.appret.ApiRet; -import a8k.app.type.exception.AppException; -import a8k.app.type.tube_setting.TubeHolderSetting; -import a8k.app.type.tube_setting.TubeSetting; +import a8k.app.service.mainctrl.AppTubeSettingMgrService; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.a8ktype.ui.ApiRet; +import a8k.app.a8ktype.exception.AppException; +import a8k.app.a8ktype.ui.TubeHolderSetting; +import a8k.app.a8ktype.ui.TubeSetting; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; @@ -29,7 +29,7 @@ public class AppTubeSettingMgrControler { @Resource AppTubeSettingMgrService appTubeSettingMgrService; @Resource - GStateService gstate; + GStateMgrService gstate; // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ // EXTERNAL API // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/src/main/java/a8k/app/controler/api/v1/app/state/ConsumablesMgrControler.java b/src/main/java/a8k/app/controler/api/v1/app/state/ConsumablesMgrControler.java index 07f2085..b606015 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/state/ConsumablesMgrControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/state/ConsumablesMgrControler.java @@ -1,11 +1,11 @@ package a8k.app.controler.api.v1.app.state; -import a8k.app.service.app.appctrl.AppConsumablesScanService; -import a8k.app.service.app.appstate.statemgr.ConsumablesMgrService; -import a8k.app.service.app.appstate.GStateService; +import a8k.app.service.mainctrl.AppConsumablesScanService; +import a8k.app.service.statemgr.ConsumablesMgrService; +import a8k.app.service.statemgr.GStateMgrService; import a8k.app.a8ktype.device.ConsumableGroup; -import a8k.app.type.appret.ApiRet; -import a8k.app.type.consumables.ConsumableState; +import a8k.app.a8ktype.ui.ApiRet; +import a8k.app.a8ktype.device.consumables.ConsumableState; import a8k.app.a8ktype.device.TipGroup; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -25,9 +25,9 @@ public class ConsumablesMgrControler { @Resource AppConsumablesScanService appConsumablesScanService; //耗材扫描模块 @Resource - ConsumablesMgrService consumablesMgrService; //耗材管理模块 + ConsumablesMgrService consumablesMgrService; //耗材管理模块 @Resource - GStateService gstate; + GStateMgrService gstate; /** * 设置Tip数量 diff --git a/src/main/java/a8k/app/controler/api/v1/app/state/DeviceStateControler.java b/src/main/java/a8k/app/controler/api/v1/app/state/DeviceStateControler.java index 8c71e8b..310192c 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/state/DeviceStateControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/state/DeviceStateControler.java @@ -1,13 +1,13 @@ package a8k.app.controler.api.v1.app.state; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.service.app.appstate.SensorState; -import a8k.app.service.app.appstate.statemgr.DeviceWorkStateMgrService; -import a8k.app.service.app.appstate.statemgr.IncubationPlateStateMgrService; -import a8k.app.service.app.appstate.statemgr.OptScanModuleStateMgrService; -import a8k.app.service.app.appstate.statemgr.TubeStateMgrService; -import a8k.app.service.app.appstate.type.*; -import a8k.app.type.appret.ApiRet; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.a8ktype.state.SensorState; +import a8k.app.service.statemgr.DeviceWorkStateMgrService; +import a8k.app.service.statemgr.IncubationPlateStateMgrService; +import a8k.app.service.statemgr.OptScanModuleStateMgrService; +import a8k.app.service.statemgr.TubeStateMgrService; +import a8k.app.a8ktype.state.*; +import a8k.app.a8ktype.ui.ApiRet; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; @@ -24,9 +24,9 @@ import org.springframework.web.bind.annotation.ResponseBody; @ResponseBody public class DeviceStateControler { @Resource - GStateService gstate; + GStateMgrService gstate; @Resource - DeviceWorkStateMgrService deviceWorkStateMgrService; + DeviceWorkStateMgrService deviceWorkStateMgrService; @Resource TubeStateMgrService tubeStateMgrService; @Resource diff --git a/src/main/java/a8k/app/controler/api/v1/app/state/EmergencyTubeControler.java b/src/main/java/a8k/app/controler/api/v1/app/state/EmergencyTubeControler.java index c016123..40eac53 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/state/EmergencyTubeControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/state/EmergencyTubeControler.java @@ -2,10 +2,10 @@ package a8k.app.controler.api.v1.app.state; import a8k.app.controler.api.v1.type.EmergencyTubeSetting; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.service.app.appstate.statemgr.TubeStateMgrService; -import a8k.app.type.appret.ApiRet; -import a8k.app.type.exception.AppException; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.service.statemgr.TubeStateMgrService; +import a8k.app.a8ktype.ui.ApiRet; +import a8k.app.a8ktype.exception.AppException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.ResponseBody; @ResponseBody public class EmergencyTubeControler { @Resource - GStateService gstate; + GStateMgrService gstate; @Resource TubeStateMgrService tubeStateMgrService; diff --git a/src/main/java/a8k/app/controler/api/v1/app/ws/AppWebSocketEndpointMgr.java b/src/main/java/a8k/app/controler/api/v1/app/ws/AppWebSocketEndpointMgr.java index d903a2c..2a272ba 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/ws/AppWebSocketEndpointMgr.java +++ b/src/main/java/a8k/app/controler/api/v1/app/ws/AppWebSocketEndpointMgr.java @@ -1,7 +1,6 @@ package a8k.app.controler.api.v1.app.ws; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.service.app.appstate.statemgr.*; +import a8k.app.service.statemgr.*; import a8k.app.service.bases.FrontEndEventRouter; import a8k.app.utils.ZJsonHelper; import jakarta.annotation.PostConstruct; @@ -16,7 +15,6 @@ import jakarta.websocket.*; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.Future; @Component @EnableScheduling @@ -39,7 +37,7 @@ public class AppWebSocketEndpointMgr { @Resource FrontEndEventRouter frontEndEventRouter; @Resource - GStateService gstate; + GStateMgrService gstate; @Resource DeviceWorkStateMgrService deviceWorkStateMgrService; @Resource diff --git a/src/main/java/a8k/app/controler/api/v1/type/EmergencyTubeSetting.java b/src/main/java/a8k/app/controler/api/v1/type/EmergencyTubeSetting.java index 5406dc5..8c58191 100644 --- a/src/main/java/a8k/app/controler/api/v1/type/EmergencyTubeSetting.java +++ b/src/main/java/a8k/app/controler/api/v1/type/EmergencyTubeSetting.java @@ -1,6 +1,6 @@ package a8k.app.controler.api.v1.type; -import a8k.app.type.type.BloodType; +import a8k.app.a8ktype.device.BloodType; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/a8k/app/controler/filemgr/OptFileMgrController.java b/src/main/java/a8k/app/controler/filemgr/OptFileMgrController.java index 22c06b8..d0680a6 100644 --- a/src/main/java/a8k/app/controler/filemgr/OptFileMgrController.java +++ b/src/main/java/a8k/app/controler/filemgr/OptFileMgrController.java @@ -1,7 +1,7 @@ package a8k.app.controler.filemgr; -import a8k.app.service.app.appdata.FileMgrService; -import a8k.app.type.appret.AppRetV1; +import a8k.app.service.data.FileMgrService; +import a8k.extui.type.AppRetV1; import cn.hutool.core.net.URLDecoder; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/a8k/app/controler/filemgr/StorageControler.java b/src/main/java/a8k/app/controler/filemgr/StorageControler.java index 8b40753..a5f4696 100644 --- a/src/main/java/a8k/app/controler/filemgr/StorageControler.java +++ b/src/main/java/a8k/app/controler/filemgr/StorageControler.java @@ -1,6 +1,6 @@ package a8k.app.controler.filemgr; -import a8k.app.service.app.appdata.FileMgrService; +import a8k.app.service.data.FileMgrService; import cn.hutool.core.net.URLDecoder; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/a8k/app/service/dao/A8kProjExtInfoCardDao.java b/src/main/java/a8k/app/dao/db/A8kProjExtInfoCardDao.java similarity index 92% rename from src/main/java/a8k/app/service/dao/A8kProjExtInfoCardDao.java rename to src/main/java/a8k/app/dao/db/A8kProjExtInfoCardDao.java index c5c3864..0582c0d 100644 --- a/src/main/java/a8k/app/service/dao/A8kProjExtInfoCardDao.java +++ b/src/main/java/a8k/app/dao/db/A8kProjExtInfoCardDao.java @@ -1,9 +1,8 @@ -package a8k.app.service.dao; +package a8k.app.dao.db; -import a8k.app.service.app.appdata.UtilsProjectColorAllocer; -import a8k.app.service.dao.type.ProjExtInfoCard; - -import a8k.app.type.db.CommonPage; +import a8k.app.a8ktype.db.CommonPage; +import a8k.app.dao.db.type.ProjExtInfoCard; +import a8k.app.service.data.UtilsProjectColorAllocer; import a8k.app.utils.ZSqlite; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/service/dao/AppSettingDao.java b/src/main/java/a8k/app/dao/db/AppSettingDao.java similarity index 92% rename from src/main/java/a8k/app/service/dao/AppSettingDao.java rename to src/main/java/a8k/app/dao/db/AppSettingDao.java index 3bde2b6..43e71d5 100644 --- a/src/main/java/a8k/app/service/dao/AppSettingDao.java +++ b/src/main/java/a8k/app/dao/db/AppSettingDao.java @@ -1,7 +1,7 @@ -package a8k.app.service.dao; +package a8k.app.dao.db; -import a8k.app.service.app.appdata.UtilsProjectColorAllocer; -import a8k.app.service.dao.type.AppSetting; +import a8k.app.service.data.UtilsProjectColorAllocer; +import a8k.app.dao.db.type.AppSetting; import a8k.app.utils.ZSqliteJdbcHelper; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/app/service/dao/AppUsrDao.java b/src/main/java/a8k/app/dao/db/AppUsrDao.java similarity index 95% rename from src/main/java/a8k/app/service/dao/AppUsrDao.java rename to src/main/java/a8k/app/dao/db/AppUsrDao.java index ad994c4..276e487 100644 --- a/src/main/java/a8k/app/service/dao/AppUsrDao.java +++ b/src/main/java/a8k/app/dao/db/AppUsrDao.java @@ -1,8 +1,8 @@ -package a8k.app.service.dao; +package a8k.app.dao.db; -import a8k.app.service.dao.type.AppUser; -import a8k.app.service.dao.type.UsrRole; +import a8k.app.dao.db.type.AppUser; +import a8k.app.dao.db.type.UsrRole; import a8k.app.utils.ZSqliteJdbcHelper; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/service/dao/DeviceExSettingDao.java b/src/main/java/a8k/app/dao/db/DeviceExSettingDao.java similarity index 86% rename from src/main/java/a8k/app/service/dao/DeviceExSettingDao.java rename to src/main/java/a8k/app/dao/db/DeviceExSettingDao.java index c8a8078..b4b3df1 100644 --- a/src/main/java/a8k/app/service/dao/DeviceExSettingDao.java +++ b/src/main/java/a8k/app/dao/db/DeviceExSettingDao.java @@ -1,6 +1,6 @@ -package a8k.app.service.dao; +package a8k.app.dao.db; -import a8k.app.service.dao.type.KeyVal; +import a8k.app.dao.db.type.KeyVal; import a8k.app.utils.ZSqlite; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/service/dao/DeviceStatisticDao.java b/src/main/java/a8k/app/dao/db/DeviceStatisticDao.java similarity index 95% rename from src/main/java/a8k/app/service/dao/DeviceStatisticDao.java rename to src/main/java/a8k/app/dao/db/DeviceStatisticDao.java index 066f4e4..d200a22 100644 --- a/src/main/java/a8k/app/service/dao/DeviceStatisticDao.java +++ b/src/main/java/a8k/app/dao/db/DeviceStatisticDao.java @@ -1,7 +1,7 @@ -package a8k.app.service.dao; +package a8k.app.dao.db; -import a8k.app.service.dao.type.DeviceStatistic; -import a8k.app.service.dao.type.StatisticType; +import a8k.app.dao.db.type.DeviceStatistic; +import a8k.app.dao.db.type.StatisticType; import a8k.app.utils.ZSqliteJdbcHelper; import jakarta.annotation.Nullable; diff --git a/src/main/java/a8k/app/service/dao/LowerDeviceParameterDao.java b/src/main/java/a8k/app/dao/db/LowerDeviceParameterDao.java similarity index 97% rename from src/main/java/a8k/app/service/dao/LowerDeviceParameterDao.java rename to src/main/java/a8k/app/dao/db/LowerDeviceParameterDao.java index 3d94a5a..0e3a4d0 100644 --- a/src/main/java/a8k/app/service/dao/LowerDeviceParameterDao.java +++ b/src/main/java/a8k/app/dao/db/LowerDeviceParameterDao.java @@ -1,6 +1,6 @@ -package a8k.app.service.dao; +package a8k.app.dao.db; -import a8k.app.service.dao.type.Parameter; +import a8k.app.dao.db.type.Parameter; import a8k.app.utils.ZJsonHelper; import a8k.app.utils.ZSqlite; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/a8k/app/service/dao/LowerDeviceParameterStorgeDao.java b/src/main/java/a8k/app/dao/db/LowerDeviceParameterStorgeDao.java similarity index 96% rename from src/main/java/a8k/app/service/dao/LowerDeviceParameterStorgeDao.java rename to src/main/java/a8k/app/dao/db/LowerDeviceParameterStorgeDao.java index 192fe35..a2bd12a 100644 --- a/src/main/java/a8k/app/service/dao/LowerDeviceParameterStorgeDao.java +++ b/src/main/java/a8k/app/dao/db/LowerDeviceParameterStorgeDao.java @@ -1,6 +1,6 @@ -package a8k.app.service.dao; +package a8k.app.dao.db; -import a8k.app.service.dao.type.Parameter; +import a8k.app.dao.db.type.Parameter; import a8k.app.utils.ZSqlite; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/service/dao/OptRawDataDao.java b/src/main/java/a8k/app/dao/db/OptRawDataDao.java similarity index 89% rename from src/main/java/a8k/app/service/dao/OptRawDataDao.java rename to src/main/java/a8k/app/dao/db/OptRawDataDao.java index 86a7867..7afe70d 100644 --- a/src/main/java/a8k/app/service/dao/OptRawDataDao.java +++ b/src/main/java/a8k/app/dao/db/OptRawDataDao.java @@ -1,6 +1,6 @@ -package a8k.app.service.dao; +package a8k.app.dao.db; -import a8k.app.service.dao.type.OptRawScanData; +import a8k.app.dao.db.type.OptRawScanData; import a8k.app.utils.ZCSVUtils; import a8k.app.utils.ZSqlite; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/app/service/dao/ProjOptInfoDao.java b/src/main/java/a8k/app/dao/db/ProjOptInfoDao.java similarity index 88% rename from src/main/java/a8k/app/service/dao/ProjOptInfoDao.java rename to src/main/java/a8k/app/dao/db/ProjOptInfoDao.java index 0a354aa..7beba44 100644 --- a/src/main/java/a8k/app/service/dao/ProjOptInfoDao.java +++ b/src/main/java/a8k/app/dao/db/ProjOptInfoDao.java @@ -1,9 +1,7 @@ -package a8k.app.service.dao; +package a8k.app.dao.db; -import a8k.app.service.app.appdata.UtilsProjectColorAllocer; -import a8k.app.service.dao.type.ProjOptInfo; +import a8k.app.dao.db.type.ProjOptInfo; -import a8k.app.utils.ZCSVUtils; import a8k.app.utils.ZJsonHelper; import a8k.app.utils.ZSqlite; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/app/service/dao/ProjectBaseInfoDao.java b/src/main/java/a8k/app/dao/db/ProjectBaseInfoDao.java similarity index 84% rename from src/main/java/a8k/app/service/dao/ProjectBaseInfoDao.java rename to src/main/java/a8k/app/dao/db/ProjectBaseInfoDao.java index 03a025e..8802680 100644 --- a/src/main/java/a8k/app/service/dao/ProjectBaseInfoDao.java +++ b/src/main/java/a8k/app/dao/db/ProjectBaseInfoDao.java @@ -1,19 +1,15 @@ -package a8k.app.service.dao; +package a8k.app.dao.db; -import a8k.app.service.app.appdata.UtilsProjectColorAllocer; -import a8k.app.service.dao.type.ProjectBaseInfo; +import a8k.app.service.data.UtilsProjectColorAllocer; +import a8k.app.dao.db.type.ProjectBaseInfo; -import a8k.app.utils.ZCSVUtils; -import a8k.app.utils.ZJsonHelper; import a8k.app.utils.ZSqlite; -import cn.hutool.core.io.resource.ResourceUtil; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import org.springframework.util.ResourceUtils; @Component public class ProjectBaseInfoDao extends ZSqlite { diff --git a/src/main/java/a8k/app/service/dao/ReactionRecordDao.java b/src/main/java/a8k/app/dao/db/ReactionRecordDao.java similarity index 85% rename from src/main/java/a8k/app/service/dao/ReactionRecordDao.java rename to src/main/java/a8k/app/dao/db/ReactionRecordDao.java index 7545676..efbf1c7 100644 --- a/src/main/java/a8k/app/service/dao/ReactionRecordDao.java +++ b/src/main/java/a8k/app/dao/db/ReactionRecordDao.java @@ -1,6 +1,6 @@ -package a8k.app.service.dao; +package a8k.app.dao.db; -import a8k.app.service.dao.type.ReactionResultRecord; +import a8k.app.dao.db.type.ReactionResultRecord; import a8k.app.utils.ZSqlite; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/app/service/dao/SampleRecordDBDao.java b/src/main/java/a8k/app/dao/db/SampleRecordDBDao.java similarity index 69% rename from src/main/java/a8k/app/service/dao/SampleRecordDBDao.java rename to src/main/java/a8k/app/dao/db/SampleRecordDBDao.java index f5ff967..fdf6436 100644 --- a/src/main/java/a8k/app/service/dao/SampleRecordDBDao.java +++ b/src/main/java/a8k/app/dao/db/SampleRecordDBDao.java @@ -1,24 +1,13 @@ -package a8k.app.service.dao; +package a8k.app.dao.db; -import a8k.app.service.dao.type.OptRawScanData; -import a8k.app.service.dao.type.SampleRecord; -import a8k.app.service.app.appdata.UtilsProjectColorAllocer; -import a8k.app.utils.DateUtil; +import a8k.app.dao.db.type.SampleRecord; import a8k.app.utils.ZSqlite; -import a8k.app.utils.ZSqliteJdbcHelper; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; -import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -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.Date; -import java.util.List; - @Component @Slf4j public class SampleRecordDBDao extends ZSqlite { diff --git a/src/main/java/a8k/app/service/dao/type/A8kProjInfoCardBreif.java b/src/main/java/a8k/app/dao/db/type/A8kProjInfoCardBreif.java similarity index 93% rename from src/main/java/a8k/app/service/dao/type/A8kProjInfoCardBreif.java rename to src/main/java/a8k/app/dao/db/type/A8kProjInfoCardBreif.java index 3d728d1..21f48c4 100644 --- a/src/main/java/a8k/app/service/dao/type/A8kProjInfoCardBreif.java +++ b/src/main/java/a8k/app/dao/db/type/A8kProjInfoCardBreif.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type; +package a8k.app.dao.db.type; import java.util.Date; diff --git a/src/main/java/a8k/app/service/dao/type/AppSetting.java b/src/main/java/a8k/app/dao/db/type/AppSetting.java similarity index 93% rename from src/main/java/a8k/app/service/dao/type/AppSetting.java rename to src/main/java/a8k/app/dao/db/type/AppSetting.java index 2362341..6af712a 100644 --- a/src/main/java/a8k/app/service/dao/type/AppSetting.java +++ b/src/main/java/a8k/app/dao/db/type/AppSetting.java @@ -1,6 +1,6 @@ -package a8k.app.service.dao.type; +package a8k.app.dao.db.type; -import a8k.app.service.dao.type.appsetting.settingenum.*; +import a8k.app.dao.db.type.appsetting.settingenum.*; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; diff --git a/src/main/java/a8k/app/service/dao/type/AppUser.java b/src/main/java/a8k/app/dao/db/type/AppUser.java similarity index 97% rename from src/main/java/a8k/app/service/dao/type/AppUser.java rename to src/main/java/a8k/app/dao/db/type/AppUser.java index 6cfcf90..1d0310a 100644 --- a/src/main/java/a8k/app/service/dao/type/AppUser.java +++ b/src/main/java/a8k/app/dao/db/type/AppUser.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type; +package a8k.app.dao.db.type; import a8k.app.utils.ZJsonHelper; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/a8k/app/service/dao/type/DeviceStatistic.java b/src/main/java/a8k/app/dao/db/type/DeviceStatistic.java similarity index 81% rename from src/main/java/a8k/app/service/dao/type/DeviceStatistic.java rename to src/main/java/a8k/app/dao/db/type/DeviceStatistic.java index 4e68c33..00a575e 100644 --- a/src/main/java/a8k/app/service/dao/type/DeviceStatistic.java +++ b/src/main/java/a8k/app/dao/db/type/DeviceStatistic.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type; +package a8k.app.dao.db.type; public class DeviceStatistic { public int id; diff --git a/src/main/java/a8k/app/service/dao/type/KeyVal.java b/src/main/java/a8k/app/dao/db/type/KeyVal.java similarity index 71% rename from src/main/java/a8k/app/service/dao/type/KeyVal.java rename to src/main/java/a8k/app/dao/db/type/KeyVal.java index 8db3894..eca4ddd 100644 --- a/src/main/java/a8k/app/service/dao/type/KeyVal.java +++ b/src/main/java/a8k/app/dao/db/type/KeyVal.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type; +package a8k.app.dao.db.type; public class KeyVal { public int id; diff --git a/src/main/java/a8k/app/service/dao/type/OptRawScanData.java b/src/main/java/a8k/app/dao/db/type/OptRawScanData.java similarity index 81% rename from src/main/java/a8k/app/service/dao/type/OptRawScanData.java rename to src/main/java/a8k/app/dao/db/type/OptRawScanData.java index ac7c09a..eb7b2c6 100644 --- a/src/main/java/a8k/app/service/dao/type/OptRawScanData.java +++ b/src/main/java/a8k/app/dao/db/type/OptRawScanData.java @@ -1,6 +1,6 @@ -package a8k.app.service.dao.type; +package a8k.app.dao.db.type; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kOptType; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kOptType; import a8k.app.utils.ZJsonHelper; import a8k.app.utils.ZSqliteJdbcHelper; diff --git a/src/main/java/a8k/app/service/dao/type/Parameter.java b/src/main/java/a8k/app/dao/db/type/Parameter.java similarity index 93% rename from src/main/java/a8k/app/service/dao/type/Parameter.java rename to src/main/java/a8k/app/dao/db/type/Parameter.java index 3260088..eeaebfa 100644 --- a/src/main/java/a8k/app/service/dao/type/Parameter.java +++ b/src/main/java/a8k/app/dao/db/type/Parameter.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type; +package a8k.app.dao.db.type; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/src/main/java/a8k/app/service/dao/type/ProjExtInfoCard.java b/src/main/java/a8k/app/dao/db/type/ProjExtInfoCard.java similarity index 96% rename from src/main/java/a8k/app/service/dao/type/ProjExtInfoCard.java rename to src/main/java/a8k/app/dao/db/type/ProjExtInfoCard.java index bba5fd7..ef8b117 100644 --- a/src/main/java/a8k/app/service/dao/type/ProjExtInfoCard.java +++ b/src/main/java/a8k/app/dao/db/type/ProjExtInfoCard.java @@ -1,6 +1,7 @@ -package a8k.app.service.dao.type; +package a8k.app.dao.db.type; -import a8k.app.service.dao.type.a8kidcard.A8kOptFnFormula; +import a8k.app.dao.db.type.A8kProjInfoCardBreif; +import a8k.app.dao.db.type.a8kidcard.A8kOptFnFormula; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.Serializable; diff --git a/src/main/java/a8k/app/service/dao/type/ProjOptInfo.java b/src/main/java/a8k/app/dao/db/type/ProjOptInfo.java similarity index 88% rename from src/main/java/a8k/app/service/dao/type/ProjOptInfo.java rename to src/main/java/a8k/app/dao/db/type/ProjOptInfo.java index 0bc9ce4..a05e534 100644 --- a/src/main/java/a8k/app/service/dao/type/ProjOptInfo.java +++ b/src/main/java/a8k/app/dao/db/type/ProjOptInfo.java @@ -1,6 +1,6 @@ -package a8k.app.service.dao.type; +package a8k.app.dao.db.type; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kOptType; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kOptType; import java.io.Serializable; diff --git a/src/main/java/a8k/app/service/dao/type/ProjectBaseInfo.java b/src/main/java/a8k/app/dao/db/type/ProjectBaseInfo.java similarity index 94% rename from src/main/java/a8k/app/service/dao/type/ProjectBaseInfo.java rename to src/main/java/a8k/app/dao/db/type/ProjectBaseInfo.java index ef45092..d67c39f 100644 --- a/src/main/java/a8k/app/service/dao/type/ProjectBaseInfo.java +++ b/src/main/java/a8k/app/dao/db/type/ProjectBaseInfo.java @@ -1,6 +1,6 @@ -package a8k.app.service.dao.type; +package a8k.app.dao.db.type; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kReactionFlowType; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kReactionFlowType; import com.fasterxml.jackson.annotation.JsonIgnore; import java.io.Serializable; diff --git a/src/main/java/a8k/app/service/dao/type/ReactionResultRecord.java b/src/main/java/a8k/app/dao/db/type/ReactionResultRecord.java similarity index 95% rename from src/main/java/a8k/app/service/dao/type/ReactionResultRecord.java rename to src/main/java/a8k/app/dao/db/type/ReactionResultRecord.java index add046b..ef0bad0 100644 --- a/src/main/java/a8k/app/service/dao/type/ReactionResultRecord.java +++ b/src/main/java/a8k/app/dao/db/type/ReactionResultRecord.java @@ -1,7 +1,7 @@ -package a8k.app.service.dao.type; +package a8k.app.dao.db.type; -import a8k.app.type.ReactionResult; -import a8k.app.type.type.BloodType; +import a8k.app.a8ktype.type.ReactionResult; +import a8k.app.a8ktype.device.BloodType; import a8k.app.utils.ZDateUtils; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/a8k/app/service/dao/type/SampleRecord.java b/src/main/java/a8k/app/dao/db/type/SampleRecord.java similarity index 91% rename from src/main/java/a8k/app/service/dao/type/SampleRecord.java rename to src/main/java/a8k/app/dao/db/type/SampleRecord.java index 3734435..07252f0 100644 --- a/src/main/java/a8k/app/service/dao/type/SampleRecord.java +++ b/src/main/java/a8k/app/dao/db/type/SampleRecord.java @@ -1,6 +1,6 @@ -package a8k.app.service.dao.type; +package a8k.app.dao.db.type; -import a8k.app.type.type.BloodType; +import a8k.app.a8ktype.device.BloodType; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/a8k/app/service/dao/type/StatisticType.java b/src/main/java/a8k/app/dao/db/type/StatisticType.java similarity index 66% rename from src/main/java/a8k/app/service/dao/type/StatisticType.java rename to src/main/java/a8k/app/dao/db/type/StatisticType.java index c48043b..ba1a579 100644 --- a/src/main/java/a8k/app/service/dao/type/StatisticType.java +++ b/src/main/java/a8k/app/dao/db/type/StatisticType.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type; +package a8k.app.dao.db.type; public enum StatisticType { TubeHolderCnt, diff --git a/src/main/java/a8k/app/service/dao/type/UsrRole.java b/src/main/java/a8k/app/dao/db/type/UsrRole.java similarity index 54% rename from src/main/java/a8k/app/service/dao/type/UsrRole.java rename to src/main/java/a8k/app/dao/db/type/UsrRole.java index bf57cfb..ce9b42a 100644 --- a/src/main/java/a8k/app/service/dao/type/UsrRole.java +++ b/src/main/java/a8k/app/dao/db/type/UsrRole.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type; +package a8k.app.dao.db.type; public enum UsrRole { Usr, diff --git a/src/main/java/a8k/app/service/dao/type/a8kidcard/A8kFnFormula.java b/src/main/java/a8k/app/dao/db/type/a8kidcard/A8kFnFormula.java similarity index 86% rename from src/main/java/a8k/app/service/dao/type/a8kidcard/A8kFnFormula.java rename to src/main/java/a8k/app/dao/db/type/a8kidcard/A8kFnFormula.java index 3955a89..d885392 100644 --- a/src/main/java/a8k/app/service/dao/type/a8kidcard/A8kFnFormula.java +++ b/src/main/java/a8k/app/dao/db/type/a8kidcard/A8kFnFormula.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type.a8kidcard; +package a8k.app.dao.db.type.a8kidcard; /** * 普通函数 diff --git a/src/main/java/a8k/app/service/dao/type/a8kidcard/A8kNormalFn.java b/src/main/java/a8k/app/dao/db/type/a8kidcard/A8kNormalFn.java similarity index 96% rename from src/main/java/a8k/app/service/dao/type/a8kidcard/A8kNormalFn.java rename to src/main/java/a8k/app/dao/db/type/a8kidcard/A8kNormalFn.java index 71ac560..f896b95 100644 --- a/src/main/java/a8k/app/service/dao/type/a8kidcard/A8kNormalFn.java +++ b/src/main/java/a8k/app/dao/db/type/a8kidcard/A8kNormalFn.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type.a8kidcard; +package a8k.app.dao.db.type.a8kidcard; import a8k.app.a8ktype.opttype.A8kOptX; diff --git a/src/main/java/a8k/app/service/dao/type/a8kidcard/A8kOptFnFormula.java b/src/main/java/a8k/app/dao/db/type/a8kidcard/A8kOptFnFormula.java similarity index 78% rename from src/main/java/a8k/app/service/dao/type/a8kidcard/A8kOptFnFormula.java rename to src/main/java/a8k/app/dao/db/type/a8kidcard/A8kOptFnFormula.java index e2d42f1..bf3d835 100644 --- a/src/main/java/a8k/app/service/dao/type/a8kidcard/A8kOptFnFormula.java +++ b/src/main/java/a8k/app/dao/db/type/a8kidcard/A8kOptFnFormula.java @@ -1,6 +1,6 @@ -package a8k.app.service.dao.type.a8kidcard; +package a8k.app.dao.db.type.a8kidcard; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kFnType; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kFnType; public class A8kOptFnFormula { public A8kFnType fnType = A8kFnType.NormalFn; diff --git a/src/main/java/a8k/app/service/dao/type/a8kidcard/A8kPiecewiseFn.java b/src/main/java/a8k/app/dao/db/type/a8kidcard/A8kPiecewiseFn.java similarity index 97% rename from src/main/java/a8k/app/service/dao/type/a8kidcard/A8kPiecewiseFn.java rename to src/main/java/a8k/app/dao/db/type/a8kidcard/A8kPiecewiseFn.java index f997419..c1583a0 100644 --- a/src/main/java/a8k/app/service/dao/type/a8kidcard/A8kPiecewiseFn.java +++ b/src/main/java/a8k/app/dao/db/type/a8kidcard/A8kPiecewiseFn.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type.a8kidcard; +package a8k.app.dao.db.type.a8kidcard; import a8k.app.a8ktype.opttype.A8kOptX; diff --git a/src/main/java/a8k/app/service/dao/type/a8kidcard/A8kPiecewiseFnFormula.java b/src/main/java/a8k/app/dao/db/type/a8kidcard/A8kPiecewiseFnFormula.java similarity index 85% rename from src/main/java/a8k/app/service/dao/type/a8kidcard/A8kPiecewiseFnFormula.java rename to src/main/java/a8k/app/dao/db/type/a8kidcard/A8kPiecewiseFnFormula.java index 8b4ebc8..d3f0584 100644 --- a/src/main/java/a8k/app/service/dao/type/a8kidcard/A8kPiecewiseFnFormula.java +++ b/src/main/java/a8k/app/dao/db/type/a8kidcard/A8kPiecewiseFnFormula.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type.a8kidcard; +package a8k.app.dao.db.type.a8kidcard; /** * 分段函数 diff --git a/src/main/java/a8k/app/service/dao/type/a8kidcard/A8kResultBuilderFn.java b/src/main/java/a8k/app/dao/db/type/a8kidcard/A8kResultBuilderFn.java similarity index 91% rename from src/main/java/a8k/app/service/dao/type/a8kidcard/A8kResultBuilderFn.java rename to src/main/java/a8k/app/dao/db/type/a8kidcard/A8kResultBuilderFn.java index f78b13e..a45647b 100644 --- a/src/main/java/a8k/app/service/dao/type/a8kidcard/A8kResultBuilderFn.java +++ b/src/main/java/a8k/app/dao/db/type/a8kidcard/A8kResultBuilderFn.java @@ -1,6 +1,6 @@ -package a8k.app.service.dao.type.a8kidcard; +package a8k.app.dao.db.type.a8kidcard; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kResultUnit; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kResultUnit; public class A8kResultBuilderFn implements Cloneable{ // 结果 diff --git a/src/main/java/a8k/app/service/dao/type/a8kidcard/zenum/A8kFnType.java b/src/main/java/a8k/app/dao/db/type/a8kidcard/zenum/A8kFnType.java similarity index 86% rename from src/main/java/a8k/app/service/dao/type/a8kidcard/zenum/A8kFnType.java rename to src/main/java/a8k/app/dao/db/type/a8kidcard/zenum/A8kFnType.java index 45f3370..d96d761 100644 --- a/src/main/java/a8k/app/service/dao/type/a8kidcard/zenum/A8kFnType.java +++ b/src/main/java/a8k/app/dao/db/type/a8kidcard/zenum/A8kFnType.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type.a8kidcard.zenum; +package a8k.app.dao.db.type.a8kidcard.zenum; public enum A8kFnType { NormalFn(1),//正常函数 diff --git a/src/main/java/a8k/app/dao/db/type/a8kidcard/zenum/A8kOptType.java b/src/main/java/a8k/app/dao/db/type/a8kidcard/zenum/A8kOptType.java new file mode 100644 index 0000000..894c190 --- /dev/null +++ b/src/main/java/a8k/app/dao/db/type/a8kidcard/zenum/A8kOptType.java @@ -0,0 +1,6 @@ +package a8k.app.dao.db.type.a8kidcard.zenum; + +public enum A8kOptType { + FOPT, + TOPT, +} diff --git a/src/main/java/a8k/app/service/dao/type/a8kidcard/zenum/A8kReactionFlowType.java b/src/main/java/a8k/app/dao/db/type/a8kidcard/zenum/A8kReactionFlowType.java similarity index 93% rename from src/main/java/a8k/app/service/dao/type/a8kidcard/zenum/A8kReactionFlowType.java rename to src/main/java/a8k/app/dao/db/type/a8kidcard/zenum/A8kReactionFlowType.java index 9b7cf87..ddf2269 100644 --- a/src/main/java/a8k/app/service/dao/type/a8kidcard/zenum/A8kReactionFlowType.java +++ b/src/main/java/a8k/app/dao/db/type/a8kidcard/zenum/A8kReactionFlowType.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type.a8kidcard.zenum; +package a8k.app.dao.db.type.a8kidcard.zenum; public enum A8kReactionFlowType { /** diff --git a/src/main/java/a8k/app/service/dao/type/a8kidcard/zenum/A8kResultUnit.java b/src/main/java/a8k/app/dao/db/type/a8kidcard/zenum/A8kResultUnit.java similarity index 96% rename from src/main/java/a8k/app/service/dao/type/a8kidcard/zenum/A8kResultUnit.java rename to src/main/java/a8k/app/dao/db/type/a8kidcard/zenum/A8kResultUnit.java index a434a9d..f31c8a6 100644 --- a/src/main/java/a8k/app/service/dao/type/a8kidcard/zenum/A8kResultUnit.java +++ b/src/main/java/a8k/app/dao/db/type/a8kidcard/zenum/A8kResultUnit.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type.a8kidcard.zenum; +package a8k.app.dao.db.type.a8kidcard.zenum; public enum A8kResultUnit { Original(0, "original"), diff --git a/src/main/java/a8k/app/service/dao/type/a8kprojinfo/OptScanDirection.java b/src/main/java/a8k/app/dao/db/type/a8kprojinfo/OptScanDirection.java similarity index 100% rename from src/main/java/a8k/app/service/dao/type/a8kprojinfo/OptScanDirection.java rename to src/main/java/a8k/app/dao/db/type/a8kprojinfo/OptScanDirection.java diff --git a/src/main/java/a8k/app/service/dao/type/appsetting/AppSettingName.java b/src/main/java/a8k/app/dao/db/type/appsetting/AppSettingName.java similarity index 86% rename from src/main/java/a8k/app/service/dao/type/appsetting/AppSettingName.java rename to src/main/java/a8k/app/dao/db/type/appsetting/AppSettingName.java index 667fefe..9b0f883 100644 --- a/src/main/java/a8k/app/service/dao/type/appsetting/AppSettingName.java +++ b/src/main/java/a8k/app/dao/db/type/appsetting/AppSettingName.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type.appsetting; +package a8k.app.dao.db.type.appsetting; public enum AppSettingName { SETTING_PAGE_VERSION,// 用来更新配置项目 diff --git a/src/main/java/a8k/app/service/dao/type/appsetting/AppSettingTab.java b/src/main/java/a8k/app/dao/db/type/appsetting/AppSettingTab.java similarity index 71% rename from src/main/java/a8k/app/service/dao/type/appsetting/AppSettingTab.java rename to src/main/java/a8k/app/dao/db/type/appsetting/AppSettingTab.java index b2f6f75..b08df62 100644 --- a/src/main/java/a8k/app/service/dao/type/appsetting/AppSettingTab.java +++ b/src/main/java/a8k/app/dao/db/type/appsetting/AppSettingTab.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type.appsetting; +package a8k.app.dao.db.type.appsetting; /** * 配置页面 diff --git a/src/main/java/a8k/app/service/dao/type/appsetting/AppSettingType.java b/src/main/java/a8k/app/dao/db/type/appsetting/AppSettingType.java similarity index 89% rename from src/main/java/a8k/app/service/dao/type/appsetting/AppSettingType.java rename to src/main/java/a8k/app/dao/db/type/appsetting/AppSettingType.java index 670da04..cee58c3 100644 --- a/src/main/java/a8k/app/service/dao/type/appsetting/AppSettingType.java +++ b/src/main/java/a8k/app/dao/db/type/appsetting/AppSettingType.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type.appsetting; +package a8k.app.dao.db.type.appsetting; // // 配置类型 diff --git a/src/main/java/a8k/app/service/dao/type/appsetting/settingenum/AutoLogoutOption.java b/src/main/java/a8k/app/dao/db/type/appsetting/settingenum/AutoLogoutOption.java similarity index 85% rename from src/main/java/a8k/app/service/dao/type/appsetting/settingenum/AutoLogoutOption.java rename to src/main/java/a8k/app/dao/db/type/appsetting/settingenum/AutoLogoutOption.java index ca8c009..20e2c15 100644 --- a/src/main/java/a8k/app/service/dao/type/appsetting/settingenum/AutoLogoutOption.java +++ b/src/main/java/a8k/app/dao/db/type/appsetting/settingenum/AutoLogoutOption.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type.appsetting.settingenum; +package a8k.app.dao.db.type.appsetting.settingenum; public enum AutoLogoutOption { T00_00, diff --git a/src/main/java/a8k/app/service/dao/type/appsetting/settingenum/LISIFType.java b/src/main/java/a8k/app/dao/db/type/appsetting/settingenum/LISIFType.java similarity index 82% rename from src/main/java/a8k/app/service/dao/type/appsetting/settingenum/LISIFType.java rename to src/main/java/a8k/app/dao/db/type/appsetting/settingenum/LISIFType.java index 11ec589..ec27f8c 100644 --- a/src/main/java/a8k/app/service/dao/type/appsetting/settingenum/LISIFType.java +++ b/src/main/java/a8k/app/dao/db/type/appsetting/settingenum/LISIFType.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type.appsetting.settingenum; +package a8k.app.dao.db.type.appsetting.settingenum; public enum LISIFType { SERIAL, diff --git a/src/main/java/a8k/app/service/dao/type/appsetting/settingenum/LISProtocolEnum.java b/src/main/java/a8k/app/dao/db/type/appsetting/settingenum/LISProtocolEnum.java similarity index 83% rename from src/main/java/a8k/app/service/dao/type/appsetting/settingenum/LISProtocolEnum.java rename to src/main/java/a8k/app/dao/db/type/appsetting/settingenum/LISProtocolEnum.java index 3a30e9b..7775c7b 100644 --- a/src/main/java/a8k/app/service/dao/type/appsetting/settingenum/LISProtocolEnum.java +++ b/src/main/java/a8k/app/dao/db/type/appsetting/settingenum/LISProtocolEnum.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type.appsetting.settingenum; +package a8k.app.dao.db.type.appsetting.settingenum; public enum LISProtocolEnum { Boditech, Simens; diff --git a/src/main/java/a8k/app/service/dao/type/appsetting/settingenum/LISSerialBaudrateType.java b/src/main/java/a8k/app/dao/db/type/appsetting/settingenum/LISSerialBaudrateType.java similarity index 50% rename from src/main/java/a8k/app/service/dao/type/appsetting/settingenum/LISSerialBaudrateType.java rename to src/main/java/a8k/app/dao/db/type/appsetting/settingenum/LISSerialBaudrateType.java index 5a51d26..1e3260f 100644 --- a/src/main/java/a8k/app/service/dao/type/appsetting/settingenum/LISSerialBaudrateType.java +++ b/src/main/java/a8k/app/dao/db/type/appsetting/settingenum/LISSerialBaudrateType.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type.appsetting.settingenum; +package a8k.app.dao.db.type.appsetting.settingenum; public enum LISSerialBaudrateType { B9600, diff --git a/src/main/java/a8k/app/service/dao/type/appsetting/settingenum/LISTypeEnum.java b/src/main/java/a8k/app/dao/db/type/appsetting/settingenum/LISTypeEnum.java similarity index 84% rename from src/main/java/a8k/app/service/dao/type/appsetting/settingenum/LISTypeEnum.java rename to src/main/java/a8k/app/dao/db/type/appsetting/settingenum/LISTypeEnum.java index eeb8e38..ef70466 100644 --- a/src/main/java/a8k/app/service/dao/type/appsetting/settingenum/LISTypeEnum.java +++ b/src/main/java/a8k/app/dao/db/type/appsetting/settingenum/LISTypeEnum.java @@ -1,4 +1,4 @@ -package a8k.app.service.dao.type.appsetting.settingenum; +package a8k.app.dao.db.type.appsetting.settingenum; public enum LISTypeEnum { //单向，双向 diff --git a/src/main/java/a8k/app/dao/db/type/appsetting/settingenum/LanguageType.java b/src/main/java/a8k/app/dao/db/type/appsetting/settingenum/LanguageType.java new file mode 100644 index 0000000..5b2c6f3 --- /dev/null +++ b/src/main/java/a8k/app/dao/db/type/appsetting/settingenum/LanguageType.java @@ -0,0 +1,5 @@ +package a8k.app.dao.db.type.appsetting.settingenum; + +public enum LanguageType { + zh_CN, en_US +} diff --git a/src/main/java/a8k/app/service/param/exmgr/HbotConsumableParamMgr.java b/src/main/java/a8k/app/dao/exparam/HbotConsumableParamMgr.java similarity index 84% rename from src/main/java/a8k/app/service/param/exmgr/HbotConsumableParamMgr.java rename to src/main/java/a8k/app/dao/exparam/HbotConsumableParamMgr.java index 72d6f75..6229c97 100644 --- a/src/main/java/a8k/app/service/param/exmgr/HbotConsumableParamMgr.java +++ b/src/main/java/a8k/app/dao/exparam/HbotConsumableParamMgr.java @@ -1,11 +1,11 @@ -package a8k.app.service.param.exmgr; +package a8k.app.dao.exparam; import a8k.app.a8ktype.device.ConsumableGroup; -import a8k.app.service.param.mgr.HbotLargeBottleBSPosMgr; -import a8k.app.service.param.mgr.HbotLittleBSPosMgr; -import a8k.app.service.param.mgr.HbotProbeSubstancePosMgr; -import a8k.app.service.param.mgr.HbotTipPosMgr; -import a8k.app.type.cfg.Pos3d; +import a8k.app.service.param.HbotLargeBottleBSPosMgr; +import a8k.app.service.param.HbotLittleBSPosMgr; +import a8k.app.service.param.HbotProbeSubstancePosMgr; +import a8k.app.service.param.HbotTipPosMgr; +import a8k.app.a8ktype.device.Pos3d; import a8k.app.a8ktype.device.TipGroup; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/service/param/exmgr/PipetteGunParamExMgr.java b/src/main/java/a8k/app/dao/exparam/PipetteGunParamExMgr.java similarity index 88% rename from src/main/java/a8k/app/service/param/exmgr/PipetteGunParamExMgr.java rename to src/main/java/a8k/app/dao/exparam/PipetteGunParamExMgr.java index dbd1587..f88dc41 100644 --- a/src/main/java/a8k/app/service/param/exmgr/PipetteGunParamExMgr.java +++ b/src/main/java/a8k/app/dao/exparam/PipetteGunParamExMgr.java @@ -1,18 +1,18 @@ -package a8k.app.service.param.exmgr; - -import a8k.app.service.app.appstate.type.ProjectTaskContext; -import a8k.app.service.param.exmgr.base.PipetteGunBindActionType; -import a8k.app.service.param.exmgr.base.LLDParamPack; -import a8k.app.service.param.exmgr.base.LLFParamPack; -import a8k.app.service.param.mgr.HbotLargeBottleBSPosMgr; -import a8k.app.service.param.mgr.HbotSamplePosParamMgr; -import a8k.app.service.param.mgr.PipetteGunLLDParamMgr; -import a8k.app.service.param.mgr.PipetteGunLLFParamMgr; +package a8k.app.dao.exparam; + +import a8k.app.a8ktype.state.ProjectTaskContext; +import a8k.app.dao.exparam.base.PipetteGunBindActionType; +import a8k.app.dao.exparam.base.LLDParamPack; +import a8k.app.dao.exparam.base.LLFParamPack; +import a8k.app.service.param.HbotLargeBottleBSPosMgr; +import a8k.app.service.param.HbotSamplePosParamMgr; +import a8k.app.service.param.PipetteGunLLDParamMgr; +import a8k.app.service.param.PipetteGunLLFParamMgr; import a8k.app.a8ktype.param.A8kSamplePos; import a8k.app.a8ktype.param.PipetteGunLLDThresholdParam; import a8k.app.a8ktype.param.PipetteGunLLDTypeParam; import a8k.app.a8ktype.device.ConsumableGroup; -import a8k.app.type.cfg.Pos3d; +import a8k.app.a8ktype.device.Pos3d; import a8k.app.utils.ProjProcessContextUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/param/exmgr/base/LLDParamPack.java b/src/main/java/a8k/app/dao/exparam/base/LLDParamPack.java similarity index 82% rename from src/main/java/a8k/app/service/param/exmgr/base/LLDParamPack.java rename to src/main/java/a8k/app/dao/exparam/base/LLDParamPack.java index 97f886d..6b65e4c 100644 --- a/src/main/java/a8k/app/service/param/exmgr/base/LLDParamPack.java +++ b/src/main/java/a8k/app/dao/exparam/base/LLDParamPack.java @@ -1,4 +1,4 @@ -package a8k.app.service.param.exmgr.base; +package a8k.app.dao.exparam.base; import a8k.app.hardware.type.LldType; diff --git a/src/main/java/a8k/app/service/param/exmgr/base/LLFParamPack.java b/src/main/java/a8k/app/dao/exparam/base/LLFParamPack.java similarity index 75% rename from src/main/java/a8k/app/service/param/exmgr/base/LLFParamPack.java rename to src/main/java/a8k/app/dao/exparam/base/LLFParamPack.java index c556d55..44aaa40 100644 --- a/src/main/java/a8k/app/service/param/exmgr/base/LLFParamPack.java +++ b/src/main/java/a8k/app/dao/exparam/base/LLFParamPack.java @@ -1,4 +1,4 @@ -package a8k.app.service.param.exmgr.base; +package a8k.app.dao.exparam.base; public class LLFParamPack { public Integer llfVel = 0; diff --git a/src/main/java/a8k/app/service/param/exmgr/base/PipetteGunBindActionType.java b/src/main/java/a8k/app/dao/exparam/base/PipetteGunBindActionType.java similarity index 90% rename from src/main/java/a8k/app/service/param/exmgr/base/PipetteGunBindActionType.java rename to src/main/java/a8k/app/dao/exparam/base/PipetteGunBindActionType.java index 636cf04..a4c9d03 100644 --- a/src/main/java/a8k/app/service/param/exmgr/base/PipetteGunBindActionType.java +++ b/src/main/java/a8k/app/dao/exparam/base/PipetteGunBindActionType.java @@ -1,4 +1,4 @@ -package a8k.app.service.param.exmgr.base; +package a8k.app.dao.exparam.base; public enum PipetteGunBindActionType { SAMPLE("从试管中取样"), diff --git a/src/main/java/a8k/app/utils/A8kPacketBuilder.java b/src/main/java/a8k/app/factory/A8kPacketFactory.java similarity index 96% rename from src/main/java/a8k/app/utils/A8kPacketBuilder.java rename to src/main/java/a8k/app/factory/A8kPacketFactory.java index d0af2c1..219af82 100644 --- a/src/main/java/a8k/app/utils/A8kPacketBuilder.java +++ b/src/main/java/a8k/app/factory/A8kPacketFactory.java @@ -1,4 +1,4 @@ -package a8k.app.utils; +package a8k.app.factory; import a8k.app.hardware.type.a8kcanprotocol.A8kPacket; import a8k.app.hardware.type.a8kcanprotocol.CmdId; @@ -7,7 +7,7 @@ import a8k.app.hardware.type.a8kcanprotocol.MId; import java.nio.ByteBuffer; import java.nio.ByteOrder; -public class A8kPacketBuilder { +public class A8kPacketFactory { static public A8kPacket buildPacket(Integer moduleId, byte packetType, Integer cmdId, Integer[] params) { int subCmdId = cmdId & 0xFF; diff --git a/src/main/java/a8k/app/utils/AppExceptionBuilder.java b/src/main/java/a8k/app/factory/AppExceptionFactory.java similarity index 64% rename from src/main/java/a8k/app/utils/AppExceptionBuilder.java rename to src/main/java/a8k/app/factory/AppExceptionFactory.java index 0ec8407..b20dfe8 100644 --- a/src/main/java/a8k/app/utils/AppExceptionBuilder.java +++ b/src/main/java/a8k/app/factory/AppExceptionFactory.java @@ -1,20 +1,17 @@ -package a8k.app.utils; +package a8k.app.factory; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.app.type.ecode.AECodeError; -import a8k.app.type.ecode.AppError; -import a8k.app.type.ecode.AEConsumeNotEnoughError; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.error.AppError; +import a8k.app.a8ktype.error.AEConsumeNotEnoughError; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import org.slf4j.Logger; import org.springframework.stereotype.Component; -import a8k.app.service.app.appdata.ProjInfoMgrService; - -import java.util.List; +import a8k.app.service.data.ProjInfoMgrService; @Component -public class AppExceptionBuilder { - static Logger logger = org.slf4j.LoggerFactory.getLogger(AppExceptionBuilder.class); +public class AppExceptionFactory { + static Logger logger = org.slf4j.LoggerFactory.getLogger(AppExceptionFactory.class); @Resource ProjInfoMgrService projConfigMgrService; diff --git a/src/main/java/a8k/app/factory/ZAppPromoptFactory.java b/src/main/java/a8k/app/factory/ZAppPromoptFactory.java index 98a0228..287c6f2 100644 --- a/src/main/java/a8k/app/factory/ZAppPromoptFactory.java +++ b/src/main/java/a8k/app/factory/ZAppPromoptFactory.java @@ -1,16 +1,16 @@ package a8k.app.factory; import a8k.app.i18n.Internationalization; -import a8k.app.service.app.appctrl.mainflowctrl.base.AppActionErrorContext; -import a8k.app.service.bases.appevent.A8kEcodeContextListPromptEvent; -import a8k.app.service.bases.appevent.A8kErrorsPromptEvent; -import a8k.app.service.bases.appevent.AppPromptEvents; -import a8k.app.type.ecode.*; -import a8k.app.type.exception.AppException; -import a8k.app.type.ui.ZAppErrorStackInfo; -import a8k.app.type.ui.ZAppPromopt; -import a8k.app.type.ui.ZAppPromoptDetailInfo; -import a8k.app.type.ui.ZAppPromoptType; +import a8k.app.service.mainctrl.mainflowctrl.base.AppActionErrorContext; +import a8k.app.a8ktype.appevent.A8kEcodeContextListPromptEvent; +import a8k.app.a8ktype.appevent.A8kErrorsPromptEvent; +import a8k.app.a8ktype.appevent.AppPromptEvents; +import a8k.app.a8ktype.error.*; +import a8k.app.a8ktype.exception.AppException; +import a8k.app.a8ktype.ui.ZAppErrorStackInfo; +import a8k.app.a8ktype.ui.ZAppPromopt; +import a8k.app.a8ktype.ui.ZAppPromoptDetailInfo; +import a8k.app.a8ktype.ui.ZAppPromoptType; import jakarta.validation.ValidationException; import org.springframework.web.method.annotation.HandlerMethodValidationException; diff --git a/src/main/java/a8k/app/hardware/A8kCanBusService.java b/src/main/java/a8k/app/hardware/basedriver/A8kCanBusService.java similarity index 97% rename from src/main/java/a8k/app/hardware/A8kCanBusService.java rename to src/main/java/a8k/app/hardware/basedriver/A8kCanBusService.java index 242452c..68e680a 100644 --- a/src/main/java/a8k/app/hardware/A8kCanBusService.java +++ b/src/main/java/a8k/app/hardware/basedriver/A8kCanBusService.java @@ -1,16 +1,15 @@ -package a8k.app.hardware; +package a8k.app.hardware.basedriver; -import a8k.app.service.bases.appevent.A8kCanBusOnConnectEvent; +import a8k.app.a8ktype.appevent.A8kCanBusOnConnectEvent; import a8k.app.hardware.type.regindex.RegIndex; import a8k.extui.service.test.state.VirtualDevice; -import a8k.app.type.PlateInfo; -import a8k.app.hardware.custom_param_mgr.A8kModCustomParamMgr; +import a8k.app.a8ktype.type.PlateInfo; import a8k.app.hardware.type.a8kcanprotocol.*; import a8k.app.hardware.type.a8kcanprotocol.MId; -import a8k.app.type.ecode.AECodeError; -import a8k.app.type.ecode.AEHardwareError; -import a8k.app.type.exception.AppException; -import a8k.app.service.bases.appevent.A8kHardwareReport; +import a8k.app.a8ktype.error.AECodeError; +import a8k.app.a8ktype.error.AEHardwareError; +import a8k.app.a8ktype.exception.AppException; +import a8k.app.a8ktype.appevent.A8kHardwareReport; import a8k.OS; import a8k.app.service.bases.AppEventBusService; import a8k.app.utils.ByteArray; @@ -39,10 +38,8 @@ public class A8kCanBusService { public static final Logger logger = LoggerFactory.getLogger(A8kCanBusService.class); @Resource - private AppEventBusService eventBus; + AppEventBusService eventBus; - @Resource - private A8kModCustomParamMgr customParamMgr; @Resource VirtualDevice virtualDevice; diff --git a/src/main/java/a8k/app/hardware/custom_param_mgr/A8kModCustomParam.java b/src/main/java/a8k/app/hardware/custom_param_mgr/A8kModCustomParam.java deleted file mode 100644 index 1436c67..0000000 --- a/src/main/java/a8k/app/hardware/custom_param_mgr/A8kModCustomParam.java +++ /dev/null @@ -1,10 +0,0 @@ -package a8k.app.hardware.custom_param_mgr; - -import a8k.app.hardware.type.a8kcanprotocol.MId; - -public class A8kModCustomParam { - MId mid; - public ModCustomParamId id; - public Integer value; - -} diff --git a/src/main/java/a8k/app/hardware/custom_param_mgr/A8kModCustomParamMgr.java b/src/main/java/a8k/app/hardware/custom_param_mgr/A8kModCustomParamMgr.java deleted file mode 100644 index bf07a43..0000000 --- a/src/main/java/a8k/app/hardware/custom_param_mgr/A8kModCustomParamMgr.java +++ /dev/null @@ -1,35 +0,0 @@ -package a8k.app.hardware.custom_param_mgr; - -import a8k.app.hardware.type.a8kcanprotocol.MId; -import org.springframework.stereotype.Component; - -import java.util.Set; - -@Component -public class A8kModCustomParamMgr { - - Set customParamSet; - - public Integer getCustomParam(MId mid, ModCustomParamId id) { - for (A8kModCustomParam param : customParamSet) { - if (param.mid == mid && param.id == id) { - return param.value; - } - } - return id.defaultVal; - } - - public void setCustomParam(MId mid, ModCustomParamId id, Integer val) { - for (A8kModCustomParam param : customParamSet) { - if (param.mid == mid && param.id == id) { - param.value = val; - return; - } - } - A8kModCustomParam param = new A8kModCustomParam(); - param.mid = mid; - param.id = id; - param.value = val; - customParamSet.add(param); - } -} diff --git a/src/main/java/a8k/app/hardware/custom_param_mgr/ModCustomParamId.java b/src/main/java/a8k/app/hardware/custom_param_mgr/ModCustomParamId.java deleted file mode 100644 index e202fbc..0000000 --- a/src/main/java/a8k/app/hardware/custom_param_mgr/ModCustomParamId.java +++ /dev/null @@ -1,14 +0,0 @@ -package a8k.app.hardware.custom_param_mgr; - -public enum ModCustomParamId { - - MOTOR_STANDY_POS_COMPENSATE("电机待机位置零点补偿"),//待机位置 = 零点- 零点补偿 - ; - public final String desc; - public final Integer defaultVal; - - ModCustomParamId(String desc) { - this.desc = desc; - this.defaultVal = 0; - } -} diff --git a/src/main/java/a8k/app/service/app/driver/base/CodeScanerDriver.java b/src/main/java/a8k/app/hardware/driver/CodeScanerDriver.java similarity index 87% rename from src/main/java/a8k/app/service/app/driver/base/CodeScanerDriver.java rename to src/main/java/a8k/app/hardware/driver/CodeScanerDriver.java index e9f7753..c5c6b78 100644 --- a/src/main/java/a8k/app/service/app/driver/base/CodeScanerDriver.java +++ b/src/main/java/a8k/app/hardware/driver/CodeScanerDriver.java @@ -1,8 +1,8 @@ -package a8k.app.service.app.driver.base; +package a8k.app.hardware.driver; -import a8k.app.hardware.A8kCanBusService; +import a8k.app.hardware.basedriver.A8kCanBusService; import a8k.app.hardware.type.a8kcanprotocol.MId; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/app/driver/base/HbotDriver.java b/src/main/java/a8k/app/hardware/driver/HbotDriver.java similarity index 92% rename from src/main/java/a8k/app/service/app/driver/base/HbotDriver.java rename to src/main/java/a8k/app/hardware/driver/HbotDriver.java index 6ebf561..cfd0241 100644 --- a/src/main/java/a8k/app/service/app/driver/base/HbotDriver.java +++ b/src/main/java/a8k/app/hardware/driver/HbotDriver.java @@ -1,11 +1,11 @@ -package a8k.app.service.app.driver.base; +package a8k.app.hardware.driver; -import a8k.app.hardware.A8kCanBusService; +import a8k.app.hardware.basedriver.A8kCanBusService; import a8k.app.hardware.type.a8kcanprotocol.CmdId; import a8k.app.hardware.type.a8kcanprotocol.MId; -import a8k.app.service.app.driver.base.type.HbotRegIndex; -import a8k.app.type.cfg.Pos2d; -import a8k.app.type.exception.AppException; +import a8k.app.hardware.driver.type.HbotRegIndex; +import a8k.app.a8ktype.device.Pos2d; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/app/driver/base/MiniServoDriver.java b/src/main/java/a8k/app/hardware/driver/MiniServoDriver.java similarity index 94% rename from src/main/java/a8k/app/service/app/driver/base/MiniServoDriver.java rename to src/main/java/a8k/app/hardware/driver/MiniServoDriver.java index d94f665..a7c6b44 100644 --- a/src/main/java/a8k/app/service/app/driver/base/MiniServoDriver.java +++ b/src/main/java/a8k/app/hardware/driver/MiniServoDriver.java @@ -1,13 +1,13 @@ -package a8k.app.service.app.driver.base; +package a8k.app.hardware.driver; import a8k.app.constant.MiniServoConstant; -import a8k.app.hardware.A8kCanBusService; +import a8k.app.hardware.basedriver.A8kCanBusService; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.hardware.type.a8kcanprotocol.CmdId; import a8k.app.hardware.type.regindex.RegIndex; -import a8k.app.service.app.driver.base.type.MiniServoMId; -import a8k.app.type.ecode.AEHardwareError; -import a8k.app.type.exception.AppException; +import a8k.app.hardware.driver.type.MiniServoMId; +import a8k.app.a8ktype.error.AEHardwareError; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import org.slf4j.Logger; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/app/driver/base/OptModuleDriver.java b/src/main/java/a8k/app/hardware/driver/OptModuleDriver.java similarity index 92% rename from src/main/java/a8k/app/service/app/driver/base/OptModuleDriver.java rename to src/main/java/a8k/app/hardware/driver/OptModuleDriver.java index c8b6cea..43da829 100644 --- a/src/main/java/a8k/app/service/app/driver/base/OptModuleDriver.java +++ b/src/main/java/a8k/app/hardware/driver/OptModuleDriver.java @@ -1,15 +1,15 @@ -package a8k.app.service.app.driver.base; +package a8k.app.hardware.driver; import a8k.OS; -import a8k.app.hardware.A8kCanBusService; +import a8k.app.hardware.basedriver.A8kCanBusService; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.hardware.type.a8kcanprotocol.CmdId; import a8k.app.hardware.type.a8kcanprotocol.MId; import a8k.app.hardware.type.a8kcanprotocol.ModuleStatus; -import a8k.app.service.app.driver.base.type.OptModuleRegIndex; -import a8k.app.type.OptScanDirection; -import a8k.app.type.ecode.AEHardwareError; -import a8k.app.type.exception.AppException; +import a8k.app.hardware.driver.type.OptModuleRegIndex; +import a8k.app.a8ktype.opttype.OptScanDirection; +import a8k.app.a8ktype.error.AEHardwareError; +import a8k.app.a8ktype.exception.AppException; import a8k.app.utils.ByteArray; import a8k.app.utils.ZList; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/service/app/driver/base/PipetteCtrlDriver.java b/src/main/java/a8k/app/hardware/driver/PipetteCtrlDriver.java similarity index 98% rename from src/main/java/a8k/app/service/app/driver/base/PipetteCtrlDriver.java rename to src/main/java/a8k/app/hardware/driver/PipetteCtrlDriver.java index 9a29e8e..340f8e8 100644 --- a/src/main/java/a8k/app/service/app/driver/base/PipetteCtrlDriver.java +++ b/src/main/java/a8k/app/hardware/driver/PipetteCtrlDriver.java @@ -1,13 +1,13 @@ -package a8k.app.service.app.driver.base; +package a8k.app.hardware.driver; import a8k.extui.utils.ExtApiFn; -import a8k.app.hardware.A8kCanBusService; +import a8k.app.hardware.basedriver.A8kCanBusService; import a8k.app.hardware.type.LldType; import a8k.app.hardware.type.a8kcanprotocol.CmdId; import a8k.app.hardware.type.a8kcanprotocol.MId; -import a8k.app.service.app.driver.base.type.PipetteRegIndex; +import a8k.app.hardware.driver.type.PipetteRegIndex; import a8k.app.hardware.type.regindex.RegIndex; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.exception.AppException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/app/service/app/driver/base/StepMotorCtrlDriver.java b/src/main/java/a8k/app/hardware/driver/StepMotorCtrlDriver.java similarity index 96% rename from src/main/java/a8k/app/service/app/driver/base/StepMotorCtrlDriver.java rename to src/main/java/a8k/app/hardware/driver/StepMotorCtrlDriver.java index c2a065f..63fcdd3 100644 --- a/src/main/java/a8k/app/service/app/driver/base/StepMotorCtrlDriver.java +++ b/src/main/java/a8k/app/hardware/driver/StepMotorCtrlDriver.java @@ -1,13 +1,13 @@ -package a8k.app.service.app.driver.base; +package a8k.app.hardware.driver; import a8k.extui.utils.ExtApiFn; -import a8k.app.hardware.A8kCanBusService; +import a8k.app.hardware.basedriver.A8kCanBusService; import a8k.app.hardware.type.a8kcanprotocol.A8kPacket; import a8k.app.hardware.type.a8kcanprotocol.CmdId; import a8k.app.hardware.type.regindex.RegIndex; -import a8k.app.service.app.driver.base.type.StepMotorMId; -import a8k.app.service.app.driver.base.type.StepMotorRegIndex; -import a8k.app.type.exception.AppException; +import a8k.app.hardware.driver.type.StepMotorMId; +import a8k.app.hardware.driver.type.StepMotorRegIndex; +import a8k.app.a8ktype.exception.AppException; import a8k.app.utils.ZJsonHelper; import com.fasterxml.jackson.databind.node.ObjectNode; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/service/app/driver/base/TemperatureControlDriver.java b/src/main/java/a8k/app/hardware/driver/TemperatureControlDriver.java similarity index 90% rename from src/main/java/a8k/app/service/app/driver/base/TemperatureControlDriver.java rename to src/main/java/a8k/app/hardware/driver/TemperatureControlDriver.java index b99f46f..f7c3286 100644 --- a/src/main/java/a8k/app/service/app/driver/base/TemperatureControlDriver.java +++ b/src/main/java/a8k/app/hardware/driver/TemperatureControlDriver.java @@ -1,12 +1,12 @@ -package a8k.app.service.app.driver.base; +package a8k.app.hardware.driver; -import a8k.app.hardware.A8kCanBusService; +import a8k.app.hardware.basedriver.A8kCanBusService; import a8k.app.hardware.type.a8kcanprotocol.CmdId; -import a8k.app.service.app.driver.base.type.TemperatureControlerMid; -import a8k.app.service.app.driver.base.type.TemperatureControlerRegIndex; -import a8k.app.service.param.mgr.TemperatureCtrlParamMgr; +import a8k.app.hardware.driver.type.TemperatureControlerMid; +import a8k.app.hardware.driver.type.TemperatureControlerRegIndex; +import a8k.app.service.param.TemperatureCtrlParamMgr; import a8k.app.a8ktype.param.TemperatureCtrlParam; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/app/driver/base/type/HbotRegIndex.java b/src/main/java/a8k/app/hardware/driver/type/HbotRegIndex.java similarity index 98% rename from src/main/java/a8k/app/service/app/driver/base/type/HbotRegIndex.java rename to src/main/java/a8k/app/hardware/driver/type/HbotRegIndex.java index b422688..1ac3d71 100644 --- a/src/main/java/a8k/app/service/app/driver/base/type/HbotRegIndex.java +++ b/src/main/java/a8k/app/hardware/driver/type/HbotRegIndex.java @@ -1,4 +1,4 @@ -package a8k.app.service.app.driver.base.type; +package a8k.app.hardware.driver.type; import a8k.app.hardware.type.regindex.RegIndex; diff --git a/src/main/java/a8k/app/service/app/driver/base/type/MiniServoMId.java b/src/main/java/a8k/app/hardware/driver/type/MiniServoMId.java similarity index 91% rename from src/main/java/a8k/app/service/app/driver/base/type/MiniServoMId.java rename to src/main/java/a8k/app/hardware/driver/type/MiniServoMId.java index c6e7703..e8198bf 100644 --- a/src/main/java/a8k/app/service/app/driver/base/type/MiniServoMId.java +++ b/src/main/java/a8k/app/hardware/driver/type/MiniServoMId.java @@ -1,4 +1,4 @@ -package a8k.app.service.app.driver.base.type; +package a8k.app.hardware.driver.type; import a8k.app.hardware.type.a8kcanprotocol.MId; import org.springframework.util.Assert; diff --git a/src/main/java/a8k/app/service/app/driver/base/type/MiniServoRegIndex.java b/src/main/java/a8k/app/hardware/driver/type/MiniServoRegIndex.java similarity index 95% rename from src/main/java/a8k/app/service/app/driver/base/type/MiniServoRegIndex.java rename to src/main/java/a8k/app/hardware/driver/type/MiniServoRegIndex.java index bfff849..5ac5681 100644 --- a/src/main/java/a8k/app/service/app/driver/base/type/MiniServoRegIndex.java +++ b/src/main/java/a8k/app/hardware/driver/type/MiniServoRegIndex.java @@ -1,4 +1,4 @@ -package a8k.app.service.app.driver.base.type; +package a8k.app.hardware.driver.type; import a8k.app.hardware.type.regindex.RegIndex; diff --git a/src/main/java/a8k/app/service/app/driver/base/type/OptModuleRegIndex.java b/src/main/java/a8k/app/hardware/driver/type/OptModuleRegIndex.java similarity index 93% rename from src/main/java/a8k/app/service/app/driver/base/type/OptModuleRegIndex.java rename to src/main/java/a8k/app/hardware/driver/type/OptModuleRegIndex.java index dda91ed..c124da3 100644 --- a/src/main/java/a8k/app/service/app/driver/base/type/OptModuleRegIndex.java +++ b/src/main/java/a8k/app/hardware/driver/type/OptModuleRegIndex.java @@ -1,4 +1,4 @@ -package a8k.app.service.app.driver.base.type; +package a8k.app.hardware.driver.type; import a8k.app.hardware.type.regindex.RegIndex; diff --git a/src/main/java/a8k/app/service/app/driver/base/type/PipetteRegIndex.java b/src/main/java/a8k/app/hardware/driver/type/PipetteRegIndex.java similarity index 98% rename from src/main/java/a8k/app/service/app/driver/base/type/PipetteRegIndex.java rename to src/main/java/a8k/app/hardware/driver/type/PipetteRegIndex.java index dc1fb5c..0f35c3a 100644 --- a/src/main/java/a8k/app/service/app/driver/base/type/PipetteRegIndex.java +++ b/src/main/java/a8k/app/hardware/driver/type/PipetteRegIndex.java @@ -1,4 +1,4 @@ -package a8k.app.service.app.driver.base.type; +package a8k.app.hardware.driver.type; import a8k.app.hardware.type.regindex.RegIndex; import org.springframework.util.Assert; diff --git a/src/main/java/a8k/app/service/app/driver/base/type/StepMotorMId.java b/src/main/java/a8k/app/hardware/driver/type/StepMotorMId.java similarity index 94% rename from src/main/java/a8k/app/service/app/driver/base/type/StepMotorMId.java rename to src/main/java/a8k/app/hardware/driver/type/StepMotorMId.java index 44fa6fb..6988f2f 100644 --- a/src/main/java/a8k/app/service/app/driver/base/type/StepMotorMId.java +++ b/src/main/java/a8k/app/hardware/driver/type/StepMotorMId.java @@ -1,4 +1,4 @@ -package a8k.app.service.app.driver.base.type; +package a8k.app.hardware.driver.type; import a8k.app.hardware.type.a8kcanprotocol.MId; import org.springframework.util.Assert; diff --git a/src/main/java/a8k/app/service/app/driver/base/type/StepMotorRegIndex.java b/src/main/java/a8k/app/hardware/driver/type/StepMotorRegIndex.java similarity index 98% rename from src/main/java/a8k/app/service/app/driver/base/type/StepMotorRegIndex.java rename to src/main/java/a8k/app/hardware/driver/type/StepMotorRegIndex.java index e36dbf9..fd0c7bf 100644 --- a/src/main/java/a8k/app/service/app/driver/base/type/StepMotorRegIndex.java +++ b/src/main/java/a8k/app/hardware/driver/type/StepMotorRegIndex.java @@ -1,4 +1,4 @@ -package a8k.app.service.app.driver.base.type; +package a8k.app.hardware.driver.type; import a8k.app.hardware.type.regindex.RegIndex; diff --git a/src/main/java/a8k/app/service/app/driver/base/type/TemperatureControlerMid.java b/src/main/java/a8k/app/hardware/driver/type/TemperatureControlerMid.java similarity index 88% rename from src/main/java/a8k/app/service/app/driver/base/type/TemperatureControlerMid.java rename to src/main/java/a8k/app/hardware/driver/type/TemperatureControlerMid.java index db63b37..df269b9 100644 --- a/src/main/java/a8k/app/service/app/driver/base/type/TemperatureControlerMid.java +++ b/src/main/java/a8k/app/hardware/driver/type/TemperatureControlerMid.java @@ -1,4 +1,4 @@ -package a8k.app.service.app.driver.base.type; +package a8k.app.hardware.driver.type; import a8k.app.hardware.type.a8kcanprotocol.MId; import org.springframework.util.Assert; diff --git a/src/main/java/a8k/app/service/app/driver/base/type/TemperatureControlerRegIndex.java b/src/main/java/a8k/app/hardware/driver/type/TemperatureControlerRegIndex.java similarity index 98% rename from src/main/java/a8k/app/service/app/driver/base/type/TemperatureControlerRegIndex.java rename to src/main/java/a8k/app/hardware/driver/type/TemperatureControlerRegIndex.java index b37b200..01dfb73 100644 --- a/src/main/java/a8k/app/service/app/driver/base/type/TemperatureControlerRegIndex.java +++ b/src/main/java/a8k/app/hardware/driver/type/TemperatureControlerRegIndex.java @@ -1,4 +1,4 @@ -package a8k.app.service.app.driver.base.type; +package a8k.app.hardware.driver.type; import a8k.app.hardware.type.regindex.RegIndex; import org.springframework.util.Assert; diff --git a/src/main/java/a8k/app/service/app/driver/ext/MotorEnableExDriver.java b/src/main/java/a8k/app/hardware/extdriver/MotorEnableExDriver.java similarity index 87% rename from src/main/java/a8k/app/service/app/driver/ext/MotorEnableExDriver.java rename to src/main/java/a8k/app/hardware/extdriver/MotorEnableExDriver.java index db09395..2529a24 100644 --- a/src/main/java/a8k/app/service/app/driver/ext/MotorEnableExDriver.java +++ b/src/main/java/a8k/app/hardware/extdriver/MotorEnableExDriver.java @@ -1,13 +1,13 @@ -package a8k.app.service.app.driver.ext; - -import a8k.app.hardware.A8kCanBusService; -import a8k.app.service.app.driver.base.HbotDriver; -import a8k.app.service.app.driver.base.MiniServoDriver; -import a8k.app.service.app.driver.base.PipetteCtrlDriver; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; -import a8k.app.service.app.driver.base.type.MiniServoMId; -import a8k.app.service.app.driver.base.type.StepMotorMId; -import a8k.app.type.exception.AppException; +package a8k.app.hardware.extdriver; + +import a8k.app.hardware.basedriver.A8kCanBusService; +import a8k.app.hardware.driver.HbotDriver; +import a8k.app.hardware.driver.MiniServoDriver; +import a8k.app.hardware.driver.PipetteCtrlDriver; +import a8k.app.hardware.driver.StepMotorCtrlDriver; +import a8k.app.hardware.driver.type.MiniServoMId; +import a8k.app.hardware.driver.type.StepMotorMId; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/app/driver/ext/MotorMoveZeroExDriver.java b/src/main/java/a8k/app/hardware/extdriver/MotorMoveZeroExDriver.java similarity index 60% rename from src/main/java/a8k/app/service/app/driver/ext/MotorMoveZeroExDriver.java rename to src/main/java/a8k/app/hardware/extdriver/MotorMoveZeroExDriver.java index 60efff4..e490214 100644 --- a/src/main/java/a8k/app/service/app/driver/ext/MotorMoveZeroExDriver.java +++ b/src/main/java/a8k/app/hardware/extdriver/MotorMoveZeroExDriver.java @@ -1,31 +1,20 @@ -package a8k.app.service.app.driver.ext; - -import a8k.app.hardware.A8kCanBusService; -import a8k.app.service.app.driver.base.HbotDriver; -import a8k.app.service.app.driver.base.MiniServoDriver; -import a8k.app.service.app.driver.base.PipetteCtrlDriver; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; -import a8k.app.service.app.driver.base.type.MiniServoMId; -import a8k.app.service.app.driver.base.type.StepMotorMId; -import a8k.app.service.param.mgr.TubePreProcesPosParamMgr; -import a8k.app.type.exception.AppException; +package a8k.app.hardware.extdriver; + +import a8k.app.hardware.driver.MiniServoDriver; +import a8k.app.hardware.driver.StepMotorCtrlDriver; +import a8k.app.hardware.driver.type.MiniServoMId; +import a8k.app.hardware.driver.type.StepMotorMId; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; @Component public class MotorMoveZeroExDriver { @Resource - A8kCanBusService canBus; - @Resource - HbotDriver hbotDriver; - @Resource - PipetteCtrlDriver pipetteCtrlDriver; - @Resource StepMotorCtrlDriver stepMotorCtrlDriver; @Resource MiniServoDriver miniServoDriver; - @Resource - TubePreProcesPosParamMgr tubePreProcesPosParamMgr; + /** diff --git a/src/main/java/a8k/app/hardware/A8kModParamInitializer.java b/src/main/java/a8k/app/hardware/initializer/A8kModParamInitializer.java similarity index 88% rename from src/main/java/a8k/app/hardware/A8kModParamInitializer.java rename to src/main/java/a8k/app/hardware/initializer/A8kModParamInitializer.java index cbb108d..b7a5e3d 100644 --- a/src/main/java/a8k/app/hardware/A8kModParamInitializer.java +++ b/src/main/java/a8k/app/hardware/initializer/A8kModParamInitializer.java @@ -1,14 +1,12 @@ -package a8k.app.hardware; +package a8k.app.hardware.initializer; -import a8k.app.service.app.driver.base.PipetteCtrlDriver; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; -import a8k.app.service.app.driver.base.type.PipetteRegIndex; +import a8k.app.hardware.basedriver.A8kCanBusService; +import a8k.app.hardware.driver.PipetteCtrlDriver; +import a8k.app.hardware.driver.type.PipetteRegIndex; import a8k.app.service.bases.AppEventBusService; -import a8k.app.service.bases.appevent.A8kCanBusOnConnectEvent; -import a8k.app.service.bases.appevent.AppEvent; -import a8k.app.type.exception.AppException; -import a8k.app.hardware.custom_param_mgr.ModCustomParamId; -import a8k.app.hardware.custom_param_mgr.A8kModCustomParamMgr; +import a8k.app.a8ktype.appevent.A8kCanBusOnConnectEvent; +import a8k.app.a8ktype.appevent.AppEvent; +import a8k.app.a8ktype.exception.AppException; import a8k.app.hardware.type.a8kcanprotocol.MId; import a8k.app.hardware.type.regindex.RegIndex; import jakarta.annotation.PostConstruct; @@ -25,15 +23,9 @@ public class A8kModParamInitializer { AppEventBusService eventBus; @Resource - A8kCanBusService canBus; + A8kCanBusService canBus; @Resource - PipetteCtrlDriver pipetteCtrlDriver; - @Resource - StepMotorCtrlDriver stepMotorCtrlDriver; - - - @Resource - A8kModCustomParamMgr customParamMgr; + PipetteCtrlDriver pipetteCtrlDriver; @PostConstruct public void init() { @@ -41,11 +33,6 @@ public class A8kModParamInitializer { eventBus.regListener(this::onAppEvent); } - public void initA8kCustcomParams() { - customParamMgr.setCustomParam(MId.FeedingModXM, ModCustomParamId.MOTOR_STANDY_POS_COMPENSATE, -10); - customParamMgr.setCustomParam(MId.ShakeModGripperZM, ModCustomParamId.MOTOR_STANDY_POS_COMPENSATE, -10); - customParamMgr.setCustomParam(MId.ShakeModClampingM, ModCustomParamId.MOTOR_STANDY_POS_COMPENSATE, -10); - } public void initA8kModParams() throws AppException { /* diff --git a/src/main/java/a8k/app/hardware/type/PipetteSampleData.java b/src/main/java/a8k/app/hardware/type/PipetteSampleData.java deleted file mode 100644 index 73a3f6c..0000000 --- a/src/main/java/a8k/app/hardware/type/PipetteSampleData.java +++ /dev/null @@ -1,7 +0,0 @@ -package a8k.app.hardware.type; - -public class PipetteSampleData { - public Integer motorPos; - public Integer cval; - public Integer pval; -} diff --git a/src/main/java/a8k/app/i18n/Internationalization.java b/src/main/java/a8k/app/i18n/Internationalization.java index 7e3a795..291e2af 100644 --- a/src/main/java/a8k/app/i18n/Internationalization.java +++ b/src/main/java/a8k/app/i18n/Internationalization.java @@ -1,7 +1,7 @@ package a8k.app.i18n; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.app.service.app.appctrl.mainflowctrl.base.A8kActionStepType; +import a8k.app.service.mainctrl.mainflowctrl.base.A8kActionStepType; public class Internationalization { public static String A8kEcode2String(A8kEcode ecode) { diff --git a/src/main/java/a8k/app/service/app/driver/DeviceCtrlService.java b/src/main/java/a8k/app/service/app/driver/DeviceCtrlService.java deleted file mode 100644 index 27e980b..0000000 --- a/src/main/java/a8k/app/service/app/driver/DeviceCtrlService.java +++ /dev/null @@ -1,18 +0,0 @@ -package a8k.app.service.app.driver; - -import org.springframework.stereotype.Component; - -@Component -public class DeviceCtrlService { - // - // init - // enable - // disable - // moveQuickToZero - // moveToZero - // doSomeThing - // - - - -} diff --git a/src/main/java/a8k/app/service/app/background/BackgroudProcessCtrlService.java b/src/main/java/a8k/app/service/background/BackgroudProcessCtrlService.java similarity index 86% rename from src/main/java/a8k/app/service/app/background/BackgroudProcessCtrlService.java rename to src/main/java/a8k/app/service/background/BackgroudProcessCtrlService.java index 407cfaa..42663cd 100644 --- a/src/main/java/a8k/app/service/app/background/BackgroudProcessCtrlService.java +++ b/src/main/java/a8k/app/service/background/BackgroudProcessCtrlService.java @@ -1,9 +1,9 @@ -package a8k.app.service.app.background; +package a8k.app.service.background; import a8k.extui.utils.ExtApiFn; -import a8k.app.service.app.appdata.ProjIdCardInfoMgrService; +import a8k.app.service.data.ProjIdCardInfoMgrService; import a8k.extui.service.test.state.VirtualDevice; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/app/background/ProjIDCardDectorService.java b/src/main/java/a8k/app/service/background/ProjIDCardDectorService.java similarity index 87% rename from src/main/java/a8k/app/service/app/background/ProjIDCardDectorService.java rename to src/main/java/a8k/app/service/background/ProjIDCardDectorService.java index f8b3726..ba5c091 100644 --- a/src/main/java/a8k/app/service/app/background/ProjIDCardDectorService.java +++ b/src/main/java/a8k/app/service/background/ProjIDCardDectorService.java @@ -1,17 +1,17 @@ -package a8k.app.service.app.background; +package a8k.app.service.background; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.service.bases.appevent.*; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.a8ktype.appevent.*; import a8k.app.hardware.type.regindex.RegIndex; -import a8k.app.service.dao.type.ProjExtInfoCard; +import a8k.app.dao.db.type.ProjExtInfoCard; import a8k.extui.service.test.state.VirtualDevice; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.exception.AppException; import a8k.app.service.bases.AppEventBusService; -import a8k.app.hardware.A8kCanBusService; +import a8k.app.hardware.basedriver.A8kCanBusService; import a8k.app.hardware.type.a8kcanprotocol.*; import a8k.app.a8kproj.A8kIdCardDataParseService; -import a8k.app.utils.wq.ZWorkQueue; +import a8k.app.utils.ZWorkQueue; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; @@ -23,9 +23,9 @@ import org.springframework.stereotype.Component; public class ProjIDCardDectorService { @Resource - GStateService gstate; + GStateMgrService gstate; @Resource - VirtualDevice virtualDevice; + VirtualDevice virtualDevice; @Resource diff --git a/src/main/java/a8k/app/service/app/background/SensorDataUpdateService.java b/src/main/java/a8k/app/service/background/SensorDataUpdateService.java similarity index 70% rename from src/main/java/a8k/app/service/app/background/SensorDataUpdateService.java rename to src/main/java/a8k/app/service/background/SensorDataUpdateService.java index 3f2f35d..2bd9e7f 100644 --- a/src/main/java/a8k/app/service/app/background/SensorDataUpdateService.java +++ b/src/main/java/a8k/app/service/background/SensorDataUpdateService.java @@ -1,12 +1,12 @@ -package a8k.app.service.app.background; +package a8k.app.service.background; -import a8k.app.hardware.A8kCanBusService; +import a8k.app.hardware.basedriver.A8kCanBusService; import a8k.app.hardware.type.a8kcanprotocol.IOId; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.service.app.appstate.statemgr.OptScanModuleStateMgrService; -import a8k.app.service.app.appstate.type.state.OptScanModuleState; -import a8k.app.service.app.driver.base.TemperatureControlDriver; -import a8k.app.type.exception.AppException; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.service.statemgr.OptScanModuleStateMgrService; +import a8k.app.a8ktype.state.enumtype.OptScanModuleState; +import a8k.app.hardware.driver.TemperatureControlDriver; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; public class SensorDataUpdateService { @Resource - GStateService gStateService; + GStateMgrService gStateMgrService; @Resource TemperatureControlDriver temperatureControlDriver; @@ -38,7 +38,7 @@ public class SensorDataUpdateService { try { OptScanModuleState optScanModuleState = optScanModuleStateMgrService.getOptScanModule().getState(); if (!optScanModuleState.equals(OptScanModuleState.EMPTY)) { - gStateService.getSensorState().setWasteBinFullFlag(false); + gStateMgrService.getSensorState().setWasteBinFullFlag(false); Thread.sleep(1000); continue; } @@ -48,14 +48,14 @@ public class SensorDataUpdateService { Boolean wasteBinFullFlag = canBus.getIOState(IOId.RecycleBinOverflowPPS); canBus.setIOState(IOId.RecycleBinOverflowPPSPowerCtrl, false); - gStateService.getSensorState().setWasteBinFullFlag(wasteBinFullFlag); + gStateMgrService.getSensorState().setWasteBinFullFlag(wasteBinFullFlag); Thread.sleep(3000); Double incubateBoxTemp = temperatureControlDriver.readIncubateBoxTemperature(); - gStateService.getSensorState().setIncubateBoxTemperature((int) (incubateBoxTemp + 0.5)); + gStateMgrService.getSensorState().setIncubateBoxTemperature((int) (incubateBoxTemp + 0.5)); Double pbtemp = temperatureControlDriver.readPlateBoxTemperature(); - gStateService.getSensorState().setPboxTemperature((int) (pbtemp + 0.5)); + gStateMgrService.getSensorState().setPboxTemperature((int) (pbtemp + 0.5)); log.debug("IncubateBoxTemperature: {}, PlateBoxTemperature: {}, WasteBinFullFlag: {}", incubateBoxTemp, pbtemp, wasteBinFullFlag); diff --git a/src/main/java/a8k/app/service/app/background/TemperatureCtrlService.java b/src/main/java/a8k/app/service/background/TemperatureCtrlService.java similarity index 91% rename from src/main/java/a8k/app/service/app/background/TemperatureCtrlService.java rename to src/main/java/a8k/app/service/background/TemperatureCtrlService.java index c09ab16..ef5001a 100644 --- a/src/main/java/a8k/app/service/app/background/TemperatureCtrlService.java +++ b/src/main/java/a8k/app/service/background/TemperatureCtrlService.java @@ -1,11 +1,11 @@ -package a8k.app.service.app.background; +package a8k.app.service.background; -import a8k.app.service.app.appsetting.AppSettingsMgrService; -import a8k.app.service.app.driver.base.TemperatureControlDriver; -import a8k.app.service.dao.type.AppSetting; +import a8k.app.service.setting.AppSettingsMgrService; +import a8k.app.hardware.driver.TemperatureControlDriver; +import a8k.app.dao.db.type.AppSetting; import a8k.extui.service.test.state.VirtualDevice; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/a8k/app/service/bases/AppEventBusService.java b/src/main/java/a8k/app/service/bases/AppEventBusService.java index 1fd0c88..e9437f4 100644 --- a/src/main/java/a8k/app/service/bases/AppEventBusService.java +++ b/src/main/java/a8k/app/service/bases/AppEventBusService.java @@ -1,7 +1,7 @@ package a8k.app.service.bases; -import a8k.app.service.bases.appevent.AppExceptionEvent; -import a8k.app.service.bases.appevent.AppEvent; +import a8k.app.a8ktype.appevent.AppExceptionEvent; +import a8k.app.a8ktype.appevent.AppEvent; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/app/service/bases/FrontEndEventRouter.java b/src/main/java/a8k/app/service/bases/FrontEndEventRouter.java index 09e833c..88f83b9 100644 --- a/src/main/java/a8k/app/service/bases/FrontEndEventRouter.java +++ b/src/main/java/a8k/app/service/bases/FrontEndEventRouter.java @@ -1,7 +1,7 @@ package a8k.app.service.bases; import a8k.app.factory.ZAppPromoptFactory; -import a8k.app.service.bases.appevent.*; +import a8k.app.a8ktype.appevent.*; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/a8k/app/service/dao/type/a8kidcard/zenum/A8kOptType.java b/src/main/java/a8k/app/service/dao/type/a8kidcard/zenum/A8kOptType.java deleted file mode 100644 index 4e1ddc6..0000000 --- a/src/main/java/a8k/app/service/dao/type/a8kidcard/zenum/A8kOptType.java +++ /dev/null @@ -1,6 +0,0 @@ -package a8k.app.service.dao.type.a8kidcard.zenum; - -public enum A8kOptType { - FOPT, - TOPT, -} diff --git a/src/main/java/a8k/app/service/dao/type/appsetting/settingenum/LanguageType.java b/src/main/java/a8k/app/service/dao/type/appsetting/settingenum/LanguageType.java deleted file mode 100644 index 2941beb..0000000 --- a/src/main/java/a8k/app/service/dao/type/appsetting/settingenum/LanguageType.java +++ /dev/null @@ -1,5 +0,0 @@ -package a8k.app.service.dao.type.appsetting.settingenum; - -public enum LanguageType { - zh_CN, en_US -} diff --git a/src/main/java/a8k/app/service/dao/utils/PosParameterReader.java b/src/main/java/a8k/app/service/dao/utils/PosParameterReader.java deleted file mode 100644 index e891ce2..0000000 --- a/src/main/java/a8k/app/service/dao/utils/PosParameterReader.java +++ /dev/null @@ -1,53 +0,0 @@ -package a8k.app.service.dao.utils; - -import a8k.app.service.dao.LowerDeviceParameterDao; -import a8k.app.service.dao.type.Parameter; - -import java.util.ArrayList; -import java.util.List; - -public class PosParameterReader { - String service; - LowerDeviceParameterDao lowerDeviceParameterDao; - - public PosParameterReader(LowerDeviceParameterDao dbservice, Class service) { - lowerDeviceParameterDao = dbservice; - this.service = service.getSimpleName(); - } - - public PosParameterReader(LowerDeviceParameterDao dbservice, String service) { - lowerDeviceParameterDao = dbservice; - this.service = service; - } - - - public T getPos(String key, Class tClass) { - return lowerDeviceParameterDao.getParam(this.service, key, tClass); - } - - public T getPos(Enum key, Class tClass) { - return lowerDeviceParameterDao.getParam(this.service, key.name(), tClass); - } - - - public void setParam(String key, Object pos) { - lowerDeviceParameterDao.updateParam(service, key, pos); - } - - public void setParam(Enum key, Object pos) { - lowerDeviceParameterDao.updateParam(service, key.name(), pos); - } - - public List getParams() { - return lowerDeviceParameterDao.getParams(service); - } - - public List getParams(Enum[] etable) { - List parameters = new ArrayList<>(); - for (Enum e : etable) { - Parameter parameter = lowerDeviceParameterDao.getParam(service, e.name()); - parameters.add(parameter); - } - return parameters; - } -} diff --git a/src/main/java/a8k/app/service/app/appdata/AppUserMgrService.java b/src/main/java/a8k/app/service/data/AppUserMgrService.java similarity index 91% rename from src/main/java/a8k/app/service/app/appdata/AppUserMgrService.java rename to src/main/java/a8k/app/service/data/AppUserMgrService.java index acd520f..bf7a290 100644 --- a/src/main/java/a8k/app/service/app/appdata/AppUserMgrService.java +++ b/src/main/java/a8k/app/service/data/AppUserMgrService.java @@ -1,12 +1,11 @@ -package a8k.app.service.app.appdata; +package a8k.app.service.data; -import a8k.app.service.dao.AppUsrDao; -import a8k.app.service.dao.type.AppUser; -import a8k.app.service.dao.type.UsrRole; +import a8k.app.dao.db.AppUsrDao; +import a8k.app.dao.db.type.AppUser; +import a8k.app.dao.db.type.UsrRole; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; -import org.apache.catalina.User; import org.slf4j.Logger; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/app/appdata/FileMgrService.java b/src/main/java/a8k/app/service/data/FileMgrService.java similarity index 98% rename from src/main/java/a8k/app/service/app/appdata/FileMgrService.java rename to src/main/java/a8k/app/service/data/FileMgrService.java index 3f78277..51b5def 100644 --- a/src/main/java/a8k/app/service/app/appdata/FileMgrService.java +++ b/src/main/java/a8k/app/service/data/FileMgrService.java @@ -1,4 +1,4 @@ -package a8k.app.service.app.appdata; +package a8k.app.service.data; import a8k.app.a8kproj.optalgo.type.A8kOptPeak; import a8k.app.a8kproj.optalgo.type.OptAlgoAnalysResult; @@ -7,8 +7,8 @@ import a8k.app.a8kproj.optalgo.type.PeakFindState; import a8k.app.a8ktype.opttype.PeakDivision; import a8k.app.a8ktype.opttype.PeakName; import a8k.app.constant.FilePathConstant; -import a8k.app.service.dao.type.OptRawScanData; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kOptType; +import a8k.app.dao.db.type.OptRawScanData; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kOptType; import a8k.app.utils.ZDateUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/app/appdata/ProjIdCardInfoMgrService.java b/src/main/java/a8k/app/service/data/ProjIdCardInfoMgrService.java similarity index 83% rename from src/main/java/a8k/app/service/app/appdata/ProjIdCardInfoMgrService.java rename to src/main/java/a8k/app/service/data/ProjIdCardInfoMgrService.java index d9068f7..674dafb 100644 --- a/src/main/java/a8k/app/service/app/appdata/ProjIdCardInfoMgrService.java +++ b/src/main/java/a8k/app/service/data/ProjIdCardInfoMgrService.java @@ -1,13 +1,13 @@ -package a8k.app.service.app.appdata; +package a8k.app.service.data; +import a8k.app.dao.db.A8kProjExtInfoCardDao; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.service.dao.A8kProjExtInfoCardDao; -import a8k.app.service.dao.type.A8kProjInfoCardBreif; -import a8k.app.service.dao.type.ProjExtInfoCard; -import a8k.app.type.db.CommonPage; -import a8k.app.type.exception.AppException; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.dao.db.type.A8kProjInfoCardBreif; +import a8k.app.dao.db.type.ProjExtInfoCard; +import a8k.app.a8ktype.db.CommonPage; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; @@ -17,7 +17,7 @@ import java.util.List; @Component public class ProjIdCardInfoMgrService { @Resource - GStateService gstate; + GStateMgrService gstate; @Resource A8kProjExtInfoCardDao a8KProjExtInfoCardDao; diff --git a/src/main/java/a8k/app/service/app/appdata/ProjInfoMgrService.java b/src/main/java/a8k/app/service/data/ProjInfoMgrService.java similarity index 86% rename from src/main/java/a8k/app/service/app/appdata/ProjInfoMgrService.java rename to src/main/java/a8k/app/service/data/ProjInfoMgrService.java index b1140fe..1bd7e5e 100644 --- a/src/main/java/a8k/app/service/app/appdata/ProjInfoMgrService.java +++ b/src/main/java/a8k/app/service/data/ProjInfoMgrService.java @@ -1,14 +1,15 @@ -package a8k.app.service.app.appdata; +package a8k.app.service.data; +import a8k.app.dao.db.A8kProjExtInfoCardDao; +import a8k.app.dao.db.ProjOptInfoDao; +import a8k.app.dao.db.ProjectBaseInfoDao; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.app.service.dao.A8kProjExtInfoCardDao; -import a8k.app.service.dao.ProjectBaseInfoDao; -import a8k.app.service.dao.ProjOptInfoDao; -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.type.exception.AppException; + +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.a8ktype.exception.AppException; import a8k.app.utils.ProjBuildinInfo; import a8k.app.utils.ZAppChecker; import jakarta.annotation.Resource; @@ -25,9 +26,9 @@ public class ProjInfoMgrService { @Resource A8kProjExtInfoCardDao a8KProjExtInfoCardDao; @Resource - ProjectBaseInfoDao projectBaseInfoDao; + ProjectBaseInfoDao projectBaseInfoDao; @Resource - ProjOptInfoDao projOptInfoDao; + ProjOptInfoDao projOptInfoDao; public ProjBuildinInfo getProjBuildInInfo(Integer projId) throws AppException { ProjBuildinInfo projBuildinInfo = new ProjBuildinInfo(); diff --git a/src/main/java/a8k/app/service/app/appdata/ReactionRecordMgrService.java b/src/main/java/a8k/app/service/data/ReactionRecordMgrService.java similarity index 89% rename from src/main/java/a8k/app/service/app/appdata/ReactionRecordMgrService.java rename to src/main/java/a8k/app/service/data/ReactionRecordMgrService.java index 36e3d93..48efe41 100644 --- a/src/main/java/a8k/app/service/app/appdata/ReactionRecordMgrService.java +++ b/src/main/java/a8k/app/service/data/ReactionRecordMgrService.java @@ -1,11 +1,11 @@ -package a8k.app.service.app.appdata; - -import a8k.app.service.dao.ReactionRecordDao; -import a8k.app.service.dao.type.ReactionResultRecord; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.service.app.appstate.type.ProjectTaskContext; -import a8k.app.type.ReactionResult; -import a8k.app.type.db.CommonPage; +package a8k.app.service.data; + +import a8k.app.dao.db.ReactionRecordDao; +import a8k.app.dao.db.type.ReactionResultRecord; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.a8ktype.state.ProjectTaskContext; +import a8k.app.a8ktype.type.ReactionResult; +import a8k.app.a8ktype.db.CommonPage; import a8k.app.utils.ZJsonHelper; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; @@ -27,7 +27,7 @@ public class ReactionRecordMgrService { AppUserMgrService appUserMgrService; @Resource - GStateService gstate; + GStateMgrService gstate; @PostConstruct public void init() { diff --git a/src/main/java/a8k/app/service/app/appdata/UtilsProjectColorAllocer.java b/src/main/java/a8k/app/service/data/UtilsProjectColorAllocer.java similarity index 99% rename from src/main/java/a8k/app/service/app/appdata/UtilsProjectColorAllocer.java rename to src/main/java/a8k/app/service/data/UtilsProjectColorAllocer.java index 22058d4..baafaa1 100644 --- a/src/main/java/a8k/app/service/app/appdata/UtilsProjectColorAllocer.java +++ b/src/main/java/a8k/app/service/data/UtilsProjectColorAllocer.java @@ -1,4 +1,4 @@ -package a8k.app.service.app.appdata; +package a8k.app.service.data; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/app/driver/ctrlservice/ConsumablesScanCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/ConsumablesScanCtrlService.java similarity index 88% rename from src/main/java/a8k/app/service/app/driver/ctrlservice/ConsumablesScanCtrlService.java rename to src/main/java/a8k/app/service/lowerctrl/ConsumablesScanCtrlService.java index 6fec72e..4357c43 100644 --- a/src/main/java/a8k/app/service/app/driver/ctrlservice/ConsumablesScanCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/ConsumablesScanCtrlService.java @@ -1,12 +1,12 @@ -package a8k.app.service.app.driver.ctrlservice; +package a8k.app.service.lowerctrl; -import a8k.app.service.app.driver.base.CodeScanerDriver; -import a8k.app.service.param.mgr.Hbot2DCodeScanParamMgr; +import a8k.app.hardware.driver.CodeScanerDriver; +import a8k.app.service.param.Hbot2DCodeScanParamMgr; import a8k.extui.service.test.state.VirtualDevice; -import a8k.app.type.ConsumableOneChRawResult; -import a8k.app.type.ConsumableScanRawResult; -import a8k.app.type.cfg.Pos2d; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.type.ConsumableOneChRawResult; +import a8k.app.a8ktype.type.ConsumableScanRawResult; +import a8k.app.a8ktype.device.Pos2d; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/app/driver/ctrlservice/DeviceInitCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/DeviceInitCtrlService.java similarity index 91% rename from src/main/java/a8k/app/service/app/driver/ctrlservice/DeviceInitCtrlService.java rename to src/main/java/a8k/app/service/lowerctrl/DeviceInitCtrlService.java index 9296fbb..7879018 100644 --- a/src/main/java/a8k/app/service/app/driver/ctrlservice/DeviceInitCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/DeviceInitCtrlService.java @@ -1,21 +1,21 @@ -package a8k.app.service.app.driver.ctrlservice; +package a8k.app.service.lowerctrl; -import a8k.app.hardware.A8kCanBusService; +import a8k.app.hardware.basedriver.A8kCanBusService; import a8k.app.hardware.type.a8kcanprotocol.IOId; -import a8k.app.service.app.driver.base.MiniServoDriver; -import a8k.app.service.app.driver.base.PipetteCtrlDriver; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; -import a8k.app.service.app.driver.base.type.MiniServoMId; -import a8k.app.service.app.driver.base.type.StepMotorMId; -import a8k.app.service.app.driver.ext.MotorEnableExDriver; +import a8k.app.hardware.driver.MiniServoDriver; +import a8k.app.hardware.driver.PipetteCtrlDriver; +import a8k.app.hardware.driver.StepMotorCtrlDriver; +import a8k.app.hardware.driver.type.MiniServoMId; +import a8k.app.hardware.driver.type.StepMotorMId; +import a8k.app.hardware.extdriver.MotorEnableExDriver; import a8k.app.service.bases.AppEventBusService; import a8k.extui.service.test.state.VirtualDevice; -import a8k.app.type.CheckPointType; -import a8k.app.type.checkpoint.CheckResult; -import a8k.app.type.checkpoint.Checkpoint; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.others.CheckPointType; +import a8k.app.a8ktype.others.checkpoint.CheckResult; +import a8k.app.a8ktype.others.checkpoint.Checkpoint; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import lombok.Getter; @@ -29,7 +29,7 @@ import java.util.List; @Slf4j() public class DeviceInitCtrlService { @Resource - GStateService gstate; + GStateMgrService gstate; @Resource VirtualDevice virtualDevice; diff --git a/src/main/java/a8k/app/service/app/driver/ctrlservice/HbotMoveCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/HbotMoveCtrlService.java similarity index 87% rename from src/main/java/a8k/app/service/app/driver/ctrlservice/HbotMoveCtrlService.java rename to src/main/java/a8k/app/service/lowerctrl/HbotMoveCtrlService.java index 2b334fa..a364a08 100644 --- a/src/main/java/a8k/app/service/app/driver/ctrlservice/HbotMoveCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/HbotMoveCtrlService.java @@ -1,11 +1,12 @@ -package a8k.app.service.app.driver.ctrlservice; +package a8k.app.service.lowerctrl; -import a8k.app.service.app.driver.base.type.PipetteRegIndex; -import a8k.app.service.app.driver.base.HbotDriver; -import a8k.app.service.app.driver.base.PipetteCtrlDriver; -import a8k.app.type.exception.AppException; -import a8k.app.type.cfg.*; -import a8k.app.hardware.A8kCanBusService; +import a8k.app.a8ktype.device.Pos2d; +import a8k.app.a8ktype.device.Pos3d; +import a8k.app.hardware.driver.type.PipetteRegIndex; +import a8k.app.hardware.driver.HbotDriver; +import a8k.app.hardware.driver.PipetteCtrlDriver; +import a8k.app.a8ktype.exception.AppException; +import a8k.app.hardware.basedriver.A8kCanBusService; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.hardware.type.a8kcanprotocol.IOId; import a8k.app.hardware.type.a8kcanprotocol.MId; diff --git a/src/main/java/a8k/app/service/app/driver/ctrlservice/HbotMoveExCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/HbotMoveExCtrlService.java similarity index 92% rename from src/main/java/a8k/app/service/app/driver/ctrlservice/HbotMoveExCtrlService.java rename to src/main/java/a8k/app/service/lowerctrl/HbotMoveExCtrlService.java index 7a9eeef..f247258 100644 --- a/src/main/java/a8k/app/service/app/driver/ctrlservice/HbotMoveExCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/HbotMoveExCtrlService.java @@ -1,19 +1,19 @@ -package a8k.app.service.app.driver.ctrlservice; +package a8k.app.service.lowerctrl; import a8k.app.constant.AppConstant; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.app.service.app.driver.base.HbotDriver; -import a8k.app.service.param.mgr.HbotTipPosMgr; -import a8k.app.service.app.driver.base.PipetteCtrlDriver; -import a8k.app.service.param.exmgr.HbotConsumableParamMgr; -import a8k.app.service.param.mgr.HbotFixedPosParamMgr; -import a8k.app.service.param.mgr.HbotSamplePosParamMgr; +import a8k.app.hardware.driver.HbotDriver; +import a8k.app.service.param.HbotTipPosMgr; +import a8k.app.hardware.driver.PipetteCtrlDriver; +import a8k.app.dao.exparam.HbotConsumableParamMgr; +import a8k.app.service.param.HbotFixedPosParamMgr; +import a8k.app.service.param.HbotSamplePosParamMgr; import a8k.app.a8ktype.param.A8kSamplePos; import a8k.app.a8ktype.device.ConsumableGroup; import a8k.app.a8ktype.param.HbotSamplePos; -import a8k.app.type.pos.TipPos; -import a8k.app.type.cfg.Pos3d; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.device.TipPos; +import a8k.app.a8ktype.device.Pos3d; +import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.device.TipGroup; import a8k.app.utils.ZAppChecker; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/service/app/driver/ctrlservice/LiquidOperationCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/LiquidOperationCtrlService.java similarity index 94% rename from src/main/java/a8k/app/service/app/driver/ctrlservice/LiquidOperationCtrlService.java rename to src/main/java/a8k/app/service/lowerctrl/LiquidOperationCtrlService.java index b3ab968..5b9d349 100644 --- a/src/main/java/a8k/app/service/app/driver/ctrlservice/LiquidOperationCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/LiquidOperationCtrlService.java @@ -1,11 +1,11 @@ -package a8k.app.service.app.driver.ctrlservice; +package a8k.app.service.lowerctrl; import a8k.app.a8ktype.device.ConsumableIndex; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.app.service.app.driver.base.PipetteCtrlDriver; +import a8k.app.hardware.driver.PipetteCtrlDriver; import a8k.app.a8ktype.device.ConsumableGroup; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.exception.AppException; import a8k.app.utils.ZAppChecker; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/app/driver/ctrlservice/OptScanModuleCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/OptScanModuleCtrlService.java similarity index 88% rename from src/main/java/a8k/app/service/app/driver/ctrlservice/OptScanModuleCtrlService.java rename to src/main/java/a8k/app/service/lowerctrl/OptScanModuleCtrlService.java index e27ae9c..a08ba58 100644 --- a/src/main/java/a8k/app/service/app/driver/ctrlservice/OptScanModuleCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/OptScanModuleCtrlService.java @@ -1,23 +1,23 @@ -package a8k.app.service.app.driver.ctrlservice; +package a8k.app.service.lowerctrl; import a8k.app.a8kproj.optalgo.type.OptAlgoAnalysResult; import a8k.app.constant.OptConstant; import a8k.app.a8kproj.optalgo.A8kOptAlgoV2; import a8k.app.a8kproj.optalgo.type.OptScanResult; import a8k.app.a8kproj.optalgo.utils.A8kOptGainAdjuster; -import a8k.app.service.app.driver.base.OptModuleDriver; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; -import a8k.app.service.app.driver.base.type.OptModuleRegIndex; -import a8k.app.service.app.driver.base.type.StepMotorMId; -import a8k.app.service.param.mgr.OptModuleExtParamsMgr; -import a8k.app.service.param.mgr.OptModuleParamsMgr; -import a8k.app.service.dao.type.OptRawScanData; -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.hardware.driver.OptModuleDriver; +import a8k.app.hardware.driver.StepMotorCtrlDriver; +import a8k.app.hardware.driver.type.OptModuleRegIndex; +import a8k.app.hardware.driver.type.StepMotorMId; +import a8k.app.service.param.OptModuleExtParamsMgr; +import a8k.app.service.param.OptModuleParamsMgr; +import a8k.app.dao.db.type.OptRawScanData; +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.a8ktype.device.IncubatorPos; -import a8k.app.type.OptScanDirection; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.opttype.OptScanDirection; +import a8k.app.a8ktype.exception.AppException; import a8k.app.utils.ZDateUtils; import a8k.app.utils.opt_gain_convert.OptGainConvert; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/service/app/driver/ctrlservice/PlateBoxCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/PlateBoxCtrlService.java similarity index 81% rename from src/main/java/a8k/app/service/app/driver/ctrlservice/PlateBoxCtrlService.java rename to src/main/java/a8k/app/service/lowerctrl/PlateBoxCtrlService.java index ff53ea1..ef2de7b 100644 --- a/src/main/java/a8k/app/service/app/driver/ctrlservice/PlateBoxCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/PlateBoxCtrlService.java @@ -1,11 +1,11 @@ -package a8k.app.service.app.driver.ctrlservice; +package a8k.app.service.lowerctrl; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; -import a8k.app.service.app.driver.base.type.StepMotorMId; -import a8k.app.service.param.mgr.PlatesBoxPosParamMgr; +import a8k.app.hardware.driver.StepMotorCtrlDriver; +import a8k.app.hardware.driver.type.StepMotorMId; +import a8k.app.service.param.PlatesBoxPosParamMgr; import a8k.app.a8ktype.device.ConsumableGroup; import a8k.app.a8ktype.device.IncubatorPos; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/app/driver/ctrlservice/TubeFeedingCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/TubeFeedingCtrlService.java similarity index 93% rename from src/main/java/a8k/app/service/app/driver/ctrlservice/TubeFeedingCtrlService.java rename to src/main/java/a8k/app/service/lowerctrl/TubeFeedingCtrlService.java index 184bc26..0c953ef 100644 --- a/src/main/java/a8k/app/service/app/driver/ctrlservice/TubeFeedingCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/TubeFeedingCtrlService.java @@ -1,20 +1,20 @@ -package a8k.app.service.app.driver.ctrlservice; +package a8k.app.service.lowerctrl; import a8k.OS; import a8k.extui.utils.ExtApiFn; -import a8k.app.service.app.driver.base.CodeScanerDriver; -import a8k.app.service.app.driver.base.MiniServoDriver; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; -import a8k.app.service.app.driver.base.type.MiniServoMId; -import a8k.app.service.app.driver.base.type.StepMotorMId; -import a8k.app.service.param.mgr.TubeFeedingModuleParamMgr; +import a8k.app.hardware.driver.CodeScanerDriver; +import a8k.app.hardware.driver.MiniServoDriver; +import a8k.app.hardware.driver.StepMotorCtrlDriver; +import a8k.app.hardware.driver.type.MiniServoMId; +import a8k.app.hardware.driver.type.StepMotorMId; +import a8k.app.service.param.TubeFeedingModuleParamMgr; import a8k.app.service.bases.AppEventBusService; -import a8k.app.service.bases.appevent.AppWarningNotifyEvent; -import a8k.app.type.TubeHolderScanResult; -import a8k.app.type.TubesScanResult; -import a8k.app.type.exception.AppException; -import a8k.app.type.TargetPosMeasureDirection; -import a8k.app.hardware.A8kCanBusService; +import a8k.app.a8ktype.appevent.AppWarningNotifyEvent; +import a8k.app.a8ktype.type.TubeHolderScanResult; +import a8k.app.a8ktype.type.TubesScanResult; +import a8k.app.a8ktype.exception.AppException; +import a8k.app.a8ktype.type.TargetPosMeasureDirection; +import a8k.app.hardware.basedriver.A8kCanBusService; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.hardware.type.a8kcanprotocol.IOId; import a8k.app.hardware.type.a8kcanprotocol.MId; diff --git a/src/main/java/a8k/app/service/app/driver/ctrlservice/TubeFeedingExCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/TubeFeedingExCtrlService.java similarity index 88% rename from src/main/java/a8k/app/service/app/driver/ctrlservice/TubeFeedingExCtrlService.java rename to src/main/java/a8k/app/service/lowerctrl/TubeFeedingExCtrlService.java index c3cf8d8..aea638c 100644 --- a/src/main/java/a8k/app/service/app/driver/ctrlservice/TubeFeedingExCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/TubeFeedingExCtrlService.java @@ -1,16 +1,16 @@ -package a8k.app.service.app.driver.ctrlservice; +package a8k.app.service.lowerctrl; import a8k.OS; import a8k.app.constant.MiniServoConstant; -import a8k.app.hardware.A8kCanBusService; +import a8k.app.hardware.basedriver.A8kCanBusService; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.hardware.type.a8kcanprotocol.MId; -import a8k.app.service.app.driver.base.MiniServoDriver; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; -import a8k.app.service.app.driver.base.type.MiniServoMId; -import a8k.app.service.app.driver.base.type.StepMotorMId; -import a8k.app.type.TargetPosMeasureDirection; -import a8k.app.type.exception.AppException; +import a8k.app.hardware.driver.MiniServoDriver; +import a8k.app.hardware.driver.StepMotorCtrlDriver; +import a8k.app.hardware.driver.type.MiniServoMId; +import a8k.app.hardware.driver.type.StepMotorMId; +import a8k.app.a8ktype.type.TargetPosMeasureDirection; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/app/service/app/driver/ctrlservice/TubePreProcesModuleCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/TubePreProcesModuleCtrlService.java similarity index 93% rename from src/main/java/a8k/app/service/app/driver/ctrlservice/TubePreProcesModuleCtrlService.java rename to src/main/java/a8k/app/service/lowerctrl/TubePreProcesModuleCtrlService.java index 9826d78..84e92da 100644 --- a/src/main/java/a8k/app/service/app/driver/ctrlservice/TubePreProcesModuleCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/TubePreProcesModuleCtrlService.java @@ -1,13 +1,13 @@ -package a8k.app.service.app.driver.ctrlservice; +package a8k.app.service.lowerctrl; -import a8k.app.hardware.A8kCanBusService; +import a8k.app.hardware.basedriver.A8kCanBusService; import a8k.app.hardware.type.a8kcanprotocol.MId; -import a8k.app.service.app.driver.base.MiniServoDriver; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; -import a8k.app.service.app.driver.base.type.MiniServoMId; -import a8k.app.service.app.driver.base.type.StepMotorMId; -import a8k.app.service.param.mgr.TubePreProcesPosParamMgr; -import a8k.app.type.exception.AppException; +import a8k.app.hardware.driver.MiniServoDriver; +import a8k.app.hardware.driver.StepMotorCtrlDriver; +import a8k.app.hardware.driver.type.MiniServoMId; +import a8k.app.hardware.driver.type.StepMotorMId; +import a8k.app.service.param.TubePreProcesPosParamMgr; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/app/service/app/driver/ctrlservice/TubePreProcesModuleExCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/TubePreProcesModuleExCtrlService.java similarity index 94% rename from src/main/java/a8k/app/service/app/driver/ctrlservice/TubePreProcesModuleExCtrlService.java rename to src/main/java/a8k/app/service/lowerctrl/TubePreProcesModuleExCtrlService.java index 9f88155..2615501 100644 --- a/src/main/java/a8k/app/service/app/driver/ctrlservice/TubePreProcesModuleExCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/TubePreProcesModuleExCtrlService.java @@ -1,11 +1,11 @@ -package a8k.app.service.app.driver.ctrlservice; +package a8k.app.service.lowerctrl; import a8k.app.constant.MiniServoConstant; -import a8k.app.service.app.driver.base.MiniServoDriver; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; -import a8k.app.service.app.driver.base.type.MiniServoMId; -import a8k.app.service.app.driver.base.type.StepMotorMId; -import a8k.app.type.exception.AppException; +import a8k.app.hardware.driver.MiniServoDriver; +import a8k.app.hardware.driver.StepMotorCtrlDriver; +import a8k.app.hardware.driver.type.MiniServoMId; +import a8k.app.hardware.driver.type.StepMotorMId; +import a8k.app.a8ktype.exception.AppException; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.hardware.type.a8kcanprotocol.MId; import a8k.app.utils.ZEQ; diff --git a/src/main/java/a8k/app/service/app/driver/ctrlservice/TurnableMoveCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/TurnableMoveCtrlService.java similarity index 90% rename from src/main/java/a8k/app/service/app/driver/ctrlservice/TurnableMoveCtrlService.java rename to src/main/java/a8k/app/service/lowerctrl/TurnableMoveCtrlService.java index 13d365d..1cb0bd4 100644 --- a/src/main/java/a8k/app/service/app/driver/ctrlservice/TurnableMoveCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/TurnableMoveCtrlService.java @@ -1,11 +1,11 @@ -package a8k.app.service.app.driver.ctrlservice; +package a8k.app.service.lowerctrl; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; -import a8k.app.service.app.driver.base.type.StepMotorMId; -import a8k.app.service.param.mgr.TurntablePosParamMgr; +import a8k.app.hardware.driver.StepMotorCtrlDriver; +import a8k.app.hardware.driver.type.StepMotorMId; +import a8k.app.service.param.TurntablePosParamMgr; import a8k.app.a8ktype.device.IncubatorPos; -import a8k.app.type.exception.AppException; -import a8k.app.hardware.A8kCanBusService; +import a8k.app.a8ktype.exception.AppException; +import a8k.app.hardware.basedriver.A8kCanBusService; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.hardware.type.a8kcanprotocol.IOId; diff --git a/src/main/java/a8k/app/service/app/appctrl/AppConsumablesScanService.java b/src/main/java/a8k/app/service/mainctrl/AppConsumablesScanService.java similarity index 90% rename from src/main/java/a8k/app/service/app/appctrl/AppConsumablesScanService.java rename to src/main/java/a8k/app/service/mainctrl/AppConsumablesScanService.java index a2f3543..09f8389 100644 --- a/src/main/java/a8k/app/service/app/appctrl/AppConsumablesScanService.java +++ b/src/main/java/a8k/app/service/mainctrl/AppConsumablesScanService.java @@ -1,21 +1,22 @@ -package a8k.app.service.app.appctrl; +package a8k.app.service.mainctrl; import a8k.app.a8ktype.device.ConsumableGroup; +import a8k.app.a8ktype.device.LittleBottleConsumableType; import a8k.app.constant.AppConstant; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.app.service.app.appdata.ProjInfoMgrService; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.service.app.appstate.statemgr.ConsumablesMgrService; -import a8k.app.service.app.driver.ctrlservice.ConsumablesScanCtrlService; - -import a8k.app.service.dao.type.ProjExtInfoCard; -import a8k.app.type.*; -import a8k.app.type.consumables.LarBottleGroup; -import a8k.app.type.consumables.LittBottleGroup; -import a8k.app.type.consumables.ReactionPlateGroup; -import a8k.app.type.consumables.ConsumablesScanReportErrorType; -import a8k.app.type.exception.AppException; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kReactionFlowType; +import a8k.app.service.data.ProjInfoMgrService; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.service.statemgr.ConsumablesMgrService; +import a8k.app.service.lowerctrl.ConsumablesScanCtrlService; + +import a8k.app.dao.db.type.ProjExtInfoCard; +import a8k.app.a8ktype.type.*; +import a8k.app.a8ktype.device.consumables.LarBottleGroup; +import a8k.app.a8ktype.device.consumables.LittBottleGroup; +import a8k.app.a8ktype.device.consumables.ReactionPlateGroup; +import a8k.app.a8ktype.error.ConsumablesScanReportErrorType; +import a8k.app.a8ktype.exception.AppException; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kReactionFlowType; import a8k.app.utils.*; import jakarta.annotation.Resource; import org.slf4j.Logger; @@ -31,9 +32,9 @@ public class AppConsumablesScanService { @Resource ConsumablesScanCtrlService scanCtrlService; @Resource - ConsumablesMgrService consumablesMgrService; + ConsumablesMgrService consumablesMgrService; @Resource - GStateService gstate; + GStateMgrService gstate; @Resource ProjInfoMgrService projInfoMgrService; diff --git a/src/main/java/a8k/app/service/app/appctrl/AppDeviceCtrlService.java b/src/main/java/a8k/app/service/mainctrl/AppDeviceCtrlService.java similarity index 81% rename from src/main/java/a8k/app/service/app/appctrl/AppDeviceCtrlService.java rename to src/main/java/a8k/app/service/mainctrl/AppDeviceCtrlService.java index 7e597b3..427dbb1 100644 --- a/src/main/java/a8k/app/service/app/appctrl/AppDeviceCtrlService.java +++ b/src/main/java/a8k/app/service/mainctrl/AppDeviceCtrlService.java @@ -1,11 +1,11 @@ -package a8k.app.service.app.appctrl; +package a8k.app.service.mainctrl; -import a8k.app.service.app.appctrl.mainflowctrl.MainFlowCtrlScheduler; -import a8k.app.service.app.appstate.statemgr.ConsumablesMgrService; -import a8k.app.service.app.appstate.statemgr.ProjectContextMgrService; +import a8k.app.service.mainctrl.mainflowctrl.MainFlowCtrlScheduler; +import a8k.app.service.statemgr.ConsumablesMgrService; +import a8k.app.service.statemgr.ProjectContextMgrService; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.type.exception.AppException; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; public class AppDeviceCtrlService { @Resource - GStateService gstate; + GStateMgrService gstate; @Resource MainFlowCtrlScheduler mainFlowCtrlScheduler; //主流程控制模块 diff --git a/src/main/java/a8k/app/service/app/appctrl/AppTubeSettingMgrService.java b/src/main/java/a8k/app/service/mainctrl/AppTubeSettingMgrService.java similarity index 93% rename from src/main/java/a8k/app/service/app/appctrl/AppTubeSettingMgrService.java rename to src/main/java/a8k/app/service/mainctrl/AppTubeSettingMgrService.java index 5299c17..fa8fd86 100644 --- a/src/main/java/a8k/app/service/app/appctrl/AppTubeSettingMgrService.java +++ b/src/main/java/a8k/app/service/mainctrl/AppTubeSettingMgrService.java @@ -1,11 +1,11 @@ -package a8k.app.service.app.appctrl; +package a8k.app.service.mainctrl; import a8k.app.service.bases.AppEventBusService; -import a8k.app.service.bases.appevent.AppTubeholderSettingUpdateEvent; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.type.exception.AppException; -import a8k.app.type.tube_setting.TubeSetting; -import a8k.app.type.tube_setting.TubeHolderSetting; +import a8k.app.a8ktype.appevent.AppTubeholderSettingUpdateEvent; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.a8ktype.exception.AppException; +import a8k.app.a8ktype.ui.TubeSetting; +import a8k.app.a8ktype.ui.TubeHolderSetting; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import cn.hutool.core.util.ObjectUtil; import jakarta.annotation.Resource; @@ -22,7 +22,7 @@ public class AppTubeSettingMgrService { @Resource - GStateService gState; + GStateMgrService gState; @Resource AppEventBusService ebus; diff --git a/src/main/java/a8k/app/service/app/erroranalyzer/ErrorAnalyzer.java b/src/main/java/a8k/app/service/mainctrl/erroranalyzer/ErrorAnalyzer.java similarity index 90% rename from src/main/java/a8k/app/service/app/erroranalyzer/ErrorAnalyzer.java rename to src/main/java/a8k/app/service/mainctrl/erroranalyzer/ErrorAnalyzer.java index f1eb145..bc4c7ed 100644 --- a/src/main/java/a8k/app/service/app/erroranalyzer/ErrorAnalyzer.java +++ b/src/main/java/a8k/app/service/mainctrl/erroranalyzer/ErrorAnalyzer.java @@ -1,7 +1,7 @@ -package a8k.app.service.app.erroranalyzer; +package a8k.app.service.mainctrl.erroranalyzer; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.app.type.ecode.AppError; +import a8k.app.a8ktype.error.AppError; import java.util.List; diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/MainFlowCtrlScheduler.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java similarity index 95% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/MainFlowCtrlScheduler.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java index 5840dcb..f357c31 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/MainFlowCtrlScheduler.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java @@ -1,17 +1,17 @@ -package a8k.app.service.app.appctrl.mainflowctrl; +package a8k.app.service.mainctrl.mainflowctrl; import a8k.OS; import a8k.SpringBootBeanUtil; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.app.service.app.appctrl.mainflowctrl.base.*; -import a8k.app.service.app.appstate.statemgr.DeviceWorkStateMgrService; -import a8k.app.service.app.appstate.type.DeviceWorkState; -import a8k.app.service.app.appstate.type.state.A8kWorkState; +import a8k.app.service.mainctrl.mainflowctrl.base.*; +import a8k.app.service.statemgr.DeviceWorkStateMgrService; +import a8k.app.a8ktype.state.DeviceWorkState; +import a8k.app.a8ktype.state.enumtype.A8kWorkState; import a8k.app.service.bases.AppEventBusService; -import a8k.app.service.bases.appevent.A8kEcodeContextListPromptEvent; -import a8k.app.type.ecode.AECodeError; -import a8k.app.type.ecode.AppError; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.appevent.A8kEcodeContextListPromptEvent; +import a8k.app.a8ktype.error.AECodeError; +import a8k.app.a8ktype.error.AppError; +import a8k.app.a8ktype.exception.AppException; import a8k.app.utils.ZList; import a8k.app.utils.ZStringUtils; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/PublicAreaResourceMgr.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/PublicAreaResourceMgr.java similarity index 84% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/PublicAreaResourceMgr.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/PublicAreaResourceMgr.java index 3bc5f96..6f6edd4 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/PublicAreaResourceMgr.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/PublicAreaResourceMgr.java @@ -1,13 +1,11 @@ -package a8k.app.service.app.appctrl.mainflowctrl; +package a8k.app.service.mainctrl.mainflowctrl; import a8k.OS; -import a8k.app.service.app.appctrl.mainflowctrl.base.PublicAreaResource; -import a8k.app.service.app.appctrl.mainflowctrl.base.A8kPublicAreaResourcePacket; +import a8k.app.service.mainctrl.mainflowctrl.base.PublicAreaResource; +import a8k.app.service.mainctrl.mainflowctrl.base.A8kPublicAreaResourcePacket; import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import java.util.Arrays; diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/DO_FINISH_TUBE_PROCESS.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/DO_FINISH_TUBE_PROCESS.java similarity index 75% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/DO_FINISH_TUBE_PROCESS.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/DO_FINISH_TUBE_PROCESS.java index 0b02d98..923f370 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/DO_FINISH_TUBE_PROCESS.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/DO_FINISH_TUBE_PROCESS.java @@ -1,21 +1,21 @@ -package a8k.app.service.app.appctrl.mainflowctrl.action; +package a8k.app.service.mainctrl.mainflowctrl.action; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.app.service.app.appctrl.mainflowctrl.PublicAreaResourceMgr; -import a8k.app.service.app.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.app.service.app.appctrl.mainflowctrl.base.PublicAreaResource; -import a8k.app.service.app.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.app.service.app.appctrl.mainflowctrl.base.MainFlowProcesser; -import a8k.app.service.app.appstate.statemgr.DeviceWorkStateMgrService; -import a8k.app.service.app.appstate.statemgr.TubeStateMgrService; -import a8k.app.service.app.appstate.type.Tube; -import a8k.app.service.app.appstate.type.state.TubeState; -import a8k.app.service.app.driver.ctrlservice.HbotMoveExCtrlService; -import a8k.app.service.app.driver.ctrlservice.TubePreProcesModuleExCtrlService; -import a8k.app.service.app.erroranalyzer.ErrorAnalyzer; +import a8k.app.service.mainctrl.mainflowctrl.PublicAreaResourceMgr; +import a8k.app.service.mainctrl.mainflowctrl.base.A8kActionStepType; +import a8k.app.service.mainctrl.mainflowctrl.base.PublicAreaResource; +import a8k.app.service.mainctrl.mainflowctrl.base.A8kStepAction; +import a8k.app.service.mainctrl.mainflowctrl.base.MainFlowProcesser; +import a8k.app.service.statemgr.DeviceWorkStateMgrService; +import a8k.app.service.statemgr.TubeStateMgrService; +import a8k.app.a8ktype.state.Tube; +import a8k.app.a8ktype.state.enumtype.TubeState; +import a8k.app.service.lowerctrl.HbotMoveExCtrlService; +import a8k.app.service.lowerctrl.TubePreProcesModuleExCtrlService; +import a8k.app.service.mainctrl.erroranalyzer.ErrorAnalyzer; import a8k.extui.service.test.state.VirtualDevice; -import a8k.app.type.ecode.AppError; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.error.AppError; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_PLATE.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/DO_PROCESS_ERROR_PLATE.java similarity index 72% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_PLATE.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/DO_PROCESS_ERROR_PLATE.java index f6fbf66..d89c68f 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_PLATE.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/DO_PROCESS_ERROR_PLATE.java @@ -1,20 +1,20 @@ -package a8k.app.service.app.appctrl.mainflowctrl.action; - -import a8k.app.service.app.appctrl.mainflowctrl.PublicAreaResourceMgr; -import a8k.app.service.app.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.app.service.app.appctrl.mainflowctrl.base.PublicAreaResource; -import a8k.app.service.app.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.app.service.app.appctrl.mainflowctrl.base.MainFlowProcesser; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.service.app.appstate.statemgr.IncubationPlateStateMgrService; -import a8k.app.service.app.appstate.statemgr.OptScanModuleStateMgrService; -import a8k.app.service.app.appstate.statemgr.ProjectContextMgrService; -import a8k.app.service.app.appstate.type.IncubationSubTank; -import a8k.app.service.app.driver.ctrlservice.OptScanModuleCtrlService; +package a8k.app.service.mainctrl.mainflowctrl.action; + +import a8k.app.service.mainctrl.mainflowctrl.PublicAreaResourceMgr; +import a8k.app.service.mainctrl.mainflowctrl.base.A8kActionStepType; +import a8k.app.service.mainctrl.mainflowctrl.base.PublicAreaResource; +import a8k.app.service.mainctrl.mainflowctrl.base.A8kStepAction; +import a8k.app.service.mainctrl.mainflowctrl.base.MainFlowProcesser; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.service.statemgr.IncubationPlateStateMgrService; +import a8k.app.service.statemgr.OptScanModuleStateMgrService; +import a8k.app.service.statemgr.ProjectContextMgrService; +import a8k.app.a8ktype.state.IncubationSubTank; +import a8k.app.service.lowerctrl.OptScanModuleCtrlService; import a8k.extui.service.test.state.TestModeState; import a8k.extui.service.test.state.VirtualDevice; -import a8k.app.type.ecode.AppError; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.error.AppError; +import a8k.app.a8ktype.exception.AppException; import a8k.app.utils.ZList; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; @@ -36,9 +36,9 @@ public class DO_PROCESS_ERROR_PLATE extends A8kStepAction { } @Resource - GStateService gstate; + GStateMgrService gstate; @Resource - TestModeState testModeState; + TestModeState testModeState; @Resource VirtualDevice virtualDevice; diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/PLATE_OPT_SCAN.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/PLATE_OPT_SCAN.java similarity index 79% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/PLATE_OPT_SCAN.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/PLATE_OPT_SCAN.java index 565f2f8..e939b72 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/PLATE_OPT_SCAN.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/PLATE_OPT_SCAN.java @@ -1,25 +1,25 @@ -package a8k.app.service.app.appctrl.mainflowctrl.action; +package a8k.app.service.mainctrl.mainflowctrl.action; import a8k.app.a8kproj.A8kReactionResultComputer; import a8k.app.a8kproj.optalgo.type.OptScanResult; -import a8k.app.service.app.appctrl.mainflowctrl.PublicAreaResourceMgr; -import a8k.app.service.app.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.app.service.app.appctrl.mainflowctrl.base.PublicAreaResource; -import a8k.app.service.app.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.app.service.app.appctrl.mainflowctrl.base.MainFlowProcesser; -import a8k.app.service.app.appdata.ReactionRecordMgrService; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.service.app.appstate.statemgr.OptScanModuleStateMgrService; -import a8k.app.service.app.appstate.statemgr.ProjectContextMgrService; -import a8k.app.service.app.appstate.type.ProjectTaskContext; -import a8k.app.service.app.driver.ctrlservice.OptScanModuleCtrlService; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kOptType; +import a8k.app.service.mainctrl.mainflowctrl.PublicAreaResourceMgr; +import a8k.app.service.mainctrl.mainflowctrl.base.A8kActionStepType; +import a8k.app.service.mainctrl.mainflowctrl.base.PublicAreaResource; +import a8k.app.service.mainctrl.mainflowctrl.base.A8kStepAction; +import a8k.app.service.mainctrl.mainflowctrl.base.MainFlowProcesser; +import a8k.app.service.data.ReactionRecordMgrService; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.service.statemgr.OptScanModuleStateMgrService; +import a8k.app.service.statemgr.ProjectContextMgrService; +import a8k.app.a8ktype.state.ProjectTaskContext; +import a8k.app.service.lowerctrl.OptScanModuleCtrlService; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kOptType; import a8k.extui.service.test.state.TestModeState; import a8k.extui.service.test.state.VirtualDevice; import a8k.extui.service.test.utils.FakeReactionResultFactory; -import a8k.app.type.ReactionResult; -import a8k.app.type.ecode.AppError; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.type.ReactionResult; +import a8k.app.a8ktype.error.AppError; +import a8k.app.a8ktype.exception.AppException; import a8k.app.utils.ProjInfoUtils; import a8k.app.utils.ZList; import jakarta.annotation.Resource; @@ -45,9 +45,9 @@ public class PLATE_OPT_SCAN extends A8kStepAction { } @Resource - GStateService gstate; + GStateMgrService gstate; @Resource - TestModeState testModeState; + TestModeState testModeState; @Resource VirtualDevice virtualDevice; diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java similarity index 74% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java index a3beab5..2b46050 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/PROCESS_INCUBATE_COMPLETED_PLATE.java @@ -1,19 +1,19 @@ -package a8k.app.service.app.appctrl.mainflowctrl.action; - -import a8k.app.service.app.appctrl.mainflowctrl.PublicAreaResourceMgr; -import a8k.app.service.app.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.app.service.app.appctrl.mainflowctrl.base.PublicAreaResource; -import a8k.app.service.app.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.app.service.app.appctrl.mainflowctrl.base.MainFlowProcesser; -import a8k.app.service.app.appstate.statemgr.IncubationPlateStateMgrService; -import a8k.app.service.app.appstate.statemgr.OptScanModuleStateMgrService; -import a8k.app.service.app.appstate.statemgr.ProjectContextMgrService; -import a8k.app.service.app.appstate.type.IncubationSubTank; -import a8k.app.service.app.appstate.type.ProjectTaskContext; -import a8k.app.service.app.driver.ctrlservice.OptScanModuleCtrlService; +package a8k.app.service.mainctrl.mainflowctrl.action; + +import a8k.app.service.mainctrl.mainflowctrl.PublicAreaResourceMgr; +import a8k.app.service.mainctrl.mainflowctrl.base.A8kActionStepType; +import a8k.app.service.mainctrl.mainflowctrl.base.PublicAreaResource; +import a8k.app.service.mainctrl.mainflowctrl.base.A8kStepAction; +import a8k.app.service.mainctrl.mainflowctrl.base.MainFlowProcesser; +import a8k.app.service.statemgr.IncubationPlateStateMgrService; +import a8k.app.service.statemgr.OptScanModuleStateMgrService; +import a8k.app.service.statemgr.ProjectContextMgrService; +import a8k.app.a8ktype.state.IncubationSubTank; +import a8k.app.a8ktype.state.ProjectTaskContext; +import a8k.app.service.lowerctrl.OptScanModuleCtrlService; import a8k.extui.service.test.state.VirtualDevice; -import a8k.app.type.ecode.AppError; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.error.AppError; +import a8k.app.a8ktype.exception.AppException; import a8k.app.utils.ProjInfoUtils; import jakarta.annotation.Resource; import org.slf4j.Logger; diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java similarity index 86% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java index 9ba99c7..548f087 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java @@ -1,32 +1,32 @@ -package a8k.app.service.app.appctrl.mainflowctrl.action; +package a8k.app.service.mainctrl.mainflowctrl.action; -import a8k.app.hardware.A8kCanBusService; +import a8k.app.hardware.basedriver.A8kCanBusService; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.hardware.type.a8kcanprotocol.IOId; -import a8k.app.service.app.appctrl.AppTubeSettingMgrService; -import a8k.app.service.app.appctrl.mainflowctrl.PublicAreaResourceMgr; -import a8k.app.service.app.appctrl.mainflowctrl.base.*; -import a8k.app.service.app.appdata.ProjInfoMgrService; -import a8k.app.service.app.appstate.statemgr.ProjectContextMgrService; - - -import a8k.app.service.app.appstate.statemgr.TubeStateMgrService; -import a8k.app.service.app.appstate.type.Tube; -import a8k.app.service.app.appstate.type.TubeHolder; -import a8k.app.service.app.appstate.type.state.TubeHolderState; -import a8k.app.service.app.appstate.type.state.TubeState; -import a8k.app.service.app.driver.ctrlservice.TubeFeedingCtrlService; +import a8k.app.service.mainctrl.AppTubeSettingMgrService; +import a8k.app.service.mainctrl.mainflowctrl.PublicAreaResourceMgr; +import a8k.app.service.mainctrl.mainflowctrl.base.*; +import a8k.app.service.data.ProjInfoMgrService; +import a8k.app.service.statemgr.ProjectContextMgrService; + + +import a8k.app.service.statemgr.TubeStateMgrService; +import a8k.app.a8ktype.state.Tube; +import a8k.app.a8ktype.state.TubeHolder; +import a8k.app.a8ktype.state.enumtype.TubeHolderState; +import a8k.app.a8ktype.state.enumtype.TubeState; +import a8k.app.service.lowerctrl.TubeFeedingCtrlService; import a8k.app.service.bases.AppEventBusService; -import a8k.app.service.bases.appevent.AppWarningNotifyEvent; +import a8k.app.a8ktype.appevent.AppWarningNotifyEvent; import a8k.extui.service.test.state.TestModeState; import a8k.extui.service.test.state.VirtualDevice; -import a8k.app.type.TubeHolderScanResult; -import a8k.app.type.ecode.AETubeError; -import a8k.app.type.ecode.AppError; -import a8k.app.type.exception.AppException; -import a8k.app.type.tube_setting.TubeHolderSetting; -import a8k.app.type.type.A8kTubeHolderType; -import a8k.app.type.type.BloodType; +import a8k.app.a8ktype.type.TubeHolderScanResult; +import a8k.app.a8ktype.error.AETubeError; +import a8k.app.a8ktype.error.AppError; +import a8k.app.a8ktype.exception.AppException; +import a8k.app.a8ktype.ui.TubeHolderSetting; +import a8k.app.a8ktype.device.A8kTubeHolderType; +import a8k.app.a8ktype.device.BloodType; import a8k.app.utils.*; import jakarta.annotation.Resource; import org.slf4j.Logger; diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java similarity index 82% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java index 70638b7..2cb7757 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java @@ -1,15 +1,15 @@ -package a8k.app.service.app.appctrl.mainflowctrl.action; - -import a8k.app.service.app.appctrl.mainflowctrl.PublicAreaResourceMgr; -import a8k.app.service.app.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.app.service.app.appctrl.mainflowctrl.base.PublicAreaResource; -import a8k.app.service.app.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.app.service.app.appctrl.mainflowctrl.base.MainFlowProcesser; -import a8k.app.service.app.appstate.statemgr.TubeStateMgrService; -import a8k.app.service.app.driver.ctrlservice.TubeFeedingCtrlService; +package a8k.app.service.mainctrl.mainflowctrl.action; + +import a8k.app.service.mainctrl.mainflowctrl.PublicAreaResourceMgr; +import a8k.app.service.mainctrl.mainflowctrl.base.A8kActionStepType; +import a8k.app.service.mainctrl.mainflowctrl.base.PublicAreaResource; +import a8k.app.service.mainctrl.mainflowctrl.base.A8kStepAction; +import a8k.app.service.mainctrl.mainflowctrl.base.MainFlowProcesser; +import a8k.app.service.statemgr.TubeStateMgrService; +import a8k.app.service.lowerctrl.TubeFeedingCtrlService; import a8k.extui.service.test.state.VirtualDevice; -import a8k.app.type.ecode.AppError; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.error.AppError; +import a8k.app.a8ktype.exception.AppException; import a8k.app.utils.ZList; import jakarta.annotation.Resource; import org.slf4j.Logger; diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java similarity index 87% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java index 486766b..f02b5fa 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java @@ -1,22 +1,22 @@ -package a8k.app.service.app.appctrl.mainflowctrl.action; +package a8k.app.service.mainctrl.mainflowctrl.action; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.app.service.app.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.app.service.app.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.app.service.app.appctrl.mainflowctrl.base.MainFlowProcesser; -import a8k.app.service.app.appdata.ProjInfoMgrService; -import a8k.app.service.app.appstate.statemgr.*; -import a8k.app.service.app.appstate.type.ProjectTaskContext; -import a8k.app.service.app.appstate.type.Tube; -import a8k.app.service.app.appstate.type.state.TubeState; +import a8k.app.service.mainctrl.mainflowctrl.base.A8kActionStepType; +import a8k.app.service.mainctrl.mainflowctrl.base.A8kStepAction; +import a8k.app.service.mainctrl.mainflowctrl.base.MainFlowProcesser; +import a8k.app.service.data.ProjInfoMgrService; +import a8k.app.a8ktype.state.ProjectTaskContext; +import a8k.app.a8ktype.state.Tube; +import a8k.app.a8ktype.state.enumtype.TubeState; import a8k.app.service.bases.AppEventBusService; -import a8k.app.service.bases.appevent.A8kErrorsPromptEvent; -import a8k.app.service.dao.type.ProjExtInfoCard; +import a8k.app.a8ktype.appevent.A8kErrorsPromptEvent; +import a8k.app.dao.db.type.ProjExtInfoCard; import a8k.app.a8ktype.device.IncubatorPos; -import a8k.app.type.ecode.AEConsumeNotEnoughError; -import a8k.app.type.ecode.AppError; -import a8k.app.type.pos.Consumable; -import a8k.app.type.pos.TipPos; +import a8k.app.a8ktype.error.AEConsumeNotEnoughError; +import a8k.app.a8ktype.error.AppError; +import a8k.app.a8ktype.device.Consumable; +import a8k.app.a8ktype.device.TipPos; +import a8k.app.service.statemgr.*; import a8k.app.utils.ZJsonHelper; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/SEQ5_PROCESS.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/SEQ5_PROCESS.java similarity index 91% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/SEQ5_PROCESS.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/SEQ5_PROCESS.java index f9286fb..7969c59 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/SEQ5_PROCESS.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/SEQ5_PROCESS.java @@ -1,38 +1,38 @@ -package a8k.app.service.app.appctrl.mainflowctrl.action; +package a8k.app.service.mainctrl.mainflowctrl.action; import a8k.OS; -import a8k.app.service.app.appctrl.mainflowctrl.PublicAreaResourceMgr; -import a8k.app.service.app.appctrl.mainflowctrl.base.*; -import a8k.app.service.app.appstate.statemgr.IncubationPlateStateMgrService; -import a8k.app.service.app.appstate.statemgr.ProjectContextMgrService; -import a8k.app.service.app.appstate.statemgr.TubeStateMgrService; -import a8k.app.service.app.appstate.type.ProjectTaskContext; -import a8k.app.service.app.appstate.type.Tube; -import a8k.app.service.app.appstate.type.TubeHolder; -import a8k.app.service.app.appstate.type.state.TubeState; -import a8k.app.service.app.driver.ctrlservice.HbotMoveExCtrlService; -import a8k.app.service.app.driver.ctrlservice.PlateBoxCtrlService; -import a8k.app.service.app.driver.ctrlservice.TubePreProcesModuleExCtrlService; -import a8k.app.service.app.driver.ctrlservice.TurnableMoveCtrlService; -import a8k.app.service.app.driver.base.PipetteCtrlDriver; -import a8k.app.service.app.driver.ctrlservice.HbotMoveCtrlService; -import a8k.app.service.param.exmgr.HbotConsumableParamMgr; -import a8k.app.service.param.exmgr.PipetteGunParamExMgr; -import a8k.app.service.param.mgr.HbotFixedPosParamMgr; -import a8k.app.service.param.mgr.HbotSamplePosParamMgr; +import a8k.app.service.mainctrl.mainflowctrl.PublicAreaResourceMgr; +import a8k.app.service.mainctrl.mainflowctrl.base.*; +import a8k.app.service.statemgr.IncubationPlateStateMgrService; +import a8k.app.service.statemgr.ProjectContextMgrService; +import a8k.app.service.statemgr.TubeStateMgrService; +import a8k.app.a8ktype.state.ProjectTaskContext; +import a8k.app.a8ktype.state.Tube; +import a8k.app.a8ktype.state.TubeHolder; +import a8k.app.a8ktype.state.enumtype.TubeState; +import a8k.app.service.lowerctrl.HbotMoveExCtrlService; +import a8k.app.service.lowerctrl.PlateBoxCtrlService; +import a8k.app.service.lowerctrl.TubePreProcesModuleExCtrlService; +import a8k.app.service.lowerctrl.TurnableMoveCtrlService; +import a8k.app.hardware.driver.PipetteCtrlDriver; +import a8k.app.service.lowerctrl.HbotMoveCtrlService; +import a8k.app.dao.exparam.HbotConsumableParamMgr; +import a8k.app.dao.exparam.PipetteGunParamExMgr; +import a8k.app.service.param.HbotFixedPosParamMgr; +import a8k.app.service.param.HbotSamplePosParamMgr; import a8k.app.a8ktype.param.A8kSamplePos; -import a8k.app.service.app.erroranalyzer.ErrorAnalyzer; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kReactionFlowType; +import a8k.app.service.mainctrl.erroranalyzer.ErrorAnalyzer; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kReactionFlowType; import a8k.extui.service.test.state.TestModeState; import a8k.extui.service.test.state.VirtualDevice; import a8k.app.a8ktype.device.ConsumableGroup; import a8k.app.a8ktype.device.IncubatorPos; -import a8k.app.type.ecode.AECodeError; -import a8k.app.type.ecode.AppError; -import a8k.app.type.exception.AppException; -import a8k.app.type.exception.ZAppInterruptException; -import a8k.app.type.pos.Consumable; -import a8k.app.type.type.A8kTubeHolderType; +import a8k.app.a8ktype.error.AECodeError; +import a8k.app.a8ktype.error.AppError; +import a8k.app.a8ktype.exception.AppException; +import a8k.app.a8ktype.exception.ZAppInterruptException; +import a8k.app.a8ktype.device.Consumable; +import a8k.app.a8ktype.device.A8kTubeHolderType; import a8k.app.utils.ProjInfoUtils; import a8k.app.utils.ProjProcessContextUtils; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/SEQ7_EJECT_TUBEHOLDER.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/SEQ7_EJECT_TUBEHOLDER.java similarity index 73% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/SEQ7_EJECT_TUBEHOLDER.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/SEQ7_EJECT_TUBEHOLDER.java index 8516386..66d916b 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/action/SEQ7_EJECT_TUBEHOLDER.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/SEQ7_EJECT_TUBEHOLDER.java @@ -1,17 +1,17 @@ -package a8k.app.service.app.appctrl.mainflowctrl.action; +package a8k.app.service.mainctrl.mainflowctrl.action; -import a8k.app.service.app.appctrl.mainflowctrl.PublicAreaResourceMgr; -import a8k.app.service.app.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.app.service.app.appctrl.mainflowctrl.base.PublicAreaResource; -import a8k.app.service.app.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.app.service.app.appctrl.mainflowctrl.base.MainFlowProcesser; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.service.app.appstate.statemgr.TubeStateMgrService; -import a8k.app.service.app.driver.ctrlservice.TubeFeedingCtrlService; +import a8k.app.service.mainctrl.mainflowctrl.PublicAreaResourceMgr; +import a8k.app.service.mainctrl.mainflowctrl.base.A8kActionStepType; +import a8k.app.service.mainctrl.mainflowctrl.base.PublicAreaResource; +import a8k.app.service.mainctrl.mainflowctrl.base.A8kStepAction; +import a8k.app.service.mainctrl.mainflowctrl.base.MainFlowProcesser; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.service.statemgr.TubeStateMgrService; +import a8k.app.service.lowerctrl.TubeFeedingCtrlService; import a8k.extui.service.test.state.TestModeState; import a8k.extui.service.test.state.VirtualDevice; -import a8k.app.type.ecode.AppError; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.error.AppError; +import a8k.app.a8ktype.exception.AppException; import a8k.app.utils.ZList; import jakarta.annotation.Resource; import org.slf4j.Logger; @@ -43,9 +43,9 @@ public class SEQ7_EJECT_TUBEHOLDER extends A8kStepAction { } @Resource - GStateService gstate; + GStateMgrService gstate; @Resource - TestModeState testModeState; + TestModeState testModeState; @Resource VirtualDevice virtualDevice; diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/A8kActionStepType.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/A8kActionStepType.java similarity index 92% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/A8kActionStepType.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/A8kActionStepType.java index 9dd3c58..51972e5 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/A8kActionStepType.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/A8kActionStepType.java @@ -1,4 +1,4 @@ -package a8k.app.service.app.appctrl.mainflowctrl.base; +package a8k.app.service.mainctrl.mainflowctrl.base; public enum A8kActionStepType { DO_START,//启动 diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/A8kPublicAreaResourcePacket.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/A8kPublicAreaResourcePacket.java similarity index 85% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/A8kPublicAreaResourcePacket.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/A8kPublicAreaResourcePacket.java index 00ee4b7..75b0ad7 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/A8kPublicAreaResourcePacket.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/A8kPublicAreaResourcePacket.java @@ -1,4 +1,4 @@ -package a8k.app.service.app.appctrl.mainflowctrl.base; +package a8k.app.service.mainctrl.mainflowctrl.base; import java.util.List; diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/A8kStepAction.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/A8kStepAction.java similarity index 91% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/A8kStepAction.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/A8kStepAction.java index 89375f7..82eb9a5 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/A8kStepAction.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/A8kStepAction.java @@ -1,7 +1,7 @@ -package a8k.app.service.app.appctrl.mainflowctrl.base; +package a8k.app.service.mainctrl.mainflowctrl.base; -import a8k.app.type.ecode.AppError; +import a8k.app.a8ktype.error.AppError; import lombok.Data; import java.util.ArrayList; diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/ActionDoUtils.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/ActionDoUtils.java similarity index 73% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/ActionDoUtils.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/ActionDoUtils.java index 3689de3..887e626 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/ActionDoUtils.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/ActionDoUtils.java @@ -1,7 +1,7 @@ -package a8k.app.service.app.appctrl.mainflowctrl.base; +package a8k.app.service.mainctrl.mainflowctrl.base; -import a8k.app.type.ecode.AppError; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.error.AppError; +import a8k.app.a8ktype.exception.AppException; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/AppActionErrorContext.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/AppActionErrorContext.java similarity index 89% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/AppActionErrorContext.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/AppActionErrorContext.java index faaa3f5..e90d3ef 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/AppActionErrorContext.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/AppActionErrorContext.java @@ -1,6 +1,6 @@ -package a8k.app.service.app.appctrl.mainflowctrl.base; +package a8k.app.service.mainctrl.mainflowctrl.base; -import a8k.app.type.ecode.AppError; +import a8k.app.a8ktype.error.AppError; import java.util.List; diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/BoolCondition.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/BoolCondition.java similarity index 85% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/BoolCondition.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/BoolCondition.java index a9dccd8..3138d65 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/BoolCondition.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/BoolCondition.java @@ -1,7 +1,7 @@ -package a8k.app.service.app.appctrl.mainflowctrl.base; +package a8k.app.service.mainctrl.mainflowctrl.base; import a8k.OS; -import a8k.app.type.exception.ZAppInterruptException; +import a8k.app.a8ktype.exception.ZAppInterruptException; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/IMainFlowStateChangeProcesser.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/IMainFlowStateChangeProcesser.java similarity index 67% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/IMainFlowStateChangeProcesser.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/IMainFlowStateChangeProcesser.java index 4d977f5..51e2f6b 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/IMainFlowStateChangeProcesser.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/IMainFlowStateChangeProcesser.java @@ -1,6 +1,6 @@ -package a8k.app.service.app.appctrl.mainflowctrl.base; +package a8k.app.service.mainctrl.mainflowctrl.base; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.exception.AppException; public interface IMainFlowStateChangeProcesser { diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/MainFlowProcesser.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/MainFlowProcesser.java similarity index 82% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/MainFlowProcesser.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/MainFlowProcesser.java index 049dce8..f499e3a 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/MainFlowProcesser.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/MainFlowProcesser.java @@ -1,4 +1,4 @@ -package a8k.app.service.app.appctrl.mainflowctrl.base; +package a8k.app.service.mainctrl.mainflowctrl.base; import java.lang.annotation.ElementType; diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/PublicAreaResource.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/PublicAreaResource.java similarity index 97% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/PublicAreaResource.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/PublicAreaResource.java index ad431b9..6ee5a67 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/base/PublicAreaResource.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/PublicAreaResource.java @@ -1,4 +1,4 @@ -package a8k.app.service.app.appctrl.mainflowctrl.base; +package a8k.app.service.mainctrl.mainflowctrl.base; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/processer/MainFlowStateChangeProcesser.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/processer/MainFlowStateChangeProcesser.java similarity index 68% rename from src/main/java/a8k/app/service/app/appctrl/mainflowctrl/processer/MainFlowStateChangeProcesser.java rename to src/main/java/a8k/app/service/mainctrl/mainflowctrl/processer/MainFlowStateChangeProcesser.java index bce9e31..92d75d9 100644 --- a/src/main/java/a8k/app/service/app/appctrl/mainflowctrl/processer/MainFlowStateChangeProcesser.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/processer/MainFlowStateChangeProcesser.java @@ -1,17 +1,17 @@ -package a8k.app.service.app.appctrl.mainflowctrl.processer; +package a8k.app.service.mainctrl.mainflowctrl.processer; -import a8k.app.service.app.appctrl.mainflowctrl.base.IMainFlowStateChangeProcesser; -import a8k.app.service.app.appctrl.mainflowctrl.base.MainFlowProcesser; -import a8k.app.service.app.appstate.statemgr.IncubationPlateStateMgrService; -import a8k.app.service.app.appstate.statemgr.ProjectContextMgrService; -import a8k.app.service.app.appstate.statemgr.TubeStateMgrService; -import a8k.app.service.app.appstate.type.IncubationSubTank; -import a8k.app.service.app.appstate.type.state.IncubationSubTankState; -import a8k.app.service.app.driver.ctrlservice.HbotMoveExCtrlService; -import a8k.app.service.app.driver.ctrlservice.OptScanModuleCtrlService; -import a8k.app.service.app.driver.ctrlservice.TubeFeedingCtrlService; +import a8k.app.service.mainctrl.mainflowctrl.base.IMainFlowStateChangeProcesser; +import a8k.app.service.mainctrl.mainflowctrl.base.MainFlowProcesser; +import a8k.app.service.statemgr.IncubationPlateStateMgrService; +import a8k.app.service.statemgr.ProjectContextMgrService; +import a8k.app.service.statemgr.TubeStateMgrService; +import a8k.app.a8ktype.state.IncubationSubTank; +import a8k.app.a8ktype.state.enumtype.IncubationSubTankState; +import a8k.app.service.lowerctrl.HbotMoveExCtrlService; +import a8k.app.service.lowerctrl.OptScanModuleCtrlService; +import a8k.app.service.lowerctrl.TubeFeedingCtrlService; import a8k.extui.service.test.state.VirtualDevice; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/param/mgr/Hbot2DCodeScanParamMgr.java b/src/main/java/a8k/app/service/param/Hbot2DCodeScanParamMgr.java similarity index 95% rename from src/main/java/a8k/app/service/param/mgr/Hbot2DCodeScanParamMgr.java rename to src/main/java/a8k/app/service/param/Hbot2DCodeScanParamMgr.java index c4e0508..5183856 100644 --- a/src/main/java/a8k/app/service/param/mgr/Hbot2DCodeScanParamMgr.java +++ b/src/main/java/a8k/app/service/param/Hbot2DCodeScanParamMgr.java @@ -1,8 +1,8 @@ -package a8k.app.service.param.mgr; +package a8k.app.service.param; -import a8k.app.service.param.mgr.base.ParamMgr; +import a8k.app.service.param.base.ParamMgr; import a8k.app.a8ktype.param.Hbot2DCodeScanPos; -import a8k.app.type.cfg.Pos2d; +import a8k.app.a8ktype.device.Pos2d; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/app/service/param/mgr/HbotFixedPosParamMgr.java b/src/main/java/a8k/app/service/param/HbotFixedPosParamMgr.java similarity index 88% rename from src/main/java/a8k/app/service/param/mgr/HbotFixedPosParamMgr.java rename to src/main/java/a8k/app/service/param/HbotFixedPosParamMgr.java index 4e31f71..3bdba8d 100644 --- a/src/main/java/a8k/app/service/param/mgr/HbotFixedPosParamMgr.java +++ b/src/main/java/a8k/app/service/param/HbotFixedPosParamMgr.java @@ -1,7 +1,7 @@ -package a8k.app.service.param.mgr; +package a8k.app.service.param; -import a8k.app.service.param.mgr.base.ParamMgr; -import a8k.app.type.cfg.Pos3d; +import a8k.app.service.param.base.ParamMgr; +import a8k.app.a8ktype.device.Pos3d; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/app/service/param/mgr/HbotLargeBottleBSPosMgr.java b/src/main/java/a8k/app/service/param/HbotLargeBottleBSPosMgr.java similarity index 93% rename from src/main/java/a8k/app/service/param/mgr/HbotLargeBottleBSPosMgr.java rename to src/main/java/a8k/app/service/param/HbotLargeBottleBSPosMgr.java index adde500..37c872a 100644 --- a/src/main/java/a8k/app/service/param/mgr/HbotLargeBottleBSPosMgr.java +++ b/src/main/java/a8k/app/service/param/HbotLargeBottleBSPosMgr.java @@ -1,10 +1,10 @@ -package a8k.app.service.param.mgr; +package a8k.app.service.param; import a8k.app.a8ktype.device.ConsumableGroup; -import a8k.app.service.param.mgr.base.ParamMgr; +import a8k.app.service.param.base.ParamMgr; import a8k.app.a8ktype.param.HbotLargeBottleBSPos; -import a8k.app.type.cfg.Pos2d; -import a8k.app.type.cfg.Pos3d; +import a8k.app.a8ktype.device.Pos2d; +import a8k.app.a8ktype.device.Pos3d; import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/param/mgr/HbotLittleBSPosMgr.java b/src/main/java/a8k/app/service/param/HbotLittleBSPosMgr.java similarity index 93% rename from src/main/java/a8k/app/service/param/mgr/HbotLittleBSPosMgr.java rename to src/main/java/a8k/app/service/param/HbotLittleBSPosMgr.java index c10ac10..68eccba 100644 --- a/src/main/java/a8k/app/service/param/mgr/HbotLittleBSPosMgr.java +++ b/src/main/java/a8k/app/service/param/HbotLittleBSPosMgr.java @@ -1,10 +1,10 @@ -package a8k.app.service.param.mgr; +package a8k.app.service.param; import a8k.app.a8ktype.device.ConsumableGroup; -import a8k.app.service.param.mgr.base.ParamMgr; +import a8k.app.service.param.base.ParamMgr; import a8k.app.a8ktype.param.HbotLittleBSPos; -import a8k.app.type.cfg.Pos2d; -import a8k.app.type.cfg.Pos3d; +import a8k.app.a8ktype.device.Pos2d; +import a8k.app.a8ktype.device.Pos3d; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/app/service/param/mgr/HbotProbeSubstancePosMgr.java b/src/main/java/a8k/app/service/param/HbotProbeSubstancePosMgr.java similarity index 94% rename from src/main/java/a8k/app/service/param/mgr/HbotProbeSubstancePosMgr.java rename to src/main/java/a8k/app/service/param/HbotProbeSubstancePosMgr.java index 3e683b6..0f88012 100644 --- a/src/main/java/a8k/app/service/param/mgr/HbotProbeSubstancePosMgr.java +++ b/src/main/java/a8k/app/service/param/HbotProbeSubstancePosMgr.java @@ -1,10 +1,10 @@ -package a8k.app.service.param.mgr; +package a8k.app.service.param; -import a8k.app.service.param.mgr.base.ParamMgr; +import a8k.app.service.param.base.ParamMgr; import a8k.app.a8ktype.param.HbotProbeSubstancePos; import a8k.app.a8ktype.device.ConsumableGroup; -import a8k.app.type.cfg.Pos2d; -import a8k.app.type.cfg.Pos3d; +import a8k.app.a8ktype.device.Pos2d; +import a8k.app.a8ktype.device.Pos3d; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/app/service/param/mgr/HbotSamplePosParamMgr.java b/src/main/java/a8k/app/service/param/HbotSamplePosParamMgr.java similarity index 95% rename from src/main/java/a8k/app/service/param/mgr/HbotSamplePosParamMgr.java rename to src/main/java/a8k/app/service/param/HbotSamplePosParamMgr.java index 1bd5750..7bb7b47 100644 --- a/src/main/java/a8k/app/service/param/mgr/HbotSamplePosParamMgr.java +++ b/src/main/java/a8k/app/service/param/HbotSamplePosParamMgr.java @@ -1,9 +1,9 @@ -package a8k.app.service.param.mgr; +package a8k.app.service.param; -import a8k.app.service.param.mgr.base.ParamMgr; +import a8k.app.service.param.base.ParamMgr; import a8k.app.a8ktype.param.A8kSamplePos; import a8k.app.a8ktype.param.HbotSamplePos; -import a8k.app.type.cfg.Pos3d; +import a8k.app.a8ktype.device.Pos3d; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/app/service/param/mgr/HbotTipPosMgr.java b/src/main/java/a8k/app/service/param/HbotTipPosMgr.java similarity index 96% rename from src/main/java/a8k/app/service/param/mgr/HbotTipPosMgr.java rename to src/main/java/a8k/app/service/param/HbotTipPosMgr.java index be2dd23..e3f4073 100644 --- a/src/main/java/a8k/app/service/param/mgr/HbotTipPosMgr.java +++ b/src/main/java/a8k/app/service/param/HbotTipPosMgr.java @@ -1,10 +1,10 @@ -package a8k.app.service.param.mgr; +package a8k.app.service.param; import a8k.app.constant.AppConstant; -import a8k.app.service.param.mgr.base.ParamMgr; +import a8k.app.service.param.base.ParamMgr; import a8k.app.a8ktype.param.HbotTipPosParam; -import a8k.app.type.TipPosConfig; -import a8k.app.type.cfg.Pos3d; +import a8k.app.a8ktype.type.TipPosConfig; +import a8k.app.a8ktype.device.Pos3d; import a8k.app.a8ktype.device.TipGroup; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; diff --git a/src/main/java/a8k/app/service/param/mgr/OptModuleExtParamsMgr.java b/src/main/java/a8k/app/service/param/OptModuleExtParamsMgr.java similarity index 93% rename from src/main/java/a8k/app/service/param/mgr/OptModuleExtParamsMgr.java rename to src/main/java/a8k/app/service/param/OptModuleExtParamsMgr.java index d62c50f..144e4c0 100644 --- a/src/main/java/a8k/app/service/param/mgr/OptModuleExtParamsMgr.java +++ b/src/main/java/a8k/app/service/param/OptModuleExtParamsMgr.java @@ -1,9 +1,9 @@ -package a8k.app.service.param.mgr; +package a8k.app.service.param; -import a8k.app.service.param.mgr.base.ParamMgr; +import a8k.app.service.param.base.ParamMgr; import a8k.app.a8ktype.param.OptModuleExtParam; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kOptType; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kOptType; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/app/service/param/mgr/OptModuleParamsMgr.java b/src/main/java/a8k/app/service/param/OptModuleParamsMgr.java similarity index 94% rename from src/main/java/a8k/app/service/param/mgr/OptModuleParamsMgr.java rename to src/main/java/a8k/app/service/param/OptModuleParamsMgr.java index 6518277..a6537c8 100644 --- a/src/main/java/a8k/app/service/param/mgr/OptModuleParamsMgr.java +++ b/src/main/java/a8k/app/service/param/OptModuleParamsMgr.java @@ -1,7 +1,7 @@ -package a8k.app.service.param.mgr; +package a8k.app.service.param; -import a8k.app.service.param.mgr.base.ParamMgr; +import a8k.app.service.param.base.ParamMgr; import a8k.app.a8ktype.param.OptModuleParam; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; diff --git a/src/main/java/a8k/app/service/param/mgr/PipetteGunExParamMgr.java b/src/main/java/a8k/app/service/param/PipetteGunExParamMgr.java similarity index 93% rename from src/main/java/a8k/app/service/param/mgr/PipetteGunExParamMgr.java rename to src/main/java/a8k/app/service/param/PipetteGunExParamMgr.java index 0970fa3..bf23ecb 100644 --- a/src/main/java/a8k/app/service/param/mgr/PipetteGunExParamMgr.java +++ b/src/main/java/a8k/app/service/param/PipetteGunExParamMgr.java @@ -1,6 +1,6 @@ -package a8k.app.service.param.mgr; +package a8k.app.service.param; -import a8k.app.service.param.mgr.base.ParamMgr; +import a8k.app.service.param.base.ParamMgr; import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/param/mgr/PipetteGunLLDParamMgr.java b/src/main/java/a8k/app/service/param/PipetteGunLLDParamMgr.java similarity index 93% rename from src/main/java/a8k/app/service/param/mgr/PipetteGunLLDParamMgr.java rename to src/main/java/a8k/app/service/param/PipetteGunLLDParamMgr.java index 0d17c54..7cd876c 100644 --- a/src/main/java/a8k/app/service/param/mgr/PipetteGunLLDParamMgr.java +++ b/src/main/java/a8k/app/service/param/PipetteGunLLDParamMgr.java @@ -1,7 +1,7 @@ -package a8k.app.service.param.mgr; +package a8k.app.service.param; import a8k.app.hardware.type.LldType; -import a8k.app.service.param.mgr.base.ParamMgr; +import a8k.app.service.param.base.ParamMgr; import a8k.app.a8ktype.param.PipetteGunLLDThresholdParam; import a8k.app.a8ktype.param.PipetteGunLLDTypeParam; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/app/service/param/mgr/PipetteGunLLFParamMgr.java b/src/main/java/a8k/app/service/param/PipetteGunLLFParamMgr.java similarity index 95% rename from src/main/java/a8k/app/service/param/mgr/PipetteGunLLFParamMgr.java rename to src/main/java/a8k/app/service/param/PipetteGunLLFParamMgr.java index 5827a47..d9e50d4 100644 --- a/src/main/java/a8k/app/service/param/mgr/PipetteGunLLFParamMgr.java +++ b/src/main/java/a8k/app/service/param/PipetteGunLLFParamMgr.java @@ -1,6 +1,6 @@ -package a8k.app.service.param.mgr; +package a8k.app.service.param; -import a8k.app.service.param.mgr.base.ParamMgr; +import a8k.app.service.param.base.ParamMgr; import a8k.app.a8ktype.param.A8kSamplePos; import a8k.app.a8ktype.param.PipetteGunLLFParam; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/app/service/param/mgr/PlatesBoxPosParamMgr.java b/src/main/java/a8k/app/service/param/PlatesBoxPosParamMgr.java similarity index 95% rename from src/main/java/a8k/app/service/param/mgr/PlatesBoxPosParamMgr.java rename to src/main/java/a8k/app/service/param/PlatesBoxPosParamMgr.java index e7050fe..8d961fe 100644 --- a/src/main/java/a8k/app/service/param/mgr/PlatesBoxPosParamMgr.java +++ b/src/main/java/a8k/app/service/param/PlatesBoxPosParamMgr.java @@ -1,7 +1,7 @@ -package a8k.app.service.param.mgr; +package a8k.app.service.param; -import a8k.app.service.param.mgr.base.ParamMgr; +import a8k.app.service.param.base.ParamMgr; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/app/service/param/mgr/TemperatureCtrlParamMgr.java b/src/main/java/a8k/app/service/param/TemperatureCtrlParamMgr.java similarity index 92% rename from src/main/java/a8k/app/service/param/mgr/TemperatureCtrlParamMgr.java rename to src/main/java/a8k/app/service/param/TemperatureCtrlParamMgr.java index c5aec00..d10eaca 100644 --- a/src/main/java/a8k/app/service/param/mgr/TemperatureCtrlParamMgr.java +++ b/src/main/java/a8k/app/service/param/TemperatureCtrlParamMgr.java @@ -1,6 +1,6 @@ -package a8k.app.service.param.mgr; +package a8k.app.service.param; -import a8k.app.service.param.mgr.base.ParamMgr; +import a8k.app.service.param.base.ParamMgr; import a8k.app.a8ktype.param.TemperatureCtrlParam; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; diff --git a/src/main/java/a8k/app/service/param/mgr/TubeFeedingModuleParamMgr.java b/src/main/java/a8k/app/service/param/TubeFeedingModuleParamMgr.java similarity index 94% rename from src/main/java/a8k/app/service/param/mgr/TubeFeedingModuleParamMgr.java rename to src/main/java/a8k/app/service/param/TubeFeedingModuleParamMgr.java index aef54e8..e6bc8fe 100644 --- a/src/main/java/a8k/app/service/param/mgr/TubeFeedingModuleParamMgr.java +++ b/src/main/java/a8k/app/service/param/TubeFeedingModuleParamMgr.java @@ -1,8 +1,8 @@ -package a8k.app.service.param.mgr; +package a8k.app.service.param; -import a8k.app.service.param.mgr.base.ParamMgr; -import a8k.app.type.TubeFeedingModuleSetting; -import a8k.app.type.TubeFeedingModulePos; +import a8k.app.service.param.base.ParamMgr; +import a8k.app.a8ktype.param.TubeFeedingModuleSetting; +import a8k.app.a8ktype.param.TubeFeedingModulePos; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/app/service/param/mgr/TubePreProcesPosParamMgr.java b/src/main/java/a8k/app/service/param/TubePreProcesPosParamMgr.java similarity index 93% rename from src/main/java/a8k/app/service/param/mgr/TubePreProcesPosParamMgr.java rename to src/main/java/a8k/app/service/param/TubePreProcesPosParamMgr.java index 6df2a01..d082a8a 100644 --- a/src/main/java/a8k/app/service/param/mgr/TubePreProcesPosParamMgr.java +++ b/src/main/java/a8k/app/service/param/TubePreProcesPosParamMgr.java @@ -1,9 +1,9 @@ -package a8k.app.service.param.mgr; +package a8k.app.service.param; -import a8k.app.service.param.mgr.base.ParamMgr; -import a8k.app.type.TubePreProcessGripperPos; -import a8k.app.type.TubePreProcessTubeClamp; -import a8k.app.type.TubePreProcessYPos; +import a8k.app.service.param.base.ParamMgr; +import a8k.app.a8ktype.param.TubePreProcessGripperPos; +import a8k.app.a8ktype.param.TubePreProcessTubeClamp; +import a8k.app.a8ktype.param.TubePreProcessYPos; import a8k.app.a8ktype.param.TubePreProcessZAxisPos; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; diff --git a/src/main/java/a8k/app/service/param/mgr/TurntablePosParamMgr.java b/src/main/java/a8k/app/service/param/TurntablePosParamMgr.java similarity index 95% rename from src/main/java/a8k/app/service/param/mgr/TurntablePosParamMgr.java rename to src/main/java/a8k/app/service/param/TurntablePosParamMgr.java index d95c472..ea4891e 100644 --- a/src/main/java/a8k/app/service/param/mgr/TurntablePosParamMgr.java +++ b/src/main/java/a8k/app/service/param/TurntablePosParamMgr.java @@ -1,6 +1,6 @@ -package a8k.app.service.param.mgr; +package a8k.app.service.param; -import a8k.app.service.param.mgr.base.ParamMgr; +import a8k.app.service.param.base.ParamMgr; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/app/service/param/mgr/base/ParamMgr.java b/src/main/java/a8k/app/service/param/base/ParamMgr.java similarity index 87% rename from src/main/java/a8k/app/service/param/mgr/base/ParamMgr.java rename to src/main/java/a8k/app/service/param/base/ParamMgr.java index 97f4ddd..4afc0a4 100644 --- a/src/main/java/a8k/app/service/param/mgr/base/ParamMgr.java +++ b/src/main/java/a8k/app/service/param/base/ParamMgr.java @@ -1,7 +1,7 @@ -package a8k.app.service.param.mgr.base; +package a8k.app.service.param.base; -import a8k.app.service.dao.LowerDeviceParameterDao; -import a8k.app.service.dao.type.Parameter; +import a8k.app.dao.db.LowerDeviceParameterDao; +import a8k.app.dao.db.type.Parameter; import jakarta.annotation.Resource; import java.util.List; diff --git a/src/main/java/a8k/app/service/app/appsetting/AppSettingsMgrService.java b/src/main/java/a8k/app/service/setting/AppSettingsMgrService.java similarity index 91% rename from src/main/java/a8k/app/service/app/appsetting/AppSettingsMgrService.java rename to src/main/java/a8k/app/service/setting/AppSettingsMgrService.java index b224997..2f5c4f5 100644 --- a/src/main/java/a8k/app/service/app/appsetting/AppSettingsMgrService.java +++ b/src/main/java/a8k/app/service/setting/AppSettingsMgrService.java @@ -1,10 +1,10 @@ -package a8k.app.service.app.appsetting; +package a8k.app.service.setting; -import a8k.app.service.dao.AppSettingDao; -import a8k.app.service.dao.type.AppSetting; -import a8k.app.service.dao.type.appsetting.settingenum.*; +import a8k.app.dao.db.AppSettingDao; +import a8k.app.dao.db.type.AppSetting; -import a8k.app.service.dao.type.appsetting.AppSettingName; +import a8k.app.dao.db.type.appsetting.AppSettingName; +import a8k.app.dao.db.type.appsetting.settingenum.*; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import org.slf4j.Logger; diff --git a/src/main/java/a8k/app/service/app/appstate/statemgr/ConsumablesMgrService.java b/src/main/java/a8k/app/service/statemgr/ConsumablesMgrService.java similarity index 93% rename from src/main/java/a8k/app/service/app/appstate/statemgr/ConsumablesMgrService.java rename to src/main/java/a8k/app/service/statemgr/ConsumablesMgrService.java index 38598ea..3deeebf 100644 --- a/src/main/java/a8k/app/service/app/appstate/statemgr/ConsumablesMgrService.java +++ b/src/main/java/a8k/app/service/statemgr/ConsumablesMgrService.java @@ -1,13 +1,14 @@ -package a8k.app.service.app.appstate.statemgr; +package a8k.app.service.statemgr; +import a8k.app.a8ktype.device.Consumable; +import a8k.app.a8ktype.device.TipPos; import a8k.app.constant.AppConstant; -import a8k.app.type.consumables.ConsumableState; -import a8k.app.type.consumables.LarBottleGroup; -import a8k.app.type.consumables.LittBottleGroup; -import a8k.app.type.consumables.ReactionPlateGroup; -import a8k.app.type.pos.*; +import a8k.app.a8ktype.device.consumables.ConsumableState; +import a8k.app.a8ktype.device.consumables.LarBottleGroup; +import a8k.app.a8ktype.device.consumables.LittBottleGroup; +import a8k.app.a8ktype.device.consumables.ReactionPlateGroup; import a8k.app.a8ktype.device.ConsumableGroup; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kReactionFlowType; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kReactionFlowType; import a8k.app.a8ktype.device.TipGroup; import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/app/appstate/statemgr/DeviceWorkStateMgrService.java b/src/main/java/a8k/app/service/statemgr/DeviceWorkStateMgrService.java similarity index 87% rename from src/main/java/a8k/app/service/app/appstate/statemgr/DeviceWorkStateMgrService.java rename to src/main/java/a8k/app/service/statemgr/DeviceWorkStateMgrService.java index 5af8006..575869f 100644 --- a/src/main/java/a8k/app/service/app/appstate/statemgr/DeviceWorkStateMgrService.java +++ b/src/main/java/a8k/app/service/statemgr/DeviceWorkStateMgrService.java @@ -1,9 +1,8 @@ -package a8k.app.service.app.appstate.statemgr; +package a8k.app.service.statemgr; -import a8k.app.service.app.appctrl.mainflowctrl.base.AppActionErrorContext; -import a8k.app.service.app.appstate.type.DeviceWorkState; -import a8k.app.service.app.appstate.type.state.A8kWorkState; -import cn.hutool.core.util.ObjectUtil; +import a8k.app.service.mainctrl.mainflowctrl.base.AppActionErrorContext; +import a8k.app.a8ktype.state.DeviceWorkState; +import a8k.app.a8ktype.state.enumtype.A8kWorkState; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/app/appstate/GStateService.java b/src/main/java/a8k/app/service/statemgr/GStateMgrService.java similarity index 81% rename from src/main/java/a8k/app/service/app/appstate/GStateService.java rename to src/main/java/a8k/app/service/statemgr/GStateMgrService.java index 4ff6ed8..3a8e29a 100644 --- a/src/main/java/a8k/app/service/app/appstate/GStateService.java +++ b/src/main/java/a8k/app/service/statemgr/GStateMgrService.java @@ -1,13 +1,14 @@ -package a8k.app.service.app.appstate; +package a8k.app.service.statemgr; import a8k.app.constant.AppConstant; -import a8k.app.service.dao.type.ProjExtInfoCard; +import a8k.app.a8ktype.state.SensorState; +import a8k.app.dao.db.type.ProjExtInfoCard; import lombok.Data; import org.springframework.stereotype.Component; @Component @Data -public class GStateService { +public class GStateMgrService { //设备是否初始化过 private Boolean deviceInited = false; // diff --git a/src/main/java/a8k/app/service/app/appstate/statemgr/IncubationPlateStateMgrService.java b/src/main/java/a8k/app/service/statemgr/IncubationPlateStateMgrService.java similarity index 92% rename from src/main/java/a8k/app/service/app/appstate/statemgr/IncubationPlateStateMgrService.java rename to src/main/java/a8k/app/service/statemgr/IncubationPlateStateMgrService.java index 0ad510d..ed17856 100644 --- a/src/main/java/a8k/app/service/app/appstate/statemgr/IncubationPlateStateMgrService.java +++ b/src/main/java/a8k/app/service/statemgr/IncubationPlateStateMgrService.java @@ -1,12 +1,12 @@ -package a8k.app.service.app.appstate.statemgr; +package a8k.app.service.statemgr; -import a8k.app.service.app.appstate.type.IncubationPlate; -import a8k.app.service.app.appstate.type.IncubationSubTank; -import a8k.app.service.app.appstate.type.SampleInfo; -import a8k.app.service.app.appstate.type.state.IncubationSubTankState; +import a8k.app.a8ktype.state.IncubationPlate; +import a8k.app.a8ktype.state.IncubationSubTank; +import a8k.app.a8ktype.state.SampleInfo; +import a8k.app.a8ktype.state.enumtype.IncubationSubTankState; import a8k.app.a8ktype.device.IncubatorPos; -import a8k.app.type.ProjBriefInfo; -import a8k.app.type.ecode.AppError; +import a8k.app.a8ktype.type.ProjBriefInfo; +import a8k.app.a8ktype.error.AppError; import a8k.app.utils.ZTimeUtils; import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/a8k/app/service/app/appstate/statemgr/OptScanModuleStateMgrService.java b/src/main/java/a8k/app/service/statemgr/OptScanModuleStateMgrService.java similarity index 82% rename from src/main/java/a8k/app/service/app/appstate/statemgr/OptScanModuleStateMgrService.java rename to src/main/java/a8k/app/service/statemgr/OptScanModuleStateMgrService.java index cd55001..25fe598 100644 --- a/src/main/java/a8k/app/service/app/appstate/statemgr/OptScanModuleStateMgrService.java +++ b/src/main/java/a8k/app/service/statemgr/OptScanModuleStateMgrService.java @@ -1,12 +1,10 @@ -package a8k.app.service.app.appstate.statemgr; +package a8k.app.service.statemgr; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.service.app.appstate.type.OptScanModule; -import a8k.app.service.app.appstate.type.SampleInfo; -import a8k.app.service.app.appstate.type.state.OptScanModuleState; -import a8k.app.type.ProjBriefInfo; +import a8k.app.a8ktype.state.OptScanModule; +import a8k.app.a8ktype.state.SampleInfo; +import a8k.app.a8ktype.state.enumtype.OptScanModuleState; +import a8k.app.a8ktype.type.ProjBriefInfo; import cn.hutool.core.util.ObjectUtil; -import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/app/appstate/statemgr/ProjectContextMgrService.java b/src/main/java/a8k/app/service/statemgr/ProjectContextMgrService.java similarity index 94% rename from src/main/java/a8k/app/service/app/appstate/statemgr/ProjectContextMgrService.java rename to src/main/java/a8k/app/service/statemgr/ProjectContextMgrService.java index 0883397..25da722 100644 --- a/src/main/java/a8k/app/service/app/appstate/statemgr/ProjectContextMgrService.java +++ b/src/main/java/a8k/app/service/statemgr/ProjectContextMgrService.java @@ -1,10 +1,8 @@ -package a8k.app.service.app.appstate.statemgr; +package a8k.app.service.statemgr; -import a8k.app.service.app.appstate.type.*; -import a8k.app.service.app.appstate.type.state.*; +import a8k.app.a8ktype.state.*; import a8k.app.utils.ProjBuildinInfo; import a8k.app.utils.ZJsonHelper; -import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/app/appstate/statemgr/TubeStateMgrService.java b/src/main/java/a8k/app/service/statemgr/TubeStateMgrService.java similarity index 91% rename from src/main/java/a8k/app/service/app/appstate/statemgr/TubeStateMgrService.java rename to src/main/java/a8k/app/service/statemgr/TubeStateMgrService.java index d20956c..2773d4c 100644 --- a/src/main/java/a8k/app/service/app/appstate/statemgr/TubeStateMgrService.java +++ b/src/main/java/a8k/app/service/statemgr/TubeStateMgrService.java @@ -1,21 +1,20 @@ -package a8k.app.service.app.appstate.statemgr; +package a8k.app.service.statemgr; +import a8k.app.dao.db.DeviceStatisticDao; +import a8k.app.dao.db.SampleRecordDBDao; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.app.service.app.appdata.ProjInfoMgrService; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.service.app.appstate.type.EmergencyTubePos; -import a8k.app.service.app.appstate.type.Tube; -import a8k.app.service.app.appstate.type.TubeHolder; -import a8k.app.service.app.appstate.type.state.A8kWorkState; -import a8k.app.service.app.appstate.type.state.TubeHolderState; -import a8k.app.service.app.appstate.type.state.TubeState; -import a8k.app.service.dao.DeviceStatisticDao; -import a8k.app.service.dao.SampleRecordDBDao; -import a8k.app.service.dao.type.SampleRecord; -import a8k.app.service.dao.type.StatisticType; -import a8k.app.type.ecode.AppError; -import a8k.app.type.exception.AppException; -import a8k.app.type.type.BloodType; +import a8k.app.service.data.ProjInfoMgrService; +import a8k.app.a8ktype.state.EmergencyTubePos; +import a8k.app.a8ktype.state.Tube; +import a8k.app.a8ktype.state.TubeHolder; +import a8k.app.a8ktype.state.enumtype.A8kWorkState; +import a8k.app.a8ktype.state.enumtype.TubeHolderState; +import a8k.app.a8ktype.state.enumtype.TubeState; +import a8k.app.dao.db.type.SampleRecord; +import a8k.app.dao.db.type.StatisticType; +import a8k.app.a8ktype.error.AppError; +import a8k.app.a8ktype.exception.AppException; +import a8k.app.a8ktype.device.BloodType; import a8k.app.utils.ProjBuildinInfo; import a8k.app.utils.ProjInfoUtils; import a8k.app.utils.ZJsonHelper; @@ -34,9 +33,9 @@ import java.util.List; @Slf4j public class TubeStateMgrService { @Resource - GStateService gstate; + GStateMgrService gstate; @Resource - ProjInfoMgrService projInfoMgrService; + ProjInfoMgrService projInfoMgrService; @Resource ProjectContextMgrService projectContextMgrService; @Resource diff --git a/src/main/java/a8k/app/type/HbotConsumablePosParam.java b/src/main/java/a8k/app/type/HbotConsumablePosParam.java deleted file mode 100644 index 2ab7899..0000000 --- a/src/main/java/a8k/app/type/HbotConsumablePosParam.java +++ /dev/null @@ -1,57 +0,0 @@ - -//public enum HbotConsumablePosParam { -// TipGroup0_000Pos("第1组TIP的第1个位置"), -// TipGroup0_SpaceingX("第1组TIP的X间距"), -// TipGroup0_SpaceingY("第1组TIP的Y间距"), -// -// TipGroup1_000Pos("第2组TIP的第1个位置"), -// TipGroup1_SpaceingX("第2组TIP的X间距"), -// TipGroup1_SpaceingY("第2组TIP的Y间距"), -// -// TipGroup2_000Pos("第3组TIP的第1个位置"), -// TipGroup2_SpaceingX("第3组TIP的X间距"), -// TipGroup2_SpaceingY("第3组TIP的Y间距"), -// -// -// LittleBufferGroup0_000Pos("第1组小瓶缓冲液的第1个位置"), -// LittleBufferGroup1_000Pos("第1组小瓶缓冲液的第2个位置"), -// LittleBufferGroup2_000Pos("第1组小瓶缓冲液的第3个位置"), -// LittleBufferGroup3_000Pos("第1组小瓶缓冲液的第4个位置"), -// LittleBufferGroup4_000Pos("第1组小瓶缓冲液的第5个位置"), -// LittleBufferGroup5_000Pos("第1组小瓶缓冲液的第6个位置"), -// LittleBufferGroupDX("小瓶缓冲液的X间距"), -// LittleBufferGroupDY("小瓶缓冲液的Y间距"), -// -// ProbeSubstanceGroup0_000Pos("第1组探测物质的第1个位置"), -// ProbeSubstanceGroup1_000Pos("第1组探测物质的第2个位置"), -// ProbeSubstanceGroup2_000Pos("第1组探测物质的第3个位置"), -// ProbeSubstanceGroup3_000Pos("第1组探测物质的第4个位置"), -// ProbeSubstanceGroup4_000Pos("第1组探测物质的第5个位置"), -// ProbeSubstanceGroup5_000Pos("第1组探测物质的第6个位置"), -// ProbeSubstanceDX("探测物质的X间距"), -// ProbeSubstanceDY("探测物质的Y间距"), -// -// LargeBuffer_0Pos("大瓶缓冲液的第1个位置"), -// LargeBuffer_DX("大瓶缓冲液的X间距"), -// LargeBuffer_DY("大瓶缓冲液的Y间距"), -// -// LittleBSPierceZPos("小瓶缓冲液刺破Z坐标"), -// LittleBSSampleZPos("小瓶缓冲液取样Z坐标"), -// LittleBSSampleEndZPos("小瓶缓冲液取样结束Z坐标"), -// ProbeSubstanceSampleZPos("探测物质取样Z坐标"), -// ProbeSubstanceSampleEndZPos("探测物质取样结束Z坐标"), -// LargeBSSSampleZPos("大瓶缓冲液取样Z坐标"), -// LargeBSSSampleEndZPos("大瓶缓冲液取样结束Z坐标"), -// -// -// ; -// final public String chName; -// -// HbotConsumablePosParam(String chName) { -// this.chName = chName; -// } -// -// public static HbotConsumablePosParam valueOf(int off) { -// return HbotConsumablePosParam.values()[off]; -// } -//} diff --git a/src/main/java/a8k/app/type/LargeBottleConsumableRefPoint.java b/src/main/java/a8k/app/type/LargeBottleConsumableRefPoint.java deleted file mode 100644 index f855b9a..0000000 --- a/src/main/java/a8k/app/type/LargeBottleConsumableRefPoint.java +++ /dev/null @@ -1,23 +0,0 @@ -package a8k.app.type; - -import a8k.app.a8ktype.device.ConsumableGroup; -import a8k.app.type.cfg.Pos3d; - -public class LargeBottleConsumableRefPoint { - public ConsumableGroup group; - - public Pos3d pos; - - public LargeBottleConsumableRefPoint(ConsumableGroup group, Pos3d pos) { - this.group = group; - this.pos = pos; - } - - public Integer getRow() { - return group.ordinal() / 3; - } - - public Integer getCol() { - return group.ordinal() % 3; - } -} diff --git a/src/main/java/a8k/app/type/LargeBottoleConsumablePosInfo.java b/src/main/java/a8k/app/type/LargeBottoleConsumablePosInfo.java deleted file mode 100644 index a7fb3fd..0000000 --- a/src/main/java/a8k/app/type/LargeBottoleConsumablePosInfo.java +++ /dev/null @@ -1,17 +0,0 @@ -package a8k.app.type; - -import a8k.app.type.cfg.Pos3d; - -public class LargeBottoleConsumablePosInfo { - public Pos3d pos00; - public Double dx; - public Double dy; - - public LargeBottoleConsumablePosInfo(Pos3d pos00, Double dx, Double dy) { - this.pos00 = pos00; - this.dx = dx; - this.dy = dy; - } - - public LargeBottoleConsumablePosInfo(){} -} diff --git a/src/main/java/a8k/app/type/LittleBottleConsumablePosInfo.java b/src/main/java/a8k/app/type/LittleBottleConsumablePosInfo.java deleted file mode 100644 index 8308e00..0000000 --- a/src/main/java/a8k/app/type/LittleBottleConsumablePosInfo.java +++ /dev/null @@ -1,15 +0,0 @@ -package a8k.app.type; - -import a8k.app.type.cfg.Pos3d; - -public class LittleBottleConsumablePosInfo { - public Pos3d g0_000; - public Pos3d g1_000; - public Pos3d g2_000; - public Pos3d g3_000; - public Pos3d g4_000; - public Pos3d g5_000; - public Double dx; - public Double dy; - -} diff --git a/src/main/java/a8k/app/type/SampleTubeState.java b/src/main/java/a8k/app/type/SampleTubeState.java deleted file mode 100644 index c412425..0000000 --- a/src/main/java/a8k/app/type/SampleTubeState.java +++ /dev/null @@ -1,8 +0,0 @@ -package a8k.app.type; - -/** - * 样品试管状态 - */ -public class SampleTubeState { - String tubeType; -} diff --git a/src/main/java/a8k/app/type/TipRefPoint.java b/src/main/java/a8k/app/type/TipRefPoint.java deleted file mode 100644 index 49d2296..0000000 --- a/src/main/java/a8k/app/type/TipRefPoint.java +++ /dev/null @@ -1,23 +0,0 @@ -package a8k.app.type; - -import a8k.app.type.cfg.Pos3d; - -public class TipRefPoint { - public TipRowNum row; // 行 - public TipColumnNum col; // 列 - public Pos3d pos; - - public TipRefPoint(TipRowNum rowNum, TipColumnNum colNum, Pos3d pos) { - this.row = rowNum; - this.col = colNum; - this.pos = pos; - } - - public Boolean eq(TipRowNum row, TipColumnNum col) { - return this.row == row && this.col == col; - } - - public Boolean neq(TipRowNum row, TipColumnNum col) { - return this.row != row || this.col != col; - } -} diff --git a/src/main/java/a8k/app/type/TubePreProcessPos.java b/src/main/java/a8k/app/type/TubePreProcessPos.java deleted file mode 100644 index cbbe441..0000000 --- a/src/main/java/a8k/app/type/TubePreProcessPos.java +++ /dev/null @@ -1,21 +0,0 @@ - -// -//public enum TubePreProcessPos { -// GripperServoOpenPos("<抓手>张开位置"),// -// GripperServoClosePos("<抓手>闭合位置"),// -// GripperServoTakeCapPos("<抓手>取试管位置"),// -// YServoTakeTubePos("取试管位置"),// -// YServoShakePos("摇匀位置"),// -// ZMotorTakeHTubePos("取高试管位置"),// -// ZMotorTakeSTubePos("取低试管位置"),// -// ZMotorShakeTubePos("摇匀放置位置"),// -// ZMotorPutTubeCapPos("盖帽位置"),// -// ShakeClampMotorClampPos("<摇匀试管夹>夹紧位"),// -// ShakeClampMotorReleasePos("<摇匀试管夹>释放位"),// -// ; -// public final String chName; -// -// TubePreProcessPos(String chName) { -// this.chName = chName; -// } -//} diff --git a/src/main/java/a8k/app/type/ZFunction.java b/src/main/java/a8k/app/type/ZFunction.java deleted file mode 100644 index c778c38..0000000 --- a/src/main/java/a8k/app/type/ZFunction.java +++ /dev/null @@ -1,8 +0,0 @@ -package a8k.app.type; - -import a8k.app.type.exception.AppException; - -@FunctionalInterface -public interface ZFunction { - void fn() throws AppException; -} diff --git a/src/main/java/a8k/app/type/cfg/BottleGroupsPosInfo.java b/src/main/java/a8k/app/type/cfg/BottleGroupsPosInfo.java deleted file mode 100644 index 6863712..0000000 --- a/src/main/java/a8k/app/type/cfg/BottleGroupsPosInfo.java +++ /dev/null @@ -1,85 +0,0 @@ -package a8k.app.type.cfg; - -import a8k.app.utils.HbotScanerPosComputer; - -public class BottleGroupsPosInfo { - - static public Integer cgetMAX_GROUP_COL() {return 3;} - - static public Integer cgetMAX_GROUP_ROW() {return 2;} - - static public Integer cgetMAX_GROUP() {return cgetMAX_GROUP_COL() * cgetMAX_GROUP_ROW();} - - public Pos2d topLelf;//左上角部分坐标 - - public Integer groupXSpacing; //x间隔 - public Integer groupYSpacing; //y间隔 - - public Pos2d scanCodeRelaPos; //扫码相对位置 - - public Integer posTestZ; - - public BottlesPosInfo smallBottleBufferPos; //小瓶缓冲液位置信息 - public BottlesPosInfo detectMaterialPos; //探测物质位置信息 - - - // BottlesPosInfo - - public BottleGroupsPosInfo() { - topLelf = new Pos2d(0, 0); - groupXSpacing = 0; - groupYSpacing = 0; - scanCodeRelaPos = new Pos2d(0, 0); - smallBottleBufferPos = new BottlesPosInfo(); - detectMaterialPos = new BottlesPosInfo(); - } - - public BottleGroupsPosInfo(Pos2d topLelf, - Integer groupXSpacing, - Integer groupYSpacing, - Pos2d scanCodeRelaPos, - Integer posTestZ, - BottlesPosInfo smallBottleBufferPos, - BottlesPosInfo detectMaterialPos) { - this.topLelf = topLelf; - this.groupXSpacing = groupXSpacing; - this.groupYSpacing = groupYSpacing; - this.scanCodeRelaPos = scanCodeRelaPos; - this.smallBottleBufferPos = smallBottleBufferPos; - this.detectMaterialPos = detectMaterialPos; - this.posTestZ = posTestZ; - } - - Pos2d cgetTopLelf(Integer group) { - - int row = group / cgetMAX_GROUP_COL(); - int col = group % cgetMAX_GROUP_COL(); - - return new Pos2d(topLelf.x + col * groupXSpacing, topLelf.y + row * groupYSpacing); - } - - public Pos2d cgetScanPos(Integer group) { - Pos2d topLelf = cgetTopLelf(group); - if (topLelf == null) { - return null; - } - return HbotScanerPosComputer.getScanPos(new Pos2d(topLelf.x + scanCodeRelaPos.x, topLelf.y + scanCodeRelaPos.y)); - } - - - public Pos2d cgetSmallBottleBufferPos(Integer group, Integer bottleIndex) { - Pos2d topLelf = cgetTopLelf(group); - return smallBottleBufferPos.cgetBotPos(topLelf, bottleIndex); - } - - public Pos2d cgetDetectMaterialPos(Integer group, Integer bottleIndex) { - Pos2d topLelf = cgetTopLelf(group); - return detectMaterialPos.cgetBotPos(topLelf, bottleIndex); - } - - Pos3d cgetSmallBottlePiercedPos(Integer group, Integer bottleIndex) { - Pos2d topLelf = cgetTopLelf(group); - Pos2d bottlePos = smallBottleBufferPos.cgetBotPos(topLelf, bottleIndex); - return new Pos3d(bottlePos.x, bottlePos.y, smallBottleBufferPos.piercedPosZ); - } -} diff --git a/src/main/java/a8k/app/type/cfg/BottlesPosInfo.java b/src/main/java/a8k/app/type/cfg/BottlesPosInfo.java deleted file mode 100644 index 9726f7a..0000000 --- a/src/main/java/a8k/app/type/cfg/BottlesPosInfo.java +++ /dev/null @@ -1,43 +0,0 @@ -package a8k.app.type.cfg; - -public class BottlesPosInfo { - - static public Integer cgetMAX_COL() {return 5;} - - static public Integer cgetMAX_ROW() {return 5;} - - static public Integer cgetMAX() {return cgetMAX_COL() * cgetMAX_ROW();} - - public Pos2d relaTopLelf; - public Integer xSpacing; - public Integer ySpacing; - public Integer piercedPosZ; - - public BottlesPosInfo() { - relaTopLelf = new Pos2d(0, 0); - xSpacing = 0; - ySpacing = 0; - piercedPosZ = 0; - } - - - public BottlesPosInfo(Pos2d relaTopLelf, Integer xSpacing, Integer ySpacing, Integer piercedPosZ) { - this.relaTopLelf = relaTopLelf; - this.xSpacing = xSpacing; - this.ySpacing = ySpacing; - this.piercedPosZ = piercedPosZ; - } - - public Pos2d cgetBotPos(Pos2d groupPos, Integer index) { - Integer row = index / cgetMAX_COL(); - Integer col = index % cgetMAX_COL(); - - Integer x = relaTopLelf.x + col * xSpacing; - Integer y = relaTopLelf.y + row * ySpacing; - - return new Pos2d(x + groupPos.x, y + groupPos.y); - - } - - -} diff --git a/src/main/java/a8k/app/type/cfg/HbotLimitArea.java b/src/main/java/a8k/app/type/cfg/HbotLimitArea.java deleted file mode 100644 index 68f02a7..0000000 --- a/src/main/java/a8k/app/type/cfg/HbotLimitArea.java +++ /dev/null @@ -1,36 +0,0 @@ -package a8k.app.type.cfg; - -public class HbotLimitArea { - - - public Integer topLX; - public Integer topLY; - - public Integer bottoLX; - public Integer bottoLY; - - public HbotLimitArea(Integer topLX, Integer topLY, Integer bottoLX, Integer bottoLY) { - this.topLX = topLX; - this.topLY = topLY; - this.bottoLX = bottoLX; - this.bottoLY = bottoLY; - } - - public HbotLimitArea() { - this.topLX = 0; - this.topLY = 0; - this.bottoLX = 0; - this.bottoLY = 0; - } - - public Boolean checkIsInArea(Integer x, Integer y) { - if (x >= topLX && x <= bottoLX && y >= topLY && y <= bottoLY) { - return true; - } - return false; - } - - public Boolean checkIsInArea(Pos2d pos) { - return checkIsInArea(pos.x, pos.y); - } -} diff --git a/src/main/java/a8k/app/type/cfg/KeyValType.java b/src/main/java/a8k/app/type/cfg/KeyValType.java deleted file mode 100644 index 57969e1..0000000 --- a/src/main/java/a8k/app/type/cfg/KeyValType.java +++ /dev/null @@ -1,24 +0,0 @@ -package a8k.app.type.cfg; - -public enum KeyValType { - Pos3d("Pos3d"),// - Pos2d("Pos2d"),// - Bool("Bool"),// - Int("Int"),// - String("String"),// - LargeBottleBufferPosInfo("LargeBottleBufferPosInfo"),// - Plates2dCodeScanPosInfo("Plates2dCodeScanPosInfo"),// - SmallBottleBufferPosInfo("SmallBottleBufferPosInfo"),// - TipPickUpPosInfo("TipPickUpPosInfo"),// - TubeSamplePos("TubeSamplePos"),// - PipetteCfg("PipetteCfg"),// - Float("Float"); - - - final public String name; - - KeyValType(String name) { - this.name = name; - } - -} diff --git a/src/main/java/a8k/app/type/cfg/LargeBottleBufferPos.java b/src/main/java/a8k/app/type/cfg/LargeBottleBufferPos.java deleted file mode 100644 index 5250650..0000000 --- a/src/main/java/a8k/app/type/cfg/LargeBottleBufferPos.java +++ /dev/null @@ -1,65 +0,0 @@ -package a8k.app.type.cfg; - -import a8k.app.utils.HbotScanerPosComputer; - -/** - * 大瓶缓冲液位置信息 - */ -public class LargeBottleBufferPos { - public Pos2d topLelf = new Pos2d(0, 0); - - public Pos2d hole0 = new Pos2d(0, 0); - public Integer holeXSpacing = 0; //x间隔 - public Integer holeYSpacing = 0; //y间隔 - - public Pos2d scan0 = new Pos2d(0, 0); - public Integer scanPosXSpacing = 0; //扫码位置x间隔 - public Integer scanPosYSpacing = 0; //扫码位置y间隔 - - - public Integer cgetCOL() { - return 3; - } - - public Integer cgetROW() { - return 2; - } - - public Integer cgetBottleCount() { - return cgetCOL() * cgetROW(); - } - - public LargeBottleBufferPos() { - } - - public LargeBottleBufferPos(Pos2d topLelf, Pos2d hole0, Integer holeXSpacing, Integer holeYSpacing, Pos2d scan0, Integer scanPosXSpacing, Integer scanPosYSpacing) { - this.topLelf = topLelf; - this.holeXSpacing = holeXSpacing; - this.holeYSpacing = holeYSpacing; - this.scanPosXSpacing = scanPosXSpacing; - this.scanPosYSpacing = scanPosYSpacing; - this.hole0 = hole0; - this.scan0 = scan0; - } - - public Pos2d cgetBottlePos(Integer bottleIndex) { - Integer row = bottleIndex / cgetCOL(); - Integer col = bottleIndex % cgetCOL(); - - Integer x = topLelf.x + hole0.x + col * holeXSpacing; - Integer y = topLelf.y + hole0.y + row * holeYSpacing; - - return new Pos2d(x, y); - } - - public Pos2d cgetScanPos(Integer bottleIndex) { - Integer row = bottleIndex / cgetCOL(); - Integer col = bottleIndex % cgetCOL(); - - Integer x = topLelf.x + scan0.x + col * scanPosXSpacing; - Integer y = topLelf.y + scan0.y + row * scanPosYSpacing; - - return HbotScanerPosComputer.getScanPos(new Pos2d(x, y)); - - } -} diff --git a/src/main/java/a8k/app/type/cfg/PipetteCfg.java b/src/main/java/a8k/app/type/cfg/PipetteCfg.java deleted file mode 100644 index c573804..0000000 --- a/src/main/java/a8k/app/type/cfg/PipetteCfg.java +++ /dev/null @@ -1,10 +0,0 @@ -package a8k.app.type.cfg; - -public class PipetteCfg { - public Integer LLFCThresh;//液面跟随电容阈值 - public Integer LLFPThresh;//液面跟随压力阈值 - - public Integer operatVerifFeatureTime;//操作验证特征时间 - public Integer operatVerifPThresh;//压力阈值 - public Integer tolerance; //吸空检测容差值 -} diff --git a/src/main/java/a8k/app/type/cfg/Plates2dCodeScanPos.java b/src/main/java/a8k/app/type/cfg/Plates2dCodeScanPos.java deleted file mode 100644 index 190f434..0000000 --- a/src/main/java/a8k/app/type/cfg/Plates2dCodeScanPos.java +++ /dev/null @@ -1,23 +0,0 @@ -package a8k.app.type.cfg; - -/** - * 板夹仓扫码信息 - */ -public class Plates2dCodeScanPos { - public Pos2d ch0ScanPos; //通道1扫码位置 - public Integer scanYSpacing; //扫码间隔 - - public Plates2dCodeScanPos() { - ch0ScanPos = new Pos2d(0, 0); - scanYSpacing = 0; - } - - public Plates2dCodeScanPos(Pos2d ch0ScanPos, Integer scanYSpacing) { - this.ch0ScanPos = ch0ScanPos; - this.scanYSpacing = scanYSpacing; - } - - public Pos2d cgetScanPos(int ch) { - return new Pos2d(ch0ScanPos.x, ch0ScanPos.y + ch * scanYSpacing); - } -} diff --git a/src/main/java/a8k/app/type/cfg/SampleZPosInfo.java b/src/main/java/a8k/app/type/cfg/SampleZPosInfo.java deleted file mode 100644 index 340edd5..0000000 --- a/src/main/java/a8k/app/type/cfg/SampleZPosInfo.java +++ /dev/null @@ -1,17 +0,0 @@ -package a8k.app.type.cfg; - -public class SampleZPosInfo { - public Integer sampleZPos;//采样探测起始位 - public Integer sampleZDepth;//采样深度 - - /* - * 如果样本容器直径不随液面高度变化，那么LLFVelK=0，LLFVel=常数 - * 液面跟随速度=LLFVelK*液面相对起始位置高度+LLFVel - * - * 如果样本容器直径随液面高度变化，那么LLFVelK=常数，LLFVel=常数 - * 液面跟随速度=LLFVelK*液面相对起始位置高度+LLFVel - */ - - public Integer LLFVelK;//液面跟随速度 - public Integer LLFVel;//液面跟随速度 -} diff --git a/src/main/java/a8k/app/type/cfg/TipPickUpPosInfo.java b/src/main/java/a8k/app/type/cfg/TipPickUpPosInfo.java deleted file mode 100644 index 34fea0f..0000000 --- a/src/main/java/a8k/app/type/cfg/TipPickUpPosInfo.java +++ /dev/null @@ -1,78 +0,0 @@ -package a8k.app.type.cfg; - -public class TipPickUpPosInfo { - - public Pos2d g0tl; - public Pos2d g1tl; - public Pos2d g2tl; - - public Double xSpacing; //x间隔 - public Double ySpacing; //y间隔 - - public Integer g0PickUpZPos; //拾取高度 - public Integer g1PickUpZPos; //拾取高度 - public Integer g2PickUpZPos; //拾取高度 - - static public Integer cgetTipNum() {return 12 * 10;} - - static public Integer cgetCOL_MAX() {return 12;} - - static public Integer cgetROW_MAX() {return 10;} - - public TipPickUpPosInfo() { - g0tl = new Pos2d(0, 0); - g1tl = new Pos2d(0, 0); - g2tl = new Pos2d(0, 0); - xSpacing = 0.0; - ySpacing = 0.0; - g0PickUpZPos = 0; - g1PickUpZPos = 0; - g2PickUpZPos = 0; - } - - public TipPickUpPosInfo(Pos2d g0tl, Pos2d g1tl, Pos2d g2tl, Double xSpacing, Double ySpacing, Integer g0PickUpZPos, Integer g1PickUpZPos, Integer g2PickUpZPos) { - this.g0tl = g0tl; - this.g1tl = g1tl; - this.g2tl = g2tl; - this.xSpacing = xSpacing; - this.ySpacing = ySpacing; - this.g0PickUpZPos = g0PickUpZPos; - this.g1PickUpZPos = g1PickUpZPos; - this.g2PickUpZPos = g2PickUpZPos; - } - - Pos2d getTopLeft(Integer group) { - if (group == 0) { - return g0tl; - } else if (group == 1) { - return g1tl; - } else if (group == 2) { - return g2tl; - } else { - return new Pos2d(0, 0); - } - } - - public Pos2d getTipPos(Integer group, Integer index) { - int row; //行 - int col; //列 - - row = index / cgetCOL_MAX(); - col = index % cgetCOL_MAX(); - - Pos2d topleft = getTopLeft(group); - return new Pos2d((int) (topleft.x + col * xSpacing), (int) (topleft.y + row * ySpacing)); - } - - public Integer getPickUpZPos(Integer group) { - if (group == 0) { - return g0PickUpZPos; - } else if (group == 1) { - return g1PickUpZPos; - } else if (group == 2) { - return g2PickUpZPos; - } else { - return 0; - } - } -} diff --git a/src/main/java/a8k/app/type/cfg/TubeSamplePos.java b/src/main/java/a8k/app/type/cfg/TubeSamplePos.java deleted file mode 100644 index 86e0049..0000000 --- a/src/main/java/a8k/app/type/cfg/TubeSamplePos.java +++ /dev/null @@ -1,15 +0,0 @@ -package a8k.app.type.cfg; - -public class TubeSamplePos { - - Pos2d sampleXYPos0; //不需要脱帽盖帽摇匀的取样位置 - Pos2d sampleXYPos1; //需要脱帽盖帽摇匀的取样位置 - - SampleZPosInfo HighBlood; //sampleXYPos1 - SampleZPosInfo ShortBlood;//sampleXYPos1 - - SampleZPosInfo Mini; //sampleXYPos0 - SampleZPosInfo MiniBlood; //sampleXYPos0 - SampleZPosInfo BulletTube1P5; //sampleXYPos0 - SampleZPosInfo BulletTube0P5; //sampleXYPos0 -} diff --git a/src/main/java/a8k/app/type/json/CustomDateSerializer.java b/src/main/java/a8k/app/type/json/CustomDateSerializer.java deleted file mode 100644 index 38e1a57..0000000 --- a/src/main/java/a8k/app/type/json/CustomDateSerializer.java +++ /dev/null @@ -1,18 +0,0 @@ -package a8k.app.type.json; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; - -import java.io.IOException; -import java.text.SimpleDateFormat; - -public class CustomDateSerializer extends JsonSerializer { - @Override - public void serialize(Long timestamp, JsonGenerator gen, SerializerProvider serializers) throws IOException { - //转换成ms时间戳 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - gen.writeString(sdf.format(timestamp)); - gen.writeEndObject(); - } -} diff --git a/src/main/java/a8k/app/type/tube_setting/A8kDeviceSampleCfg.java b/src/main/java/a8k/app/type/tube_setting/A8kDeviceSampleCfg.java deleted file mode 100644 index 3f2583b..0000000 --- a/src/main/java/a8k/app/type/tube_setting/A8kDeviceSampleCfg.java +++ /dev/null @@ -1,9 +0,0 @@ -package a8k.app.type.tube_setting; - -import java.util.ArrayList; -import java.util.List; - -public class A8kDeviceSampleCfg { - //配置 - public List cfgs = new ArrayList<>(); -} diff --git a/src/main/java/a8k/app/type/ui/ZAppErrorStackInfo.java b/src/main/java/a8k/app/type/ui/ZAppErrorStackInfo.java deleted file mode 100644 index 0d3e9a2..0000000 --- a/src/main/java/a8k/app/type/ui/ZAppErrorStackInfo.java +++ /dev/null @@ -1,7 +0,0 @@ -package a8k.app.type.ui; - -import io.swagger.v3.oas.annotations.media.Schema; - -public class ZAppErrorStackInfo { - public String[] stackTraceElements; -} diff --git a/src/main/java/a8k/app/utils/AppExceptionUtils.java b/src/main/java/a8k/app/utils/AppExceptionUtils.java index 441006a..bf2765d 100644 --- a/src/main/java/a8k/app/utils/AppExceptionUtils.java +++ b/src/main/java/a8k/app/utils/AppExceptionUtils.java @@ -1,9 +1,8 @@ package a8k.app.utils; -import a8k.app.type.ecode.AppError; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.error.AppError; +import a8k.app.a8ktype.exception.AppException; -import java.util.ArrayList; import java.util.List; public class AppExceptionUtils { diff --git a/src/main/java/a8k/app/utils/HbotScanerPosComputer.java b/src/main/java/a8k/app/utils/HbotScanerPosComputer.java index 38e3715..7f56e67 100644 --- a/src/main/java/a8k/app/utils/HbotScanerPosComputer.java +++ b/src/main/java/a8k/app/utils/HbotScanerPosComputer.java @@ -1,6 +1,6 @@ package a8k.app.utils; -import a8k.app.type.cfg.Pos2d; +import a8k.app.a8ktype.device.Pos2d; public class HbotScanerPosComputer { static public Pos2d getScanPos(Pos2d tipPos) { diff --git a/src/main/java/a8k/app/utils/PlaneUtils.java b/src/main/java/a8k/app/utils/PlaneUtils.java index 8d236b3..bd5824a 100644 --- a/src/main/java/a8k/app/utils/PlaneUtils.java +++ b/src/main/java/a8k/app/utils/PlaneUtils.java @@ -1,6 +1,6 @@ package a8k.app.utils; -import a8k.app.type.cfg.Pos3d; +import a8k.app.a8ktype.device.Pos3d; public class PlaneUtils { diff --git a/src/main/java/a8k/app/utils/ProjBuildinInfo.java b/src/main/java/a8k/app/utils/ProjBuildinInfo.java index bb7dc7e..9480770 100644 --- a/src/main/java/a8k/app/utils/ProjBuildinInfo.java +++ b/src/main/java/a8k/app/utils/ProjBuildinInfo.java @@ -1,11 +1,8 @@ package a8k.app.utils; -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.type.ProjBriefInfo; -import com.fasterxml.jackson.annotation.JsonIgnore; +import a8k.app.dao.db.type.ProjOptInfo; +import a8k.app.dao.db.type.ProjectBaseInfo; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kOptType; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/a8k/app/utils/ProjInfo.java b/src/main/java/a8k/app/utils/ProjInfo.java index cd9224c..be53325 100644 --- a/src/main/java/a8k/app/utils/ProjInfo.java +++ b/src/main/java/a8k/app/utils/ProjInfo.java @@ -1,11 +1,8 @@ package a8k.app.utils; -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.A8kOptFnFormula; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kOptType; -import a8k.app.type.ProjBriefInfo; +import a8k.app.dao.db.type.ProjExtInfoCard; +import a8k.app.dao.db.type.ProjOptInfo; +import a8k.app.dao.db.type.ProjectBaseInfo; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/a8k/app/utils/ProjInfoUtils.java b/src/main/java/a8k/app/utils/ProjInfoUtils.java index 3023794..6cb5500 100644 --- a/src/main/java/a8k/app/utils/ProjInfoUtils.java +++ b/src/main/java/a8k/app/utils/ProjInfoUtils.java @@ -1,9 +1,9 @@ package a8k.app.utils; -import a8k.app.service.app.appstate.type.ProjectTaskContext; -import a8k.app.service.dao.type.ProjExtInfoCard; -import a8k.app.service.dao.type.a8kidcard.A8kOptFnFormula; -import a8k.app.type.ProjBriefInfo; +import a8k.app.a8ktype.state.ProjectTaskContext; +import a8k.app.dao.db.type.ProjExtInfoCard; +import a8k.app.dao.db.type.a8kidcard.A8kOptFnFormula; +import a8k.app.a8ktype.type.ProjBriefInfo; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/a8k/app/utils/ProjProcessContextUtils.java b/src/main/java/a8k/app/utils/ProjProcessContextUtils.java index 617a51a..6e27429 100644 --- a/src/main/java/a8k/app/utils/ProjProcessContextUtils.java +++ b/src/main/java/a8k/app/utils/ProjProcessContextUtils.java @@ -1,15 +1,15 @@ package a8k.app.utils; import a8k.SpringBootBeanUtil; -import a8k.app.service.app.appstate.statemgr.ProjectContextMgrService; -import a8k.app.service.app.appstate.type.ProjectTaskContext; -import a8k.app.service.app.appstate.type.Tube; -import a8k.app.service.param.exmgr.HbotConsumableParamMgr; +import a8k.app.service.statemgr.ProjectContextMgrService; +import a8k.app.a8ktype.state.ProjectTaskContext; +import a8k.app.a8ktype.state.Tube; +import a8k.app.dao.exparam.HbotConsumableParamMgr; import a8k.app.a8ktype.param.A8kSamplePos; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kReactionFlowType; -import a8k.app.type.cfg.Pos3d; -import a8k.app.type.type.A8kTubeHolderType; -import a8k.app.type.type.BloodType; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kReactionFlowType; +import a8k.app.a8ktype.device.Pos3d; +import a8k.app.a8ktype.device.A8kTubeHolderType; +import a8k.app.a8ktype.device.BloodType; import org.springframework.util.Assert; import java.util.List; diff --git a/src/main/java/a8k/app/utils/ReactionPlate2DCodeHelper.java b/src/main/java/a8k/app/utils/ReactionPlate2DCodeHelper.java index efa7804..fc60cd9 100644 --- a/src/main/java/a8k/app/utils/ReactionPlate2DCodeHelper.java +++ b/src/main/java/a8k/app/utils/ReactionPlate2DCodeHelper.java @@ -1,7 +1,5 @@ package a8k.app.utils; -import a8k.app.type.exception.AppException; - import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/src/main/java/a8k/app/utils/ZASSERT.java b/src/main/java/a8k/app/utils/ZASSERT.java deleted file mode 100644 index 2f0e539..0000000 --- a/src/main/java/a8k/app/utils/ZASSERT.java +++ /dev/null @@ -1,12 +0,0 @@ -package a8k.app.utils; - -import a8k.app.type.ecode.AECodeError; -import a8k.app.type.exception.AppException; - -public class ZASSERT { - static void zassert(Boolean condition, String exmsg) throws AppException { - if (!condition) { - throw new AppException(new AECodeError(exmsg)); - } - } -} diff --git a/src/main/java/a8k/app/utils/ZAppChecker.java b/src/main/java/a8k/app/utils/ZAppChecker.java index 525d6bf..9f4b087 100644 --- a/src/main/java/a8k/app/utils/ZAppChecker.java +++ b/src/main/java/a8k/app/utils/ZAppChecker.java @@ -1,9 +1,10 @@ package a8k.app.utils; +import a8k.app.factory.AppExceptionFactory; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.extui.service.test.state.TestModeState; -import a8k.app.type.ecode.AppError; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.error.AppError; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -14,7 +15,7 @@ import java.util.List; @Slf4j public class ZAppChecker { @Resource - AppExceptionBuilder ebuilder; + AppExceptionFactory ebuilder; @Resource TestModeState testModeState; diff --git a/src/main/java/a8k/app/utils/ZCSVUtils.java b/src/main/java/a8k/app/utils/ZCSVUtils.java index f23b109..dfa1689 100644 --- a/src/main/java/a8k/app/utils/ZCSVUtils.java +++ b/src/main/java/a8k/app/utils/ZCSVUtils.java @@ -1,9 +1,7 @@ package a8k.app.utils; -import a8k.app.service.dao.ProjectBaseInfoDao; -import a8k.app.service.dao.type.ProjOptInfo; -import a8k.app.service.dao.type.ProjectBaseInfo; +import a8k.app.dao.db.type.ProjOptInfo; import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.text.csv.CsvReader; import cn.hutool.core.text.csv.CsvUtil; @@ -12,7 +10,6 @@ import lombok.extern.slf4j.Slf4j; import java.io.File; import java.nio.charset.StandardCharsets; -import java.nio.file.Path; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/a8k/app/utils/ZFnCall.java b/src/main/java/a8k/app/utils/ZFnCall.java index 60e0bdb..30e5063 100644 --- a/src/main/java/a8k/app/utils/ZFnCall.java +++ b/src/main/java/a8k/app/utils/ZFnCall.java @@ -1,8 +1,8 @@ package a8k.app.utils; -import a8k.app.type.ecode.AppError; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.error.AppError; +import a8k.app.a8ktype.exception.AppException; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/src/main/java/a8k/app/utils/ZSqlite.java b/src/main/java/a8k/app/utils/ZSqlite.java index 8de792b..7a0248f 100644 --- a/src/main/java/a8k/app/utils/ZSqlite.java +++ b/src/main/java/a8k/app/utils/ZSqlite.java @@ -1,7 +1,7 @@ package a8k.app.utils; import a8k.app.constant.FilePathConstant; -import a8k.app.type.db.CommonPage; +import a8k.app.a8ktype.db.CommonPage; import jakarta.annotation.Nullable; import lombok.SneakyThrows; import org.slf4j.Logger; diff --git a/src/main/java/a8k/app/utils/wq/ZWorkQueue.java b/src/main/java/a8k/app/utils/ZWorkQueue.java similarity index 98% rename from src/main/java/a8k/app/utils/wq/ZWorkQueue.java rename to src/main/java/a8k/app/utils/ZWorkQueue.java index e63b5c3..0af00e5 100644 --- a/src/main/java/a8k/app/utils/wq/ZWorkQueue.java +++ b/src/main/java/a8k/app/utils/ZWorkQueue.java @@ -1,4 +1,4 @@ -package a8k.app.utils.wq; +package a8k.app.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/app/utils/opt_gain_convert/OptGainConvert.java b/src/main/java/a8k/app/utils/opt_gain_convert/OptGainConvert.java index 72a0e55..1c6f062 100644 --- a/src/main/java/a8k/app/utils/opt_gain_convert/OptGainConvert.java +++ b/src/main/java/a8k/app/utils/opt_gain_convert/OptGainConvert.java @@ -1,6 +1,6 @@ package a8k.app.utils.opt_gain_convert; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kOptType; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kOptType; public class OptGainConvert { public static double scanerToRealGain(A8kOptType type, int gain) { diff --git a/src/main/java/a8k/app/utils/state_machine/AppStateMachine.java b/src/main/java/a8k/app/utils/state_machine/AppStateMachine.java deleted file mode 100644 index b09e967..0000000 --- a/src/main/java/a8k/app/utils/state_machine/AppStateMachine.java +++ /dev/null @@ -1,227 +0,0 @@ -package a8k.app.utils.state_machine; - -import a8k.app.service.bases.AppEventBusService; -import a8k.app.service.bases.appevent.A8kErrorsPromptEvent; -import a8k.app.type.exception.AppException; -import a8k.app.utils.state_machine.type.event.*; -import a8k.app.utils.state_machine.type.event.base.AppStateMachineEvent; -import a8k.app.utils.state_machine.type.event.UsrContinueEvent; -import a8k.app.utils.state_machine.type.event.UsrPauseEvent; -import a8k.app.utils.state_machine.type.event.inter.StateChangeEvent; -import a8k.app.utils.state_machine.type.event.UsrStopEvent; -import jakarta.annotation.Resource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.util.Assert; - -import java.util.List; -import java.util.Vector; - -/* - * - * pauseDoing - * continueDo - * stopByUsr ---> trigger event stateChangeEvent ---> stateExit,stateEnter - * stopByException - * - * - * 触发异常后，会自动进入idle状态 - * 暂停状态下如果有新的事件，会自动丢弃事件 - * - */ - -public class AppStateMachine { - static Logger logger = LoggerFactory.getLogger(AppStateMachine.class); - - /* - * pause - * continue - * - * getState - * - */ - - List> stateProcessers = new Vector<>(); - List receiptQueue = new Vector<>(); - Thread workThread; - String name; - - AppStateProcesser idleState; - AppStateProcesser currentState; - - Boolean pauseFlag = false; - - Boolean selfStopFlagPending = false; - Boolean selfPauseFlagPending = false; - - @Resource - AppEventBusService ebus; - - AppStateProcesser getStateProcesser(T state) { - return stateProcessers.stream().filter(stateProcesser -> stateProcesser.state.equals(state)).findFirst() - .orElse(null); - } - - synchronized AppStateProcesser getCurrentStateProcesser() { - return currentState; - } - - synchronized void setCurrentStateProcesser(AppStateProcesser stateProcesser) { - currentState = stateProcesser; - } - - void doWork() { - if (receiptQueue.isEmpty()) { - if (!pauseFlag) - processEvent(new PeriodicSchedulingEvent()); - return; - } - - AppStateMachineEvent event = receiptQueue.get(0); - receiptQueue.remove(0); - if (event instanceof StateChangeEvent) { - pauseFlag = false; - StateChangeEvent stateChangeEvent = (StateChangeEvent) event; - AppStateProcesser nextState = getStateProcesser(stateChangeEvent.changeTo); - setCurrentStateProcesser(nextState); - processEvent(new StateEnterEvent()); - } else if (event instanceof UsrContinueEvent) { - pauseFlag = false; - processEvent(event); - } else if (event instanceof UsrStopEvent) { - pauseFlag = false; - processEvent(event); - setCurrentStateProcesser(idleState); - } else if (event instanceof UsrPauseEvent) { - processEvent(event); - pauseFlag = true; - } else { - if (pauseFlag) - return; - processEvent(event); - } - } - - void doWorkLoop() { - while (!workThread.isInterrupted()) { - doWork(); - sleep(100); - } - } - - void processEvent(AppStateMachineEvent event) { - if (event instanceof PeriodicSchedulingEvent) { - } else { - logger.info("{} {} processEvent: {}", name, currentState.state.getClass().getSimpleName(), - event.getClass().getSimpleName()); - } - try { - currentState.onStateProcess.processer(event); - } catch (AppException e) { - logger.error("Catch Exception: {},stop device", e.error); - ebus.pushEvent(new A8kErrorsPromptEvent(e.error)); - selfStop(); - } - - if (selfStopFlagPending) { - selfStopFlagPending = false; - setCurrentStateProcesser(idleState); - } - - if (selfPauseFlagPending) { - selfPauseFlagPending = false; - pauseFlag = true; - } - } - - /* - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * PUBLIC - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - */ - - public AppStateMachine(String name) { - this.name = name; - } - - public void pushEvent(AppStateMachineEvent event) { - receiptQueue.add(event); - } - - public void startSchedule() { - currentState = idleState; - Assert.isTrue(currentState != null, "currentState != null"); - workThread = new Thread(this::doWorkLoop); - workThread.start(); - } - - public void regIdleStateProcesser(AppStateProcesser stateProcesser) { - Assert.isTrue(stateProcesser != null, "stateProcesser != null"); - idleState = stateProcesser; - stateProcessers.add(stateProcesser); - } - - public void regStateProcesser(AppStateProcesser stateProcesser) { - Assert.isTrue(stateProcesser != null, "stateProcesser != null"); - stateProcessers.add(stateProcesser); - } - - public void regStateProcesser(T state, AppStateProcesserRunnable onStateProcess) { - regStateProcesser(new AppStateProcesser<>(state, onStateProcess)); - } - - public void regIdleStateProcesser(T state, AppStateProcesserRunnable onStateProcess) { - regIdleStateProcesser(new AppStateProcesser<>(state, onStateProcess)); - } - - public void usrPause() { - pushEvent(new UsrPauseEvent()); - } - - public void usrContinueDo() { - pushEvent(new UsrContinueEvent()); - } - - public void changeState(T state) { - pushEvent(new StateChangeEvent<>(state)); - } - - public void usrStop() { - pushEvent(new UsrStopEvent()); - } - - // - public void selfPause() { - selfPauseFlagPending = true; - } - - public void selfStop() { - selfStopFlagPending = false; - } - - public void changeToNextState() { - int index = stateProcessers.indexOf(currentState); - if (index == stateProcessers.size() - 1) { - index = 0; - } else { - index++; - } - T nextState = stateProcessers.get(index).state; - pushEvent(new StateChangeEvent<>(nextState)); - } - - public T getCurrentState() { - return getCurrentStateProcesser().state; - } - - public void sleep(Integer time) { - try { - Thread.sleep(time); - } catch (InterruptedException ignored) { - } - } - - public Boolean isBusy() { - return (currentState == idleState || pauseFlag); - } -} diff --git a/src/main/java/a8k/app/utils/state_machine/AppStateProcesser.java b/src/main/java/a8k/app/utils/state_machine/AppStateProcesser.java deleted file mode 100644 index 28a4d9b..0000000 --- a/src/main/java/a8k/app/utils/state_machine/AppStateProcesser.java +++ /dev/null @@ -1,11 +0,0 @@ -package a8k.app.utils.state_machine; - -public class AppStateProcesser { - public T state; - AppStateProcesserRunnable onStateProcess; - - public AppStateProcesser(T state, AppStateProcesserRunnable onStateProcess) { - this.state = state; - this.onStateProcess = onStateProcess; - } -} diff --git a/src/main/java/a8k/app/utils/state_machine/AppStateProcesserRunnable.java b/src/main/java/a8k/app/utils/state_machine/AppStateProcesserRunnable.java deleted file mode 100644 index c647798..0000000 --- a/src/main/java/a8k/app/utils/state_machine/AppStateProcesserRunnable.java +++ /dev/null @@ -1,9 +0,0 @@ -package a8k.app.utils.state_machine; - -import a8k.app.type.exception.AppException; -import a8k.app.utils.state_machine.type.event.base.AppStateMachineEvent; - -@FunctionalInterface -public interface AppStateProcesserRunnable { - void processer(AppStateMachineEvent event) throws AppException ; -} diff --git a/src/main/java/a8k/app/utils/state_machine/type/event/PeriodicSchedulingEvent.java b/src/main/java/a8k/app/utils/state_machine/type/event/PeriodicSchedulingEvent.java deleted file mode 100644 index 8b23b98..0000000 --- a/src/main/java/a8k/app/utils/state_machine/type/event/PeriodicSchedulingEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package a8k.app.utils.state_machine.type.event; - -import a8k.app.utils.state_machine.type.event.base.AppStateMachineEvent; - -public class PeriodicSchedulingEvent extends AppStateMachineEvent { -} diff --git a/src/main/java/a8k/app/utils/state_machine/type/event/StateEnterEvent.java b/src/main/java/a8k/app/utils/state_machine/type/event/StateEnterEvent.java deleted file mode 100644 index b844283..0000000 --- a/src/main/java/a8k/app/utils/state_machine/type/event/StateEnterEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package a8k.app.utils.state_machine.type.event; - -import a8k.app.utils.state_machine.type.event.base.AppStateMachineEvent; - -public class StateEnterEvent extends AppStateMachineEvent { -} diff --git a/src/main/java/a8k/app/utils/state_machine/type/event/UsrContinueEvent.java b/src/main/java/a8k/app/utils/state_machine/type/event/UsrContinueEvent.java deleted file mode 100644 index 0bcde38..0000000 --- a/src/main/java/a8k/app/utils/state_machine/type/event/UsrContinueEvent.java +++ /dev/null @@ -1,9 +0,0 @@ -package a8k.app.utils.state_machine.type.event; - -import a8k.app.utils.state_machine.type.event.base.AppStateMachineEvent; - -public class UsrContinueEvent extends AppStateMachineEvent { - public UsrContinueEvent() { - ; - } -} diff --git a/src/main/java/a8k/app/utils/state_machine/type/event/UsrPauseEvent.java b/src/main/java/a8k/app/utils/state_machine/type/event/UsrPauseEvent.java deleted file mode 100644 index 73bbb1f..0000000 --- a/src/main/java/a8k/app/utils/state_machine/type/event/UsrPauseEvent.java +++ /dev/null @@ -1,8 +0,0 @@ -package a8k.app.utils.state_machine.type.event; - -import a8k.app.utils.state_machine.type.event.base.AppStateMachineEvent; - -public class UsrPauseEvent extends AppStateMachineEvent { - public UsrPauseEvent() { - } -} diff --git a/src/main/java/a8k/app/utils/state_machine/type/event/UsrStopEvent.java b/src/main/java/a8k/app/utils/state_machine/type/event/UsrStopEvent.java deleted file mode 100644 index 5531681..0000000 --- a/src/main/java/a8k/app/utils/state_machine/type/event/UsrStopEvent.java +++ /dev/null @@ -1,9 +0,0 @@ -package a8k.app.utils.state_machine.type.event; - -import a8k.app.utils.state_machine.type.event.base.AppStateMachineEvent; - -public class UsrStopEvent extends AppStateMachineEvent { - public UsrStopEvent() { - ; - } -} diff --git a/src/main/java/a8k/app/utils/state_machine/type/event/base/AppStateMachineEvent.java b/src/main/java/a8k/app/utils/state_machine/type/event/base/AppStateMachineEvent.java deleted file mode 100644 index 2371302..0000000 --- a/src/main/java/a8k/app/utils/state_machine/type/event/base/AppStateMachineEvent.java +++ /dev/null @@ -1,10 +0,0 @@ -package a8k.app.utils.state_machine.type.event.base; - -public class AppStateMachineEvent { - public Boolean isInternal = false; - - public AppStateMachineEvent() { - } - - -} diff --git a/src/main/java/a8k/app/utils/state_machine/type/event/inter/StateChangeEvent.java b/src/main/java/a8k/app/utils/state_machine/type/event/inter/StateChangeEvent.java deleted file mode 100644 index 24055ae..0000000 --- a/src/main/java/a8k/app/utils/state_machine/type/event/inter/StateChangeEvent.java +++ /dev/null @@ -1,13 +0,0 @@ -package a8k.app.utils.state_machine.type.event.inter; - -import a8k.app.utils.state_machine.type.event.base.AppStateMachineEvent; - -public class StateChangeEvent extends AppStateMachineEvent { - public T changeTo; - - public StateChangeEvent(T changeTo) { - isInternal = true; - this.changeTo = changeTo; - } - -} diff --git a/src/main/java/a8k/extui/bean/echart/EChartDisplay.java b/src/main/java/a8k/extui/bean/echart/EChartDisplay.java deleted file mode 100644 index dfb6da2..0000000 --- a/src/main/java/a8k/extui/bean/echart/EChartDisplay.java +++ /dev/null @@ -1,7 +0,0 @@ -package a8k.extui.bean.echart; - -import a8k.extui.bean.echart.base.EChartOption; - -public class EChartDisplay { - public EChartOption option; -} diff --git a/src/main/java/a8k/extui/controler/ExtApiControler.java b/src/main/java/a8k/extui/controler/ExtApiControler.java index babd16f..30dda65 100644 --- a/src/main/java/a8k/extui/controler/ExtApiControler.java +++ b/src/main/java/a8k/extui/controler/ExtApiControler.java @@ -3,7 +3,7 @@ package a8k.extui.controler; import a8k.SpringBootBeanUtil; import a8k.extui.service.ExtApiTabCfgService; import a8k.extui.utils.*; -import a8k.app.type.appret.AppRetV1; +import a8k.extui.type.AppRetV1; import a8k.app.utils.*; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/extui/controler/ExtApiControllerAdvice.java b/src/main/java/a8k/extui/controler/ExtApiControllerAdvice.java index 1ce316b..60f1cab 100644 --- a/src/main/java/a8k/extui/controler/ExtApiControllerAdvice.java +++ b/src/main/java/a8k/extui/controler/ExtApiControllerAdvice.java @@ -1,6 +1,6 @@ package a8k.extui.controler; -import a8k.app.type.appret.AppRetV1; +import a8k.extui.type.AppRetV1; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.ControllerAdvice; diff --git a/src/main/java/a8k/extui/factory/CurveBuilder.java b/src/main/java/a8k/extui/factory/CurveBuilder.java index 9687734..25d2f74 100644 --- a/src/main/java/a8k/extui/factory/CurveBuilder.java +++ b/src/main/java/a8k/extui/factory/CurveBuilder.java @@ -1,6 +1,6 @@ package a8k.extui.factory; -import a8k.extui.bean.ExtApiCurve; +import a8k.extui.type.ExtApiCurve; import java.util.List; import java.util.Vector; diff --git a/src/main/java/a8k/extui/service/ExtApiTabCfgService.java b/src/main/java/a8k/extui/service/ExtApiTabCfgService.java index d7240fa..c388eb9 100644 --- a/src/main/java/a8k/extui/service/ExtApiTabCfgService.java +++ b/src/main/java/a8k/extui/service/ExtApiTabCfgService.java @@ -2,10 +2,10 @@ package a8k.extui.service; import a8k.extui.utils.ExtApiFn; -import a8k.app.service.app.background.BackgroudProcessCtrlService; -import a8k.app.service.app.driver.ctrlservice.TubeFeedingCtrlService; -import a8k.app.service.app.driver.base.PipetteCtrlDriver; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; +import a8k.app.service.background.BackgroudProcessCtrlService; +import a8k.app.service.lowerctrl.TubeFeedingCtrlService; +import a8k.app.hardware.driver.PipetteCtrlDriver; +import a8k.app.hardware.driver.StepMotorCtrlDriver; import a8k.extui.service.calibration.MiniServoReferencePointIniter; import a8k.extui.service.calibration.*; import a8k.extui.service.test.*; diff --git a/src/main/java/a8k/extui/service/LowerDeviceParamMgr.java b/src/main/java/a8k/extui/service/LowerDeviceParamMgr.java index 556e881..8b7f9d5 100644 --- a/src/main/java/a8k/extui/service/LowerDeviceParamMgr.java +++ b/src/main/java/a8k/extui/service/LowerDeviceParamMgr.java @@ -1,7 +1,7 @@ package a8k.extui.service; -import a8k.app.service.dao.LowerDeviceParameterDao; -import a8k.app.service.dao.type.Parameter; +import a8k.app.dao.db.LowerDeviceParameterDao; +import a8k.app.dao.db.type.Parameter; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; import org.springframework.util.Assert; diff --git a/src/main/java/a8k/extui/service/calibration/Hbot2DCodeScanPosCalibration.java b/src/main/java/a8k/extui/service/calibration/Hbot2DCodeScanPosCalibration.java index 14f8cf4..409cb52 100644 --- a/src/main/java/a8k/extui/service/calibration/Hbot2DCodeScanPosCalibration.java +++ b/src/main/java/a8k/extui/service/calibration/Hbot2DCodeScanPosCalibration.java @@ -2,15 +2,15 @@ package a8k.extui.service.calibration; import a8k.extui.utils.ExtApiFn; -import a8k.app.service.app.driver.ctrlservice.HbotMoveCtrlService; -import a8k.app.service.app.driver.base.HbotDriver; -import a8k.app.service.app.driver.base.PipetteCtrlDriver; -import a8k.app.service.app.driver.base.CodeScanerDriver; -import a8k.app.service.app.driver.ctrlservice.ConsumablesScanCtrlService; -import a8k.app.service.param.mgr.Hbot2DCodeScanParamMgr; +import a8k.app.service.lowerctrl.HbotMoveCtrlService; +import a8k.app.hardware.driver.HbotDriver; +import a8k.app.hardware.driver.PipetteCtrlDriver; +import a8k.app.hardware.driver.CodeScanerDriver; +import a8k.app.service.lowerctrl.ConsumablesScanCtrlService; +import a8k.app.service.param.Hbot2DCodeScanParamMgr; import a8k.app.a8ktype.device.ConsumableGroup; -import a8k.app.type.ConsumableScanRawResult; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.type.ConsumableScanRawResult; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import org.slf4j.Logger; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/extui/service/calibration/HbotLargeBottleBSPosCalibration.java b/src/main/java/a8k/extui/service/calibration/HbotLargeBottleBSPosCalibration.java index 7843c67..251a0bd 100644 --- a/src/main/java/a8k/extui/service/calibration/HbotLargeBottleBSPosCalibration.java +++ b/src/main/java/a8k/extui/service/calibration/HbotLargeBottleBSPosCalibration.java @@ -3,14 +3,14 @@ package a8k.extui.service.calibration; import a8k.app.a8ktype.device.ConsumableGroup; import a8k.extui.utils.ExtApiFn; -import a8k.app.service.app.driver.ctrlservice.HbotMoveCtrlService; +import a8k.app.service.lowerctrl.HbotMoveCtrlService; import a8k.app.a8ktype.param.HbotLargeBottleBSPos; -import a8k.app.service.app.driver.base.HbotDriver; -import a8k.app.service.app.driver.base.PipetteCtrlDriver; -import a8k.app.service.app.driver.ctrlservice.HbotMoveExCtrlService; -import a8k.app.service.param.mgr.HbotLargeBottleBSPosMgr; -import a8k.app.type.cfg.Pos2d; -import a8k.app.type.exception.AppException; +import a8k.app.hardware.driver.HbotDriver; +import a8k.app.hardware.driver.PipetteCtrlDriver; +import a8k.app.service.lowerctrl.HbotMoveExCtrlService; +import a8k.app.service.param.HbotLargeBottleBSPosMgr; +import a8k.app.a8ktype.device.Pos2d; +import a8k.app.a8ktype.exception.AppException; import a8k.app.utils.ZJsonHelper; import com.fasterxml.jackson.databind.node.ObjectNode; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/extui/service/calibration/HbotLittleBSPosCalibration.java b/src/main/java/a8k/extui/service/calibration/HbotLittleBSPosCalibration.java index 7315fbc..c50c683 100644 --- a/src/main/java/a8k/extui/service/calibration/HbotLittleBSPosCalibration.java +++ b/src/main/java/a8k/extui/service/calibration/HbotLittleBSPosCalibration.java @@ -4,15 +4,15 @@ package a8k.extui.service.calibration; import a8k.app.a8ktype.device.ConsumableGroup; import a8k.app.constant.AppConstant; import a8k.extui.utils.ExtApiFn; -import a8k.app.service.app.driver.ctrlservice.HbotMoveCtrlService; -import a8k.app.service.param.mgr.HbotLittleBSPosMgr; +import a8k.app.service.lowerctrl.HbotMoveCtrlService; +import a8k.app.service.param.HbotLittleBSPosMgr; import a8k.app.a8ktype.param.HbotLittleBSPos; -import a8k.app.service.app.driver.base.HbotDriver; -import a8k.app.service.app.driver.base.PipetteCtrlDriver; -import a8k.app.service.app.driver.ctrlservice.HbotMoveExCtrlService; -import a8k.app.type.*; -import a8k.app.type.cfg.Pos2d; -import a8k.app.type.exception.AppException; +import a8k.app.hardware.driver.HbotDriver; +import a8k.app.hardware.driver.PipetteCtrlDriver; +import a8k.app.service.lowerctrl.HbotMoveExCtrlService; +import a8k.app.a8ktype.type.*; +import a8k.app.a8ktype.device.Pos2d; +import a8k.app.a8ktype.exception.AppException; import a8k.app.utils.ZJsonHelper; import com.fasterxml.jackson.databind.node.ObjectNode; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/extui/service/calibration/HbotProbeSubstancePosCalibration.java b/src/main/java/a8k/extui/service/calibration/HbotProbeSubstancePosCalibration.java index a9fc91f..791df45 100644 --- a/src/main/java/a8k/extui/service/calibration/HbotProbeSubstancePosCalibration.java +++ b/src/main/java/a8k/extui/service/calibration/HbotProbeSubstancePosCalibration.java @@ -3,16 +3,16 @@ package a8k.extui.service.calibration; import a8k.app.constant.AppConstant; import a8k.extui.utils.ExtApiFn; -import a8k.app.service.app.driver.ctrlservice.HbotMoveCtrlService; -import a8k.app.service.param.mgr.HbotProbeSubstancePosMgr; +import a8k.app.service.lowerctrl.HbotMoveCtrlService; +import a8k.app.service.param.HbotProbeSubstancePosMgr; import a8k.app.a8ktype.param.HbotProbeSubstancePos; -import a8k.app.service.app.driver.ctrlservice.HbotMoveExCtrlService; -import a8k.app.service.app.driver.base.HbotDriver; -import a8k.app.service.app.driver.base.PipetteCtrlDriver; +import a8k.app.service.lowerctrl.HbotMoveExCtrlService; +import a8k.app.hardware.driver.HbotDriver; +import a8k.app.hardware.driver.PipetteCtrlDriver; import a8k.app.a8ktype.device.ConsumableGroup; -import a8k.app.type.LittleBottleConsumableRefPoint; -import a8k.app.type.cfg.Pos2d; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.type.LittleBottleConsumableRefPoint; +import a8k.app.a8ktype.device.Pos2d; +import a8k.app.a8ktype.exception.AppException; import a8k.app.utils.ZJsonHelper; import com.fasterxml.jackson.databind.node.ObjectNode; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/extui/service/calibration/HbotSamplePosCalibration.java b/src/main/java/a8k/extui/service/calibration/HbotSamplePosCalibration.java index db4407f..1b8335c 100644 --- a/src/main/java/a8k/extui/service/calibration/HbotSamplePosCalibration.java +++ b/src/main/java/a8k/extui/service/calibration/HbotSamplePosCalibration.java @@ -2,21 +2,21 @@ package a8k.extui.service.calibration; import a8k.extui.utils.ExtApiFn; -import a8k.app.service.app.driver.ctrlservice.TubePreProcesModuleExCtrlService; -import a8k.app.service.app.driver.ctrlservice.HbotMoveCtrlService; -import a8k.app.service.app.driver.ext.MotorMoveZeroExDriver; +import a8k.app.service.lowerctrl.TubePreProcesModuleExCtrlService; +import a8k.app.service.lowerctrl.HbotMoveCtrlService; +import a8k.app.hardware.extdriver.MotorMoveZeroExDriver; import a8k.app.a8ktype.param.HbotSamplePos; -import a8k.app.service.app.driver.base.HbotDriver; -import a8k.app.service.app.driver.base.PipetteCtrlDriver; -import a8k.app.service.app.driver.ctrlservice.HbotMoveExCtrlService; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; -import a8k.app.service.app.driver.base.type.StepMotorMId; -import a8k.app.service.app.driver.ext.MotorEnableExDriver; -import a8k.app.service.app.driver.ctrlservice.TubePreProcesModuleCtrlService; -import a8k.app.service.param.mgr.HbotSamplePosParamMgr; -import a8k.app.type.cfg.Pos2d; -import a8k.app.type.cfg.Pos3d; -import a8k.app.type.exception.AppException; +import a8k.app.hardware.driver.HbotDriver; +import a8k.app.hardware.driver.PipetteCtrlDriver; +import a8k.app.service.lowerctrl.HbotMoveExCtrlService; +import a8k.app.hardware.driver.StepMotorCtrlDriver; +import a8k.app.hardware.driver.type.StepMotorMId; +import a8k.app.hardware.extdriver.MotorEnableExDriver; +import a8k.app.service.lowerctrl.TubePreProcesModuleCtrlService; +import a8k.app.service.param.HbotSamplePosParamMgr; +import a8k.app.a8ktype.device.Pos2d; +import a8k.app.a8ktype.device.Pos3d; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import org.aspectj.lang.annotation.Aspect; import org.slf4j.Logger; diff --git a/src/main/java/a8k/extui/service/calibration/HbotTipPosCalibration.java b/src/main/java/a8k/extui/service/calibration/HbotTipPosCalibration.java index eca4988..9c6aeeb 100644 --- a/src/main/java/a8k/extui/service/calibration/HbotTipPosCalibration.java +++ b/src/main/java/a8k/extui/service/calibration/HbotTipPosCalibration.java @@ -3,16 +3,16 @@ package a8k.extui.service.calibration; import a8k.app.constant.AppConstant; import a8k.extui.utils.ExtApiFn; -import a8k.app.service.app.driver.ctrlservice.HbotMoveCtrlService; -import a8k.app.service.param.exmgr.HbotConsumableParamMgr; -import a8k.app.service.param.mgr.HbotTipPosMgr; -import a8k.app.service.app.driver.base.HbotDriver; -import a8k.app.service.app.driver.base.PipetteCtrlDriver; -import a8k.app.service.app.driver.ctrlservice.HbotMoveExCtrlService; -import a8k.app.type.*; -import a8k.app.type.cfg.Pos2d; -import a8k.app.type.cfg.Pos3d; -import a8k.app.type.exception.AppException; +import a8k.app.service.lowerctrl.HbotMoveCtrlService; +import a8k.app.dao.exparam.HbotConsumableParamMgr; +import a8k.app.service.param.HbotTipPosMgr; +import a8k.app.hardware.driver.HbotDriver; +import a8k.app.hardware.driver.PipetteCtrlDriver; +import a8k.app.service.lowerctrl.HbotMoveExCtrlService; +import a8k.app.a8ktype.type.*; +import a8k.app.a8ktype.device.Pos2d; +import a8k.app.a8ktype.device.Pos3d; +import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.device.TipGroup; import a8k.app.utils.ZList; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/extui/service/calibration/MiniServoReferencePointIniter.java b/src/main/java/a8k/extui/service/calibration/MiniServoReferencePointIniter.java index f9ba679..bcf23a2 100644 --- a/src/main/java/a8k/extui/service/calibration/MiniServoReferencePointIniter.java +++ b/src/main/java/a8k/extui/service/calibration/MiniServoReferencePointIniter.java @@ -2,9 +2,9 @@ package a8k.extui.service.calibration; import a8k.extui.utils.ExtApiFn; -import a8k.app.service.app.driver.base.MiniServoDriver; -import a8k.app.service.app.driver.base.type.MiniServoMId; -import a8k.app.type.exception.AppException; +import a8k.app.hardware.driver.MiniServoDriver; +import a8k.app.hardware.driver.type.MiniServoMId; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/extui/service/calibration/OptModuleParamCalibration.java b/src/main/java/a8k/extui/service/calibration/OptModuleParamCalibration.java index 53ab0b9..352dd98 100644 --- a/src/main/java/a8k/extui/service/calibration/OptModuleParamCalibration.java +++ b/src/main/java/a8k/extui/service/calibration/OptModuleParamCalibration.java @@ -2,20 +2,20 @@ package a8k.extui.service.calibration; import a8k.app.a8ktype.device.ConsumableGroup; import a8k.app.a8ktype.device.IncubatorPos; -import a8k.extui.bean.A8kScanCurve; +import a8k.extui.type.A8kScanCurve; import a8k.extui.utils.ExtApiFn; import a8k.extui.utils.ExtApiStatu; -import a8k.app.service.app.driver.ctrlservice.OptScanModuleCtrlService; -import a8k.app.service.app.driver.ctrlservice.PlateBoxCtrlService; -import a8k.app.service.app.driver.base.OptModuleDriver; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; -import a8k.app.service.app.driver.base.type.StepMotorMId; -import a8k.app.service.app.driver.ext.MotorEnableExDriver; -import a8k.app.service.param.mgr.OptModuleExtParamsMgr; +import a8k.app.service.lowerctrl.OptScanModuleCtrlService; +import a8k.app.service.lowerctrl.PlateBoxCtrlService; +import a8k.app.hardware.driver.OptModuleDriver; +import a8k.app.hardware.driver.StepMotorCtrlDriver; +import a8k.app.hardware.driver.type.StepMotorMId; +import a8k.app.hardware.extdriver.MotorEnableExDriver; +import a8k.app.service.param.OptModuleExtParamsMgr; import a8k.app.a8ktype.param.OptModuleExtParam; -import a8k.app.service.dao.type.Parameter; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kOptType; -import a8k.app.type.exception.AppException; +import a8k.app.dao.db.type.Parameter; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kOptType; +import a8k.app.a8ktype.exception.AppException; import a8k.app.utils.ZList; import a8k.app.utils.opt_gain_convert.OptGainConvert; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/extui/service/calibration/ReactionPlatesTransmitControlerCalibration.java b/src/main/java/a8k/extui/service/calibration/ReactionPlatesTransmitControlerCalibration.java index 3778ec1..998429a 100644 --- a/src/main/java/a8k/extui/service/calibration/ReactionPlatesTransmitControlerCalibration.java +++ b/src/main/java/a8k/extui/service/calibration/ReactionPlatesTransmitControlerCalibration.java @@ -1,26 +1,26 @@ package a8k.extui.service.calibration; import a8k.extui.utils.ExtApiFn; -import a8k.app.service.app.driver.ctrlservice.HbotMoveCtrlService; -import a8k.app.service.param.mgr.HbotFixedPosParamMgr; -import a8k.app.service.param.mgr.OptModuleParamsMgr; -import a8k.app.service.param.mgr.PlatesBoxPosParamMgr; -import a8k.app.service.param.mgr.TurntablePosParamMgr; -import a8k.app.service.app.driver.ctrlservice.OptScanModuleCtrlService; -import a8k.app.service.app.driver.ctrlservice.PlateBoxCtrlService; -import a8k.app.service.app.driver.base.HbotDriver; -import a8k.app.service.app.driver.base.MiniServoDriver; -import a8k.app.service.app.driver.base.PipetteCtrlDriver; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; -import a8k.app.service.app.driver.base.type.StepMotorMId; -import a8k.app.service.app.driver.ctrlservice.HbotMoveExCtrlService; -import a8k.app.service.app.driver.ctrlservice.TurnableMoveCtrlService; -import a8k.app.service.app.driver.ext.MotorEnableExDriver; +import a8k.app.service.lowerctrl.HbotMoveCtrlService; +import a8k.app.service.param.HbotFixedPosParamMgr; +import a8k.app.service.param.OptModuleParamsMgr; +import a8k.app.service.param.PlatesBoxPosParamMgr; +import a8k.app.service.param.TurntablePosParamMgr; +import a8k.app.service.lowerctrl.OptScanModuleCtrlService; +import a8k.app.service.lowerctrl.PlateBoxCtrlService; +import a8k.app.hardware.driver.HbotDriver; +import a8k.app.hardware.driver.MiniServoDriver; +import a8k.app.hardware.driver.PipetteCtrlDriver; +import a8k.app.hardware.driver.StepMotorCtrlDriver; +import a8k.app.hardware.driver.type.StepMotorMId; +import a8k.app.service.lowerctrl.HbotMoveExCtrlService; +import a8k.app.service.lowerctrl.TurnableMoveCtrlService; +import a8k.app.hardware.extdriver.MotorEnableExDriver; import a8k.app.a8ktype.param.OptModuleParam; import a8k.app.a8ktype.device.ConsumableGroup; import a8k.app.a8ktype.device.IncubatorPos; -import a8k.app.type.cfg.Pos3d; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.device.Pos3d; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/extui/service/calibration/TemperatureCtrlParamCalibration.java b/src/main/java/a8k/extui/service/calibration/TemperatureCtrlParamCalibration.java index 2ab5c95..87148e2 100644 --- a/src/main/java/a8k/extui/service/calibration/TemperatureCtrlParamCalibration.java +++ b/src/main/java/a8k/extui/service/calibration/TemperatureCtrlParamCalibration.java @@ -2,10 +2,10 @@ package a8k.extui.service.calibration; import a8k.extui.utils.ExtApiFn; -import a8k.app.service.app.driver.base.TemperatureControlDriver; -import a8k.app.service.param.mgr.TemperatureCtrlParamMgr; +import a8k.app.hardware.driver.TemperatureControlDriver; +import a8k.app.service.param.TemperatureCtrlParamMgr; import a8k.app.a8ktype.param.TemperatureCtrlParam; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.exception.AppException; import a8k.app.utils.ZJsonHelper; import com.fasterxml.jackson.databind.node.ObjectNode; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/extui/service/calibration/TubeFeedingModulePosCalibration.java b/src/main/java/a8k/extui/service/calibration/TubeFeedingModulePosCalibration.java index 8967fa4..a076d9d 100644 --- a/src/main/java/a8k/extui/service/calibration/TubeFeedingModulePosCalibration.java +++ b/src/main/java/a8k/extui/service/calibration/TubeFeedingModulePosCalibration.java @@ -1,20 +1,20 @@ package a8k.extui.service.calibration; import a8k.extui.utils.ExtApiFn; -import a8k.app.hardware.A8kCanBusService; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; -import a8k.app.service.app.driver.ext.MotorEnableExDriver; -import a8k.app.service.app.driver.ext.MotorMoveZeroExDriver; -import a8k.app.service.app.driver.ctrlservice.TubeFeedingExCtrlService; -import a8k.app.service.app.driver.base.type.StepMotorMId; -import a8k.app.service.app.driver.ctrlservice.TubeFeedingCtrlService; -import a8k.app.service.param.mgr.TubeFeedingModuleParamMgr; -import a8k.app.service.dao.type.Parameter; -import a8k.app.type.TubeFeedingModulePos; -import a8k.app.type.TubeFeedingModuleSetting; -import a8k.app.type.TubeHolderScanResult; -import a8k.app.type.ecode.AECodeError; -import a8k.app.type.exception.AppException; +import a8k.app.hardware.basedriver.A8kCanBusService; +import a8k.app.hardware.driver.StepMotorCtrlDriver; +import a8k.app.hardware.extdriver.MotorEnableExDriver; +import a8k.app.hardware.extdriver.MotorMoveZeroExDriver; +import a8k.app.service.lowerctrl.TubeFeedingExCtrlService; +import a8k.app.hardware.driver.type.StepMotorMId; +import a8k.app.service.lowerctrl.TubeFeedingCtrlService; +import a8k.app.service.param.TubeFeedingModuleParamMgr; +import a8k.app.dao.db.type.Parameter; +import a8k.app.a8ktype.param.TubeFeedingModulePos; +import a8k.app.a8ktype.param.TubeFeedingModuleSetting; +import a8k.app.a8ktype.type.TubeHolderScanResult; +import a8k.app.a8ktype.error.AECodeError; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/extui/service/calibration/TubePreProcesPosCalibration.java b/src/main/java/a8k/extui/service/calibration/TubePreProcesPosCalibration.java index ba3d123..c5cb9b3 100644 --- a/src/main/java/a8k/extui/service/calibration/TubePreProcesPosCalibration.java +++ b/src/main/java/a8k/extui/service/calibration/TubePreProcesPosCalibration.java @@ -1,20 +1,20 @@ package a8k.extui.service.calibration; import a8k.extui.utils.ExtApiFn; -import a8k.app.service.app.driver.base.MiniServoDriver; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; -import a8k.app.service.app.driver.base.type.MiniServoMId; -import a8k.app.service.app.driver.base.type.StepMotorMId; -import a8k.app.service.app.driver.ctrlservice.TubePreProcesModuleExCtrlService; -import a8k.app.service.app.driver.ext.MotorEnableExDriver; -import a8k.app.service.app.driver.ext.MotorMoveZeroExDriver; -import a8k.app.service.app.driver.ctrlservice.TubePreProcesModuleCtrlService; -import a8k.app.service.param.mgr.TubePreProcesPosParamMgr; -import a8k.app.type.TubePreProcessGripperPos; -import a8k.app.type.TubePreProcessTubeClamp; -import a8k.app.type.TubePreProcessYPos; +import a8k.app.hardware.driver.MiniServoDriver; +import a8k.app.hardware.driver.StepMotorCtrlDriver; +import a8k.app.hardware.driver.type.MiniServoMId; +import a8k.app.hardware.driver.type.StepMotorMId; +import a8k.app.service.lowerctrl.TubePreProcesModuleExCtrlService; +import a8k.app.hardware.extdriver.MotorEnableExDriver; +import a8k.app.hardware.extdriver.MotorMoveZeroExDriver; +import a8k.app.service.lowerctrl.TubePreProcesModuleCtrlService; +import a8k.app.service.param.TubePreProcesPosParamMgr; +import a8k.app.a8ktype.param.TubePreProcessGripperPos; +import a8k.app.a8ktype.param.TubePreProcessTubeClamp; +import a8k.app.a8ktype.param.TubePreProcessYPos; import a8k.app.a8ktype.param.TubePreProcessZAxisPos; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.exception.AppException; import a8k.app.utils.ZJsonHelper; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/extui/service/test/MainflowCtrlTestService.java b/src/main/java/a8k/extui/service/test/MainflowCtrlTestService.java index e27483d..8321c41 100644 --- a/src/main/java/a8k/extui/service/test/MainflowCtrlTestService.java +++ b/src/main/java/a8k/extui/service/test/MainflowCtrlTestService.java @@ -5,36 +5,35 @@ import a8k.app.a8kproj.fakeproj.*; import a8k.app.a8ktype.device.ConsumableGroup; import a8k.app.a8ktype.device.IncubatorPos; import a8k.app.constant.AppConstant; +import a8k.app.dao.db.A8kProjExtInfoCardDao; +import a8k.app.dao.db.ProjOptInfoDao; +import a8k.app.dao.db.ProjectBaseInfoDao; +import a8k.app.service.statemgr.*; import a8k.extui.utils.ExtApiFn; -import a8k.app.service.app.appctrl.AppConsumablesScanService; -import a8k.app.service.app.appctrl.AppDeviceCtrlService; -import a8k.app.service.app.appctrl.AppTubeSettingMgrService; -import a8k.app.service.app.appctrl.mainflowctrl.MainFlowCtrlScheduler; -import a8k.app.service.app.appctrl.mainflowctrl.PublicAreaResourceMgr; -import a8k.app.service.app.appctrl.mainflowctrl.base.A8kStepAction; -import a8k.app.service.app.appctrl.mainflowctrl.base.PublicAreaResource; -import a8k.app.service.app.appstate.statemgr.*; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.service.app.appstate.type.*; -import a8k.app.service.app.appstate.type.state.A8kWorkState; -import a8k.app.service.app.driver.ctrlservice.DeviceInitCtrlService; -import a8k.app.service.app.driver.ctrlservice.OptScanModuleCtrlService; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; -import a8k.app.service.app.driver.base.type.StepMotorMId; -import a8k.app.service.app.driver.ext.MotorEnableExDriver; -import a8k.app.service.dao.A8kProjExtInfoCardDao; -import a8k.app.service.dao.ProjectBaseInfoDao; -import a8k.app.service.dao.ProjOptInfoDao; +import a8k.app.service.mainctrl.AppConsumablesScanService; +import a8k.app.service.mainctrl.AppDeviceCtrlService; +import a8k.app.service.mainctrl.AppTubeSettingMgrService; +import a8k.app.service.mainctrl.mainflowctrl.MainFlowCtrlScheduler; +import a8k.app.service.mainctrl.mainflowctrl.PublicAreaResourceMgr; +import a8k.app.service.mainctrl.mainflowctrl.base.A8kStepAction; +import a8k.app.service.mainctrl.mainflowctrl.base.PublicAreaResource; +import a8k.app.a8ktype.state.*; +import a8k.app.a8ktype.state.enumtype.A8kWorkState; +import a8k.app.service.lowerctrl.DeviceInitCtrlService; +import a8k.app.service.lowerctrl.OptScanModuleCtrlService; +import a8k.app.hardware.driver.StepMotorCtrlDriver; +import a8k.app.hardware.driver.type.StepMotorMId; +import a8k.app.hardware.extdriver.MotorEnableExDriver; import a8k.extui.service.test.state.TestModeState; import a8k.extui.service.test.state.VirtualDevice; -import a8k.app.type.*; -import a8k.app.type.checkpoint.CheckResult; -import a8k.app.type.consumables.ConsumablesScanReportErrorType; -import a8k.app.type.exception.AppException; -import a8k.app.type.tube_setting.TubeHolderSetting; -import a8k.app.type.tube_setting.TubeSetting; -import a8k.app.type.type.A8kTubeHolderType; -import a8k.app.type.type.BloodType; +import a8k.app.a8ktype.type.*; +import a8k.app.a8ktype.others.checkpoint.CheckResult; +import a8k.app.a8ktype.error.ConsumablesScanReportErrorType; +import a8k.app.a8ktype.exception.AppException; +import a8k.app.a8ktype.ui.TubeHolderSetting; +import a8k.app.a8ktype.ui.TubeSetting; +import a8k.app.a8ktype.device.A8kTubeHolderType; +import a8k.app.a8ktype.device.BloodType; import a8k.app.a8ktype.device.TipGroup; import a8k.app.utils.ZList; import jakarta.annotation.Resource; @@ -63,7 +62,7 @@ public class MainflowCtrlTestService { @Resource AppTubeSettingMgrService appTubeSettingMgrService; @Resource - GStateService gstate; + GStateMgrService gstate; @Resource DeviceWorkStateMgrService deviceWorkStateMgrService; @Resource @@ -73,7 +72,7 @@ public class MainflowCtrlTestService { @Resource OptScanModuleStateMgrService optScanModuleStateMgrService; @Resource - PublicAreaResourceMgr publicAreaResourceMgr; + PublicAreaResourceMgr publicAreaResourceMgr; // // DB // diff --git a/src/main/java/a8k/extui/service/test/PosMeasureUtils.java b/src/main/java/a8k/extui/service/test/PosMeasureUtils.java index cf55651..58f24ea 100644 --- a/src/main/java/a8k/extui/service/test/PosMeasureUtils.java +++ b/src/main/java/a8k/extui/service/test/PosMeasureUtils.java @@ -2,13 +2,13 @@ package a8k.extui.service.test; import a8k.extui.utils.ExtApiFn; -import a8k.app.service.app.driver.base.HbotDriver; -import a8k.app.service.app.driver.base.PipetteCtrlDriver; -import a8k.app.service.app.driver.ctrlservice.HbotMoveCtrlService; -import a8k.app.service.app.driver.ext.MotorEnableExDriver; -import a8k.app.service.param.mgr.PipetteGunLLDParamMgr; -import a8k.app.type.cfg.Pos2d; -import a8k.app.type.exception.AppException; +import a8k.app.hardware.driver.HbotDriver; +import a8k.app.hardware.driver.PipetteCtrlDriver; +import a8k.app.service.lowerctrl.HbotMoveCtrlService; +import a8k.app.hardware.extdriver.MotorEnableExDriver; +import a8k.app.service.param.PipetteGunLLDParamMgr; +import a8k.app.a8ktype.device.Pos2d; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/extui/service/test/TestStateMgrService.java b/src/main/java/a8k/extui/service/test/TestStateMgrService.java index 562b336..e2907c2 100644 --- a/src/main/java/a8k/extui/service/test/TestStateMgrService.java +++ b/src/main/java/a8k/extui/service/test/TestStateMgrService.java @@ -1,16 +1,16 @@ package a8k.extui.service.test; -import a8k.app.service.dao.A8kProjExtInfoCardDao; -import a8k.app.service.dao.ProjectBaseInfoDao; -import a8k.app.service.dao.ProjOptInfoDao; +import a8k.app.dao.db.A8kProjExtInfoCardDao; +import a8k.app.dao.db.ProjOptInfoDao; +import a8k.app.dao.db.ProjectBaseInfoDao; import a8k.app.a8kproj.fakeproj.FakeProjInfoFactory; import a8k.extui.service.test.state.TestModeState; import a8k.extui.service.test.state.VirtualDevice; -import a8k.app.type.ConsumableOneChRawResult; -import a8k.app.type.TubeHolderScanResult; -import a8k.app.type.TubesScanResult; -import a8k.app.type.type.A8kTubeHolderType; +import a8k.app.a8ktype.type.ConsumableOneChRawResult; +import a8k.app.a8ktype.type.TubeHolderScanResult; +import a8k.app.a8ktype.type.TubesScanResult; +import a8k.app.a8ktype.device.A8kTubeHolderType; import a8k.app.utils.ReactionPlate2DCodeHelper; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; @@ -26,9 +26,9 @@ public class TestStateMgrService { @Resource A8kProjExtInfoCardDao a8KProjExtInfoCardDao; @Resource - ProjOptInfoDao projOptInfoDao; + ProjOptInfoDao projOptInfoDao; @Resource - ProjectBaseInfoDao projectBaseInfoDao; + ProjectBaseInfoDao projectBaseInfoDao; public void addProjInfo(Class projClass) { diff --git a/src/main/java/a8k/extui/service/test/VirtualDeviceSimulationTest.java b/src/main/java/a8k/extui/service/test/VirtualDeviceSimulationTest.java index 448f91d..8df608a 100644 --- a/src/main/java/a8k/extui/service/test/VirtualDeviceSimulationTest.java +++ b/src/main/java/a8k/extui/service/test/VirtualDeviceSimulationTest.java @@ -2,31 +2,31 @@ package a8k.extui.service.test; import a8k.SpringBootBeanUtil; import a8k.app.a8kproj.fakeproj.*; +import a8k.app.dao.db.ReactionRecordDao; import a8k.extui.utils.ExtApiFn; import a8k.app.factory.ZAppPromoptFactory; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.app.service.app.appctrl.AppDeviceCtrlService; -import a8k.app.service.app.appctrl.AppTubeSettingMgrService; -import a8k.app.service.app.appctrl.mainflowctrl.base.A8kActionStepType; -import a8k.app.service.app.appctrl.mainflowctrl.base.AppActionErrorContext; -import a8k.app.service.app.appstate.GStateService; -import a8k.app.service.app.driver.ctrlservice.DeviceInitCtrlService; +import a8k.app.service.mainctrl.AppDeviceCtrlService; +import a8k.app.service.mainctrl.AppTubeSettingMgrService; +import a8k.app.service.mainctrl.mainflowctrl.base.A8kActionStepType; +import a8k.app.service.mainctrl.mainflowctrl.base.AppActionErrorContext; +import a8k.app.service.statemgr.GStateMgrService; +import a8k.app.service.lowerctrl.DeviceInitCtrlService; import a8k.app.service.bases.AppEventBusService; -import a8k.app.service.bases.appevent.*; -import a8k.app.service.dao.ReactionRecordDao; -import a8k.app.service.dao.type.ProjExtInfoCard; -import a8k.app.service.dao.type.ReactionResultRecord; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kResultUnit; +import a8k.app.a8ktype.appevent.*; +import a8k.app.dao.db.type.ProjExtInfoCard; +import a8k.app.dao.db.type.ReactionResultRecord; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kResultUnit; import a8k.extui.service.test.state.VirtualDevice; -import a8k.app.type.ConsumableOneChRawResult; -import a8k.app.type.ReactionResult; -import a8k.app.type.ecode.*; -import a8k.app.type.exception.AppException; -import a8k.app.type.reaction_result_type.ReactionResultStatus; -import a8k.app.type.type.A8kTubeHolderType; -import a8k.app.type.type.BloodType; -import a8k.app.type.ui.ZAppPromopt; -import a8k.app.utils.A8kPacketBuilder; +import a8k.app.a8ktype.type.ConsumableOneChRawResult; +import a8k.app.a8ktype.type.ReactionResult; +import a8k.app.a8ktype.error.*; +import a8k.app.a8ktype.exception.AppException; +import a8k.app.a8ktype.opttype.ReactionResultStatus; +import a8k.app.a8ktype.device.A8kTubeHolderType; +import a8k.app.a8ktype.device.BloodType; +import a8k.app.a8ktype.ui.ZAppPromopt; +import a8k.app.factory.A8kPacketFactory; import a8k.app.utils.ZDateUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; @@ -37,9 +37,9 @@ import java.util.List; @Component public class VirtualDeviceSimulationTest { @Resource - VirtualDevice virtualDevice; + VirtualDevice virtualDevice; @Resource - GStateService gstate; + GStateMgrService gstate; @Resource AppEventBusService eventBus; @@ -68,13 +68,13 @@ public class VirtualDeviceSimulationTest { public void insertVirtualIdCard() { ProjExtInfoCard idCardInfo = new FAKE_PROJ_01_FLOW1().buildProjCardInfo(); virtualDevice.setMountIdCard(idCardInfo); - eventBus.pushEvent(new A8kHardwareReport(A8kPacketBuilder.build_event_a8000_idcard_online())); + eventBus.pushEvent(new A8kHardwareReport(A8kPacketFactory.build_event_a8000_idcard_online())); } @ExtApiFn(name = "模拟移除虚拟ID卡", group = "虚拟操作", order = 201) public void removeVirtualIdCard() { virtualDevice.setMountIdCard(null); - eventBus.pushEvent(new A8kHardwareReport(A8kPacketBuilder.build_event_a8000_idcard_offline())); + eventBus.pushEvent(new A8kHardwareReport(A8kPacketFactory.build_event_a8000_idcard_offline())); } diff --git a/src/main/java/a8k/extui/service/test/state/TestModeState.java b/src/main/java/a8k/extui/service/test/state/TestModeState.java index 5a69647..20b6186 100644 --- a/src/main/java/a8k/extui/service/test/state/TestModeState.java +++ b/src/main/java/a8k/extui/service/test/state/TestModeState.java @@ -1,6 +1,6 @@ package a8k.extui.service.test.state; -import a8k.app.type.TubeHolderScanResult; +import a8k.app.a8ktype.type.TubeHolderScanResult; import lombok.Data; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/extui/service/test/state/VirtualDevice.java b/src/main/java/a8k/extui/service/test/state/VirtualDevice.java index 0907229..85d7362 100644 --- a/src/main/java/a8k/extui/service/test/state/VirtualDevice.java +++ b/src/main/java/a8k/extui/service/test/state/VirtualDevice.java @@ -1,10 +1,10 @@ package a8k.extui.service.test.state; import a8k.OS; -import a8k.app.service.dao.type.ProjExtInfoCard; -import a8k.app.type.ConsumableOneChRawResult; -import a8k.app.type.ConsumableScanRawResult; -import a8k.app.type.TubeHolderScanResult; +import a8k.app.dao.db.type.ProjExtInfoCard; +import a8k.app.a8ktype.type.ConsumableOneChRawResult; +import a8k.app.a8ktype.type.ConsumableScanRawResult; +import a8k.app.a8ktype.type.TubeHolderScanResult; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/a8k/extui/service/test/utils/FakeReactionResultFactory.java b/src/main/java/a8k/extui/service/test/utils/FakeReactionResultFactory.java index 8e52084..610c812 100644 --- a/src/main/java/a8k/extui/service/test/utils/FakeReactionResultFactory.java +++ b/src/main/java/a8k/extui/service/test/utils/FakeReactionResultFactory.java @@ -1,7 +1,7 @@ package a8k.extui.service.test.utils; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kResultUnit; -import a8k.app.type.ReactionResult; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kResultUnit; +import a8k.app.a8ktype.type.ReactionResult; import a8k.app.utils.ProjInfo; import java.util.ArrayList; diff --git a/src/main/java/a8k/extui/service/verification/A8kOptVerification.java b/src/main/java/a8k/extui/service/verification/A8kOptVerification.java index 7cf07ae..661fb15 100644 --- a/src/main/java/a8k/extui/service/verification/A8kOptVerification.java +++ b/src/main/java/a8k/extui/service/verification/A8kOptVerification.java @@ -2,21 +2,21 @@ package a8k.extui.service.verification; import a8k.app.a8kproj.optalgo.type.OptScanResult; import a8k.app.controler.filemgr.StorageControler; -import a8k.extui.bean.FileToBeDownload; +import a8k.extui.type.FileToBeDownload; import a8k.extui.utils.ExtApiFn; -import a8k.app.service.app.appdata.FileMgrService; -import a8k.app.service.app.appdata.ProjInfoMgrService; -import a8k.app.service.app.driver.ctrlservice.OptScanModuleCtrlService; -import a8k.app.service.app.driver.ctrlservice.PlateBoxCtrlService; -import a8k.app.service.app.driver.base.StepMotorCtrlDriver; -import a8k.app.service.app.driver.base.type.StepMotorMId; -import a8k.app.service.app.driver.ext.MotorEnableExDriver; -import a8k.app.service.param.mgr.OptModuleExtParamsMgr; -import a8k.extui.bean.A8kScanCurve; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kOptType; +import a8k.app.service.data.FileMgrService; +import a8k.app.service.data.ProjInfoMgrService; +import a8k.app.service.lowerctrl.OptScanModuleCtrlService; +import a8k.app.service.lowerctrl.PlateBoxCtrlService; +import a8k.app.hardware.driver.StepMotorCtrlDriver; +import a8k.app.hardware.driver.type.StepMotorMId; +import a8k.app.hardware.extdriver.MotorEnableExDriver; +import a8k.app.service.param.OptModuleExtParamsMgr; +import a8k.extui.type.A8kScanCurve; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kOptType; import a8k.app.a8ktype.device.ConsumableGroup; import a8k.app.a8ktype.device.IncubatorPos; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.exception.AppException; import a8k.app.utils.ProjBuildinInfo; import a8k.app.utils.ZList; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/extui/service/verification/A8kTemperaturaVerfication.java b/src/main/java/a8k/extui/service/verification/A8kTemperaturaVerfication.java index 447e166..13314ed 100644 --- a/src/main/java/a8k/extui/service/verification/A8kTemperaturaVerfication.java +++ b/src/main/java/a8k/extui/service/verification/A8kTemperaturaVerfication.java @@ -1,12 +1,12 @@ package a8k.extui.service.verification; -import a8k.extui.bean.ExtApiCurve; +import a8k.extui.type.ExtApiCurve; import a8k.extui.factory.CurveBuilder; import a8k.extui.utils.ExtApiFn; import a8k.extui.utils.ExtApiStatu; -import a8k.app.service.app.background.TemperatureCtrlService; -import a8k.app.service.app.driver.base.TemperatureControlDriver; -import a8k.app.type.exception.AppException; +import a8k.app.service.background.TemperatureCtrlService; +import a8k.app.hardware.driver.TemperatureControlDriver; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/extui/service/verification/A8kVerificationUtils.java b/src/main/java/a8k/extui/service/verification/A8kVerificationUtils.java index 0a60b6a..731dafa 100644 --- a/src/main/java/a8k/extui/service/verification/A8kVerificationUtils.java +++ b/src/main/java/a8k/extui/service/verification/A8kVerificationUtils.java @@ -1,9 +1,9 @@ package a8k.extui.service.verification; import a8k.extui.utils.ExtApiFn; -import a8k.app.service.app.driver.ctrlservice.DeviceInitCtrlService; -import a8k.app.type.checkpoint.CheckResult; -import a8k.app.type.exception.AppException; +import a8k.app.service.lowerctrl.DeviceInitCtrlService; +import a8k.app.a8ktype.others.checkpoint.CheckResult; +import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/extui/service/verification/PipetteGunVerification.java b/src/main/java/a8k/extui/service/verification/PipetteGunVerification.java index 1667316..25de6fb 100644 --- a/src/main/java/a8k/extui/service/verification/PipetteGunVerification.java +++ b/src/main/java/a8k/extui/service/verification/PipetteGunVerification.java @@ -1,17 +1,18 @@ package a8k.extui.service.verification; import a8k.app.constant.AppConstant; +import a8k.app.service.param.HbotTipPosMgr; +import a8k.app.service.param.PipetteGunExParamMgr; import a8k.extui.utils.ExtApiFn; import a8k.app.hardware.type.LldType; -import a8k.app.service.app.driver.ctrlservice.HbotMoveExCtrlService; -import a8k.app.service.app.driver.base.PipetteCtrlDriver; -import a8k.app.service.app.driver.base.type.PipetteRegIndex; -import a8k.app.service.app.driver.ctrlservice.HbotMoveCtrlService; -import a8k.app.service.param.mgr.*; +import a8k.app.service.lowerctrl.HbotMoveExCtrlService; +import a8k.app.hardware.driver.PipetteCtrlDriver; +import a8k.app.hardware.driver.type.PipetteRegIndex; +import a8k.app.service.lowerctrl.HbotMoveCtrlService; import a8k.app.a8ktype.device.ConsumableGroup; -import a8k.app.type.cfg.Pos3d; -import a8k.app.type.exception.AppException; -import a8k.app.type.pos.TipPos; +import a8k.app.a8ktype.device.Pos3d; +import a8k.app.a8ktype.exception.AppException; +import a8k.app.a8ktype.device.TipPos; import a8k.app.a8ktype.device.TipGroup; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/a8k/extui/bean/A8kScanCurve.java b/src/main/java/a8k/extui/type/A8kScanCurve.java similarity index 91% rename from src/main/java/a8k/extui/bean/A8kScanCurve.java rename to src/main/java/a8k/extui/type/A8kScanCurve.java index 408076c..468544e 100644 --- a/src/main/java/a8k/extui/bean/A8kScanCurve.java +++ b/src/main/java/a8k/extui/type/A8kScanCurve.java @@ -1,4 +1,4 @@ -package a8k.extui.bean; +package a8k.extui.type; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/a8k/app/type/appret/AppRetV1.java b/src/main/java/a8k/extui/type/AppRetV1.java similarity index 86% rename from src/main/java/a8k/app/type/appret/AppRetV1.java rename to src/main/java/a8k/extui/type/AppRetV1.java index eaf7932..58c00b8 100644 --- a/src/main/java/a8k/app/type/appret/AppRetV1.java +++ b/src/main/java/a8k/extui/type/AppRetV1.java @@ -1,9 +1,8 @@ -package a8k.app.type.appret; +package a8k.extui.type; -import a8k.app.type.ecode.AECodeError; -import a8k.app.type.ecode.AppError; -import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.app.type.exception.AppException; +import a8k.app.a8ktype.error.AECodeError; +import a8k.app.a8ktype.error.AppError; +import a8k.app.a8ktype.exception.AppException; import jakarta.validation.ValidationException; import lombok.Getter; import org.springframework.web.method.annotation.HandlerMethodValidationException; diff --git a/src/main/java/a8k/extui/bean/ExtApiCurve.java b/src/main/java/a8k/extui/type/ExtApiCurve.java similarity index 93% rename from src/main/java/a8k/extui/bean/ExtApiCurve.java rename to src/main/java/a8k/extui/type/ExtApiCurve.java index cf1dfad..c68fe15 100644 --- a/src/main/java/a8k/extui/bean/ExtApiCurve.java +++ b/src/main/java/a8k/extui/type/ExtApiCurve.java @@ -1,4 +1,4 @@ -package a8k.extui.bean; +package a8k.extui.type; import java.util.List; diff --git a/src/main/java/a8k/extui/bean/FileToBeDownload.java b/src/main/java/a8k/extui/type/FileToBeDownload.java similarity index 82% rename from src/main/java/a8k/extui/bean/FileToBeDownload.java rename to src/main/java/a8k/extui/type/FileToBeDownload.java index 337b97c..0821426 100644 --- a/src/main/java/a8k/extui/bean/FileToBeDownload.java +++ b/src/main/java/a8k/extui/type/FileToBeDownload.java @@ -1,4 +1,4 @@ -package a8k.extui.bean; +package a8k.extui.type; public class FileToBeDownload { public String url; diff --git a/src/main/java/a8k/extui/bean/FilesToBeDownload.java b/src/main/java/a8k/extui/type/FilesToBeDownload.java similarity index 80% rename from src/main/java/a8k/extui/bean/FilesToBeDownload.java rename to src/main/java/a8k/extui/type/FilesToBeDownload.java index 7168cf7..6eebdc3 100644 --- a/src/main/java/a8k/extui/bean/FilesToBeDownload.java +++ b/src/main/java/a8k/extui/type/FilesToBeDownload.java @@ -1,4 +1,4 @@ -package a8k.extui.bean; +package a8k.extui.type; import java.util.List; diff --git a/src/main/java/a8k/extui/type/echart/EChartDisplay.java b/src/main/java/a8k/extui/type/echart/EChartDisplay.java new file mode 100644 index 0000000..466e212 --- /dev/null +++ b/src/main/java/a8k/extui/type/echart/EChartDisplay.java @@ -0,0 +1,7 @@ +package a8k.extui.type.echart; + +import a8k.extui.type.echart.base.EChartOption; + +public class EChartDisplay { + public EChartOption option; +} diff --git a/src/main/java/a8k/extui/bean/echart/base/AxisLabel.java b/src/main/java/a8k/extui/type/echart/base/AxisLabel.java similarity index 58% rename from src/main/java/a8k/extui/bean/echart/base/AxisLabel.java rename to src/main/java/a8k/extui/type/echart/base/AxisLabel.java index d93f5a5..f109d07 100644 --- a/src/main/java/a8k/extui/bean/echart/base/AxisLabel.java +++ b/src/main/java/a8k/extui/type/echart/base/AxisLabel.java @@ -1,4 +1,4 @@ -package a8k.extui.bean.echart.base; +package a8k.extui.type.echart.base; public class AxisLabel { public Boolean show; diff --git a/src/main/java/a8k/extui/bean/echart/base/AxisOption.java b/src/main/java/a8k/extui/type/echart/base/AxisOption.java similarity index 65% rename from src/main/java/a8k/extui/bean/echart/base/AxisOption.java rename to src/main/java/a8k/extui/type/echart/base/AxisOption.java index c63053d..d533d8c 100644 --- a/src/main/java/a8k/extui/bean/echart/base/AxisOption.java +++ b/src/main/java/a8k/extui/type/echart/base/AxisOption.java @@ -1,4 +1,4 @@ -package a8k.extui.bean.echart.base; +package a8k.extui.type.echart.base; public class AxisOption { String type; diff --git a/src/main/java/a8k/extui/bean/echart/base/DataZoomOption.java b/src/main/java/a8k/extui/type/echart/base/DataZoomOption.java similarity index 80% rename from src/main/java/a8k/extui/bean/echart/base/DataZoomOption.java rename to src/main/java/a8k/extui/type/echart/base/DataZoomOption.java index 7de8400..58eadd5 100644 --- a/src/main/java/a8k/extui/bean/echart/base/DataZoomOption.java +++ b/src/main/java/a8k/extui/type/echart/base/DataZoomOption.java @@ -1,4 +1,4 @@ -package a8k.extui.bean.echart.base; +package a8k.extui.type.echart.base; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/a8k/extui/bean/echart/base/DataZoomOptionIterm.java b/src/main/java/a8k/extui/type/echart/base/DataZoomOptionIterm.java similarity index 69% rename from src/main/java/a8k/extui/bean/echart/base/DataZoomOptionIterm.java rename to src/main/java/a8k/extui/type/echart/base/DataZoomOptionIterm.java index d1177a5..88b3e2e 100644 --- a/src/main/java/a8k/extui/bean/echart/base/DataZoomOptionIterm.java +++ b/src/main/java/a8k/extui/type/echart/base/DataZoomOptionIterm.java @@ -1,4 +1,4 @@ -package a8k.extui.bean.echart.base; +package a8k.extui.type.echart.base; public class DataZoomOptionIterm { public String type; diff --git a/src/main/java/a8k/extui/bean/echart/base/EChartOption.java b/src/main/java/a8k/extui/type/echart/base/EChartOption.java similarity index 79% rename from src/main/java/a8k/extui/bean/echart/base/EChartOption.java rename to src/main/java/a8k/extui/type/echart/base/EChartOption.java index 07d566e..aabd177 100644 --- a/src/main/java/a8k/extui/bean/echart/base/EChartOption.java +++ b/src/main/java/a8k/extui/type/echart/base/EChartOption.java @@ -1,4 +1,4 @@ -package a8k.extui.bean.echart.base; +package a8k.extui.type.echart.base; public class EChartOption { public AxisOption xAxis; diff --git a/src/main/java/a8k/extui/bean/echart/base/GridOption.java b/src/main/java/a8k/extui/type/echart/base/GridOption.java similarity index 80% rename from src/main/java/a8k/extui/bean/echart/base/GridOption.java rename to src/main/java/a8k/extui/type/echart/base/GridOption.java index 75ec010..4babe3b 100644 --- a/src/main/java/a8k/extui/bean/echart/base/GridOption.java +++ b/src/main/java/a8k/extui/type/echart/base/GridOption.java @@ -1,4 +1,4 @@ -package a8k.extui.bean.echart.base; +package a8k.extui.type.echart.base; public class GridOption { public String left; diff --git a/src/main/java/a8k/extui/bean/echart/base/ToolTipOption.java b/src/main/java/a8k/extui/type/echart/base/ToolTipOption.java similarity index 60% rename from src/main/java/a8k/extui/bean/echart/base/ToolTipOption.java rename to src/main/java/a8k/extui/type/echart/base/ToolTipOption.java index 1ca3e91..e3b97e7 100644 --- a/src/main/java/a8k/extui/bean/echart/base/ToolTipOption.java +++ b/src/main/java/a8k/extui/type/echart/base/ToolTipOption.java @@ -1,4 +1,4 @@ -package a8k.extui.bean.echart.base; +package a8k.extui.type.echart.base; public class ToolTipOption { public String trigger; diff --git a/src/main/java/a8k/unittest/TestBeforeRun.java b/src/main/java/a8k/unittest/TestBeforeRun.java index c711cab..70b406f 100644 --- a/src/main/java/a8k/unittest/TestBeforeRun.java +++ b/src/main/java/a8k/unittest/TestBeforeRun.java @@ -1,7 +1,7 @@ package a8k.unittest; -import a8k.app.service.param.mgr.PipetteGunLLDParamMgr; +import a8k.app.service.param.PipetteGunLLDParamMgr; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/unittest/TestOptAnalyzer.java b/src/main/java/a8k/unittest/TestOptAnalyzer.java index 2bbfd45..00193e8 100644 --- a/src/main/java/a8k/unittest/TestOptAnalyzer.java +++ b/src/main/java/a8k/unittest/TestOptAnalyzer.java @@ -3,9 +3,9 @@ package a8k.unittest; import a8k.app.a8kproj.A8kReactionResultComputer; import a8k.app.a8kproj.fakeprojcontext.FakeProjInfoContextFactory; import a8k.app.a8kproj.optalgo.type.OptAlgoAnalysResult; -import a8k.app.service.app.appstate.type.SampleInfo; -import a8k.app.service.dao.type.a8kidcard.zenum.A8kReactionFlowType; -import a8k.app.type.ReactionResult; +import a8k.app.a8ktype.state.SampleInfo; +import a8k.app.dao.db.type.a8kidcard.zenum.A8kReactionFlowType; +import a8k.app.a8ktype.type.ReactionResult; import a8k.app.utils.ProjInfo; import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j;