diff --git a/src/main/java/a8k/app/a8kproj/A8kIdCardDataParseService.java b/src/main/java/a8k/app/a8kproj/A8kIdCardDataParseService.java index eff125c..24b2979 100644 --- a/src/main/java/a8k/app/a8kproj/A8kIdCardDataParseService.java +++ b/src/main/java/a8k/app/a8kproj/A8kIdCardDataParseService.java @@ -4,13 +4,13 @@ import a8k.app.dao.ProjectBaseInfoDao; import a8k.app.optalgo.type.a8kidcard.A8kNormalFn; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.optalgo.type.A8kOptX; -import a8k.app.dao.type.ProjectBaseInfo; +import a8k.app.optalgo.projinfo.ProjectBaseInfo; import a8k.app.optalgo.type.a8kidcard.A8kPiecewiseFn; import a8k.app.optalgo.type.a8kidcard.A8kResultBuilderFn; import a8k.app.optalgo.type.a8kidcard.zenum.A8kFnType; import a8k.app.optalgo.type.a8kidcard.zenum.A8kResultUnit; import a8k.app.optalgo.type.a8kidcard.A8kOptFnFormula; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import a8k.app.a8ktype.error.AppError; import a8k.app.a8ktype.exception.AppException; import a8k.app.utils.ZDateUtils; diff --git a/src/main/java/a8k/app/a8ktype/appevent/AppIDCardMountEvent.java b/src/main/java/a8k/app/a8ktype/appevent/AppIDCardMountEvent.java index e671ce0..3c3436e 100644 --- a/src/main/java/a8k/app/a8ktype/appevent/AppIDCardMountEvent.java +++ b/src/main/java/a8k/app/a8ktype/appevent/AppIDCardMountEvent.java @@ -1,8 +1,8 @@ package a8k.app.a8ktype.appevent; -import a8k.app.dao.type.A8kProjInfoCardBreif; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.A8kProjInfoCardBreif; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; public class AppIDCardMountEvent extends AppEvent { public A8kProjInfoCardBreif projectInfo; diff --git a/src/main/java/a8k/app/a8ktype/state/IncubationSubTank.java b/src/main/java/a8k/app/a8ktype/state/IncubationSubTank.java index 722abe3..1ca4a6d 100644 --- a/src/main/java/a8k/app/a8ktype/state/IncubationSubTank.java +++ b/src/main/java/a8k/app/a8ktype/state/IncubationSubTank.java @@ -5,8 +5,8 @@ import a8k.app.a8ktype.device.IncubatorPos; import a8k.app.a8ktype.error.AppError; import a8k.app.a8ktype.device.BloodType; import a8k.app.a8ktype.type.ProjBriefInfo; -import a8k.app.dao.type.ProjExtInfoCard; -import a8k.app.utils.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/src/main/java/a8k/app/a8ktype/state/OptScanModule.java b/src/main/java/a8k/app/a8ktype/state/OptScanModule.java index f007640..0445a34 100644 --- a/src/main/java/a8k/app/a8ktype/state/OptScanModule.java +++ b/src/main/java/a8k/app/a8ktype/state/OptScanModule.java @@ -3,8 +3,8 @@ package a8k.app.a8ktype.state; import a8k.app.a8ktype.state.enumtype.OptScanModuleState; import a8k.app.a8ktype.device.BloodType; import a8k.app.a8ktype.type.ProjBriefInfo; -import a8k.app.dao.type.ProjExtInfoCard; -import a8k.app.utils.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/a8k/app/a8ktype/state/ProjectTaskContext.java b/src/main/java/a8k/app/a8ktype/state/ProjectTaskContext.java index 84c4d0f..12b3fd8 100644 --- a/src/main/java/a8k/app/a8ktype/state/ProjectTaskContext.java +++ b/src/main/java/a8k/app/a8ktype/state/ProjectTaskContext.java @@ -4,12 +4,12 @@ import a8k.SpringBootBeanUtil; import a8k.app.optalgo.type.OptScanResult; import a8k.app.a8ktype.device.*; import a8k.app.a8ktype.param.type.A8kSamplePos; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import a8k.app.optalgo.type.a8kidcard.zenum.A8kOptType; import a8k.app.optalgo.type.a8kidcard.zenum.A8kReactionFlowType; import a8k.app.service.exparam.HbotConsumableExParamMgr; -import a8k.app.utils.ProjBuildinInfo; -import a8k.app.utils.ProjInfoReader; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; +import a8k.app.optalgo.type.ProjInfoReader; import a8k.app.utils.ZJsonHelper; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/a8k/app/a8ktype/state/Tube.java b/src/main/java/a8k/app/a8ktype/state/Tube.java index 6f98a9e..bf21587 100644 --- a/src/main/java/a8k/app/a8ktype/state/Tube.java +++ b/src/main/java/a8k/app/a8ktype/state/Tube.java @@ -4,8 +4,7 @@ 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 com.fasterxml.jackson.annotation.JsonIgnore; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; 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 f0f1413..94a1462 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 @@ -4,7 +4,7 @@ import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.service.lowerctrl.ProjIDCardCtrlAndMonitorService; import a8k.app.service.data.ProjIdCardInfoMgrService; import a8k.app.service.statemgr.GStateMgrService; -import a8k.app.dao.type.A8kProjInfoCardBreif; +import a8k.app.optalgo.projinfo.A8kProjInfoCardBreif; import a8k.app.a8ktype.ui.ApiRet; import a8k.app.dao.type.CommonPage; import a8k.app.a8ktype.exception.AppException; 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 52b8a77..e3032d9 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,7 +1,7 @@ package a8k.app.controler.api.v1.app.data; import a8k.app.dao.ProjectBaseInfoDao; -import a8k.app.dao.type.ProjectBaseInfo; +import a8k.app.optalgo.projinfo.ProjectBaseInfo; import a8k.app.a8ktype.ui.ApiRet; import a8k.app.a8ktype.exception.AppException; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/a8k/app/dao/A8kProjExtInfoCardDao.java b/src/main/java/a8k/app/dao/A8kProjExtInfoCardDao.java index 8720b13..c99df0a 100644 --- a/src/main/java/a8k/app/dao/A8kProjExtInfoCardDao.java +++ b/src/main/java/a8k/app/dao/A8kProjExtInfoCardDao.java @@ -2,7 +2,7 @@ package a8k.app.dao; import a8k.app.dao.type.CommonPage; import a8k.app.a8ktype.exception.AppException; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.service.data.UtilsProjectColorAllocer; import a8k.app.utils.ZSqlite; diff --git a/src/main/java/a8k/app/dao/ProjOptInfoDao.java b/src/main/java/a8k/app/dao/ProjOptInfoDao.java index db33bbc..c0c515c 100644 --- a/src/main/java/a8k/app/dao/ProjOptInfoDao.java +++ b/src/main/java/a8k/app/dao/ProjOptInfoDao.java @@ -1,6 +1,6 @@ package a8k.app.dao; -import a8k.app.dao.type.OptCfg; +import a8k.app.optalgo.projinfo.OptCfg; import a8k.app.utils.ZSqlite; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/app/dao/ProjectBaseInfoDao.java b/src/main/java/a8k/app/dao/ProjectBaseInfoDao.java index 2c0b933..0f5d247 100644 --- a/src/main/java/a8k/app/dao/ProjectBaseInfoDao.java +++ b/src/main/java/a8k/app/dao/ProjectBaseInfoDao.java @@ -1,7 +1,7 @@ package a8k.app.dao; import a8k.app.service.data.UtilsProjectColorAllocer; -import a8k.app.dao.type.ProjectBaseInfo; +import a8k.app.optalgo.projinfo.ProjectBaseInfo; import a8k.app.utils.ZSqlite; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/app/dao/type/ReactionReport.java b/src/main/java/a8k/app/dao/type/ReactionReport.java index 9691412..33f7e52 100644 --- a/src/main/java/a8k/app/dao/type/ReactionReport.java +++ b/src/main/java/a8k/app/dao/type/ReactionReport.java @@ -4,7 +4,7 @@ import a8k.app.optalgo.type.OptScanResult; import a8k.app.a8ktype.type.ReactionResult; import a8k.app.a8ktype.device.BloodType; import a8k.app.optalgo.type.a8kidcard.zenum.A8kOptType; -import a8k.app.utils.ProjInfo; +import a8k.app.optalgo.projinfo.ProjInfo; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/a8k/app/factory/FakeReactionResultFactory.java b/src/main/java/a8k/app/factory/FakeReactionResultFactory.java index e66bc52..f42f495 100644 --- a/src/main/java/a8k/app/factory/FakeReactionResultFactory.java +++ b/src/main/java/a8k/app/factory/FakeReactionResultFactory.java @@ -1,7 +1,7 @@ package a8k.app.factory; import a8k.app.a8ktype.type.ReactionResult; -import a8k.app.utils.ProjInfo; +import a8k.app.optalgo.projinfo.ProjInfo; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/a8k/app/optalgo/A8kOptCurveAnalyzer.java b/src/main/java/a8k/app/optalgo/A8kOptCurveAnalyzer.java index 037587f..21af19c 100644 --- a/src/main/java/a8k/app/optalgo/A8kOptCurveAnalyzer.java +++ b/src/main/java/a8k/app/optalgo/A8kOptCurveAnalyzer.java @@ -5,7 +5,7 @@ import a8k.app.optalgo.algo.SubSampling; import a8k.app.optalgo.algo.SupperSampling; import a8k.app.optalgo.type.*; import a8k.app.optalgo.utils.*; -import a8k.app.dao.type.OptCfg; +import a8k.app.optalgo.projinfo.OptCfg; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/a8k/app/optalgo/A8kPeakAnalyzer.java b/src/main/java/a8k/app/optalgo/A8kPeakAnalyzer.java index 64a7ef7..33abfb7 100644 --- a/src/main/java/a8k/app/optalgo/A8kPeakAnalyzer.java +++ b/src/main/java/a8k/app/optalgo/A8kPeakAnalyzer.java @@ -1,6 +1,6 @@ package a8k.app.optalgo; -import a8k.app.dao.type.OptCfg; +import a8k.app.optalgo.projinfo.OptCfg; import a8k.app.optalgo.type.A8kOptPeakInfo; import a8k.app.optalgo.type.A8kOptProcessException; import a8k.app.a8ktype.state.SampleInfo; @@ -13,8 +13,8 @@ import a8k.app.a8ktype.type.ReactionResult; import a8k.app.optalgo.type.ReactionResultStatus; import a8k.app.optalgo.utils.A8kOptXGetter; import a8k.app.optalgo.utils.OptChecker; -import a8k.app.utils.ProjInfo; -import a8k.app.utils.ProjInfoUtils; +import a8k.app.optalgo.projinfo.ProjInfo; +import a8k.app.optalgo.type.ProjInfoUtils; import a8k.app.utils.ZloggerRecorder; import lombok.extern.slf4j.Slf4j; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/app/dao/type/A8kProjInfoCardBreif.java b/src/main/java/a8k/app/optalgo/projinfo/A8kProjInfoCardBreif.java similarity index 93% rename from src/main/java/a8k/app/dao/type/A8kProjInfoCardBreif.java rename to src/main/java/a8k/app/optalgo/projinfo/A8kProjInfoCardBreif.java index 48a4de7..7d83456 100644 --- a/src/main/java/a8k/app/dao/type/A8kProjInfoCardBreif.java +++ b/src/main/java/a8k/app/optalgo/projinfo/A8kProjInfoCardBreif.java @@ -1,4 +1,4 @@ -package a8k.app.dao.type; +package a8k.app.optalgo.projinfo; import java.util.Date; diff --git a/src/main/java/a8k/app/dao/type/OptCfg.java b/src/main/java/a8k/app/optalgo/projinfo/OptCfg.java similarity index 95% rename from src/main/java/a8k/app/dao/type/OptCfg.java rename to src/main/java/a8k/app/optalgo/projinfo/OptCfg.java index 1252a69..a68a7c7 100644 --- a/src/main/java/a8k/app/dao/type/OptCfg.java +++ b/src/main/java/a8k/app/optalgo/projinfo/OptCfg.java @@ -1,4 +1,4 @@ -package a8k.app.dao.type; +package a8k.app.optalgo.projinfo; import a8k.app.optalgo.type.a8kidcard.zenum.A8kOptType; diff --git a/src/main/java/a8k/app/utils/ProjBuildinInfo.java b/src/main/java/a8k/app/optalgo/projinfo/ProjBuildinInfo.java similarity index 96% rename from src/main/java/a8k/app/utils/ProjBuildinInfo.java rename to src/main/java/a8k/app/optalgo/projinfo/ProjBuildinInfo.java index 4a1b58d..1467d96 100644 --- a/src/main/java/a8k/app/utils/ProjBuildinInfo.java +++ b/src/main/java/a8k/app/optalgo/projinfo/ProjBuildinInfo.java @@ -1,7 +1,5 @@ -package a8k.app.utils; +package a8k.app.optalgo.projinfo; -import a8k.app.dao.type.OptCfg; -import a8k.app.dao.type.ProjectBaseInfo; import a8k.app.optalgo.type.a8kidcard.zenum.A8kOptType; import a8k.app.optalgo.type.a8kidcard.zenum.A8kReactionFlowType; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/a8k/app/dao/type/ProjExtInfoCard.java b/src/main/java/a8k/app/optalgo/projinfo/ProjExtInfoCard.java similarity index 99% rename from src/main/java/a8k/app/dao/type/ProjExtInfoCard.java rename to src/main/java/a8k/app/optalgo/projinfo/ProjExtInfoCard.java index d5810fc..1b87118 100644 --- a/src/main/java/a8k/app/dao/type/ProjExtInfoCard.java +++ b/src/main/java/a8k/app/optalgo/projinfo/ProjExtInfoCard.java @@ -1,4 +1,4 @@ -package a8k.app.dao.type; +package a8k.app.optalgo.projinfo; import a8k.app.optalgo.type.a8kidcard.A8kOptFnFormula; import a8k.app.utils.ZDateUtils; diff --git a/src/main/java/a8k/app/utils/ProjInfo.java b/src/main/java/a8k/app/optalgo/projinfo/ProjInfo.java similarity index 81% rename from src/main/java/a8k/app/utils/ProjInfo.java rename to src/main/java/a8k/app/optalgo/projinfo/ProjInfo.java index 13fd1b2..d26bfa8 100644 --- a/src/main/java/a8k/app/utils/ProjInfo.java +++ b/src/main/java/a8k/app/optalgo/projinfo/ProjInfo.java @@ -1,6 +1,4 @@ -package a8k.app.utils; - -import a8k.app.dao.type.ProjExtInfoCard; +package a8k.app.optalgo.projinfo; import java.io.Serializable; diff --git a/src/main/java/a8k/app/dao/type/ProjectBaseInfo.java b/src/main/java/a8k/app/optalgo/projinfo/ProjectBaseInfo.java similarity index 97% rename from src/main/java/a8k/app/dao/type/ProjectBaseInfo.java rename to src/main/java/a8k/app/optalgo/projinfo/ProjectBaseInfo.java index d0356e6..f767999 100644 --- a/src/main/java/a8k/app/dao/type/ProjectBaseInfo.java +++ b/src/main/java/a8k/app/optalgo/projinfo/ProjectBaseInfo.java @@ -1,4 +1,4 @@ -package a8k.app.dao.type; +package a8k.app.optalgo.projinfo; import a8k.app.optalgo.type.a8kidcard.zenum.A8kReactionFlowType; import a8k.app.utils.ZJsonHelper; diff --git a/src/main/java/a8k/app/utils/ProjInfoReader.java b/src/main/java/a8k/app/optalgo/type/ProjInfoReader.java similarity index 84% rename from src/main/java/a8k/app/utils/ProjInfoReader.java rename to src/main/java/a8k/app/optalgo/type/ProjInfoReader.java index 1b1b513..ef88eb5 100644 --- a/src/main/java/a8k/app/utils/ProjInfoReader.java +++ b/src/main/java/a8k/app/optalgo/type/ProjInfoReader.java @@ -1,7 +1,8 @@ -package a8k.app.utils; +package a8k.app.optalgo.type; import a8k.app.a8ktype.device.BloodType; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/src/main/java/a8k/app/utils/ProjInfoUtils.java b/src/main/java/a8k/app/optalgo/type/ProjInfoUtils.java similarity index 91% rename from src/main/java/a8k/app/utils/ProjInfoUtils.java rename to src/main/java/a8k/app/optalgo/type/ProjInfoUtils.java index 1fbd46e..f92c3de 100644 --- a/src/main/java/a8k/app/utils/ProjInfoUtils.java +++ b/src/main/java/a8k/app/optalgo/type/ProjInfoUtils.java @@ -1,7 +1,9 @@ -package a8k.app.utils; +package a8k.app.optalgo.type; import a8k.app.a8ktype.state.ProjectTaskContext; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjInfo; import a8k.app.optalgo.type.a8kidcard.A8kOptFnFormula; import a8k.app.a8ktype.type.ProjBriefInfo; diff --git a/src/main/java/a8k/app/optalgo/utils/A8kOptXGetter.java b/src/main/java/a8k/app/optalgo/utils/A8kOptXGetter.java index 4ab0e47..ee665fa 100644 --- a/src/main/java/a8k/app/optalgo/utils/A8kOptXGetter.java +++ b/src/main/java/a8k/app/optalgo/utils/A8kOptXGetter.java @@ -4,7 +4,7 @@ import a8k.app.optalgo.type.A8kOptPeakInfo; import a8k.app.optalgo.type.A8kOptProcessException; import a8k.app.optalgo.type.A8kOptX; import a8k.app.optalgo.type.PeakDivision; -import a8k.app.dao.type.OptCfg; +import a8k.app.optalgo.projinfo.OptCfg; import a8k.app.optalgo.type.ReactionResultStatus; public class A8kOptXGetter { diff --git a/src/main/java/a8k/app/service/data/ProjIdCardInfoMgrService.java b/src/main/java/a8k/app/service/data/ProjIdCardInfoMgrService.java index e8c7dbd..641b9ed 100644 --- a/src/main/java/a8k/app/service/data/ProjIdCardInfoMgrService.java +++ b/src/main/java/a8k/app/service/data/ProjIdCardInfoMgrService.java @@ -13,10 +13,10 @@ import a8k.app.optalgo.type.a8kidcard.zenum.A8kResultUnit; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.service.lowerctrl.ProjIDCardCtrlAndMonitorService; import a8k.app.service.statemgr.GStateMgrService; -import a8k.app.dao.type.A8kProjInfoCardBreif; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.A8kProjInfoCardBreif; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import a8k.app.dao.type.CommonPage; -import a8k.app.utils.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; import a8k.app.utils.ZAppChecker; import a8k.app.utils.DoubleUtils; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/service/data/ProjInfoMgrService.java b/src/main/java/a8k/app/service/data/ProjInfoMgrService.java index 7506b30..76a8ec8 100644 --- a/src/main/java/a8k/app/service/data/ProjInfoMgrService.java +++ b/src/main/java/a8k/app/service/data/ProjInfoMgrService.java @@ -6,11 +6,11 @@ import a8k.app.dao.ProjOptInfoDao; import a8k.app.dao.ProjectBaseInfoDao; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; -import a8k.app.dao.type.ProjExtInfoCard; -import a8k.app.dao.type.ProjectBaseInfo; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjectBaseInfo; import a8k.app.a8ktype.exception.AppException; import a8k.app.service.lowerctrl.ProjIDCardCtrlAndMonitorService; -import a8k.app.utils.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; import a8k.app.utils.ZAppChecker; import a8k.app.utils.ZJsonHelper; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/app/service/data/ReactionRecordMgrService.java b/src/main/java/a8k/app/service/data/ReactionRecordMgrService.java index ad5f3c5..1946029 100644 --- a/src/main/java/a8k/app/service/data/ReactionRecordMgrService.java +++ b/src/main/java/a8k/app/service/data/ReactionRecordMgrService.java @@ -8,7 +8,7 @@ import a8k.app.service.statemgr.GStateMgrService; import a8k.app.a8ktype.state.ProjectTaskContext; import a8k.app.a8ktype.type.ReactionResult; import a8k.app.dao.type.CommonPage; -import a8k.app.utils.ProjInfo; +import a8k.app.optalgo.projinfo.ProjInfo; import a8k.app.utils.ZJsonHelper; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/service/lowerctrl/LiquidOperationCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/LiquidOperationCtrlService.java index 155a43f..5e2358e 100644 --- a/src/main/java/a8k/app/service/lowerctrl/LiquidOperationCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/LiquidOperationCtrlService.java @@ -4,7 +4,7 @@ package a8k.app.service.lowerctrl; import a8k.app.a8ktype.DeviceRunMode; import a8k.app.a8ktype.device.*; import a8k.app.a8ktype.param.type.A8kSamplePos; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import a8k.app.hardware.driver.type.PipetteRegIndex; import a8k.app.hardware.type.LldType; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; @@ -16,7 +16,7 @@ import a8k.app.service.param.pipetteparam.PipetteGunExParamMgr; import a8k.app.service.param.pipetteparam.PipetteGunLLFParamMgr; import a8k.app.service.statemgr.ConsumablesMgrService; import a8k.app.service.statemgr.GStateMgrService; -import a8k.app.utils.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; import a8k.app.utils.ZAppChecker; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/a8k/app/service/lowerctrl/OptScanModuleCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/OptScanModuleCtrlService.java index 2a310ec..0ddfe0f 100644 --- a/src/main/java/a8k/app/service/lowerctrl/OptScanModuleCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/OptScanModuleCtrlService.java @@ -17,7 +17,7 @@ import a8k.app.optalgo.type.a8kidcard.zenum.A8kOptType; import a8k.app.a8ktype.device.IncubatorPos; import a8k.app.optalgo.type.OptScanDirection; import a8k.app.a8ktype.exception.AppException; -import a8k.app.utils.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; import a8k.app.hardware.utils.OptGainConvert; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/a8k/app/service/lowerctrl/ProjIDCardCtrlAndMonitorService.java b/src/main/java/a8k/app/service/lowerctrl/ProjIDCardCtrlAndMonitorService.java index 4192ddc..fa09d6f 100644 --- a/src/main/java/a8k/app/service/lowerctrl/ProjIDCardCtrlAndMonitorService.java +++ b/src/main/java/a8k/app/service/lowerctrl/ProjIDCardCtrlAndMonitorService.java @@ -6,13 +6,13 @@ import a8k.app.service.data.ProjInfoMgrService; import a8k.app.service.statemgr.GStateMgrService; import a8k.app.a8ktype.appevent.*; import a8k.app.hardware.type.regindex.RegIndex; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import a8k.app.a8ktype.exception.AppException; import a8k.app.service.bases.AppEventBusService; import a8k.app.hardware.channel.A8kCanBusService; import a8k.app.hardware.type.a8kcanprotocol.*; import a8k.app.a8kproj.A8kIdCardDataParseService; -import a8k.app.utils.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; import a8k.app.utils.ZWorkQueue; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/a8k/app/service/mainctrl/AppConsumablesScanService.java b/src/main/java/a8k/app/service/mainctrl/AppConsumablesScanService.java index 3cedbbe..55136a3 100644 --- a/src/main/java/a8k/app/service/mainctrl/AppConsumablesScanService.java +++ b/src/main/java/a8k/app/service/mainctrl/AppConsumablesScanService.java @@ -4,12 +4,13 @@ import a8k.app.a8ktype.device.LittleBottleConsumableType; import a8k.app.constant.AppConstant; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.i18n.Internationalization; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; 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.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import a8k.app.a8ktype.type.*; import a8k.app.a8ktype.device.consumables.LarBottleGroup; import a8k.app.a8ktype.device.consumables.LittBottleGroup; diff --git a/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC20ProcessCompletedPlate.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC20ProcessCompletedPlate.java index aac00e5..d5a6e9f 100644 --- a/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC20ProcessCompletedPlate.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC20ProcessCompletedPlate.java @@ -13,7 +13,7 @@ import a8k.app.utils.ZList; import a8k.app.teststate.VirtualDevice; import a8k.app.a8ktype.error.AppError; import a8k.app.a8ktype.exception.AppException; -import a8k.app.utils.ProjInfoUtils; +import a8k.app.optalgo.type.ProjInfoUtils; import jakarta.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC20ScanReactionPlate.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC20ScanReactionPlate.java index ce3edae..1a5a260 100644 --- a/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC20ScanReactionPlate.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC20ScanReactionPlate.java @@ -18,7 +18,7 @@ import a8k.app.factory.FakeReactionResultFactory; 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.optalgo.type.ProjInfoUtils; import a8k.app.utils.ZList; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC30ScanTubeHolderTask.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC30ScanTubeHolderTask.java index 55d08c0..6779988 100644 --- a/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC30ScanTubeHolderTask.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC30ScanTubeHolderTask.java @@ -5,6 +5,8 @@ import a8k.app.hardware.channel.A8kCanBusService; import a8k.app.hardware.driver.InputDetectDriver; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.hardware.type.a8kcanprotocol.InputIOId; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; +import a8k.app.optalgo.type.ProjInfoUtils; import a8k.app.service.mainctrl.TubeHolderSettingMgrService; import a8k.app.service.mainctrl.mainflowctrl.base.*; import a8k.app.service.data.ProjInfoMgrService; diff --git a/src/main/java/a8k/app/service/statemgr/ConsumableStateAnalyzer.java b/src/main/java/a8k/app/service/statemgr/ConsumableStateAnalyzer.java index eecc9ee..159cf68 100644 --- a/src/main/java/a8k/app/service/statemgr/ConsumableStateAnalyzer.java +++ b/src/main/java/a8k/app/service/statemgr/ConsumableStateAnalyzer.java @@ -6,7 +6,7 @@ import a8k.app.a8ktype.others.ConsumableStatInfo; import a8k.app.a8ktype.state.Tube; import a8k.app.a8ktype.state.TubeHolder; import a8k.app.service.data.ProjInfoMgrService; -import a8k.app.utils.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; import lombok.extern.slf4j.Slf4j; import java.util.ArrayList; diff --git a/src/main/java/a8k/app/service/statemgr/IncubationPlateStateMgrService.java b/src/main/java/a8k/app/service/statemgr/IncubationPlateStateMgrService.java index 6a51edf..0ea1559 100644 --- a/src/main/java/a8k/app/service/statemgr/IncubationPlateStateMgrService.java +++ b/src/main/java/a8k/app/service/statemgr/IncubationPlateStateMgrService.java @@ -9,9 +9,9 @@ import a8k.app.a8ktype.state.enumtype.IncubationSubTankState; import a8k.app.a8ktype.device.IncubatorPos; import a8k.app.a8ktype.type.ProjBriefInfo; import a8k.app.a8ktype.error.AppError; -import a8k.app.dao.type.ProjExtInfoCard; -import a8k.app.utils.ProjBuildinInfo; -import a8k.app.utils.ProjInfoUtils; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; +import a8k.app.optalgo.type.ProjInfoUtils; import a8k.app.utils.ZTimeUtils; import cn.hutool.core.util.ObjectUtil; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/app/service/statemgr/OptScanModuleStateMgrService.java b/src/main/java/a8k/app/service/statemgr/OptScanModuleStateMgrService.java index f6f2608..4a81e45 100644 --- a/src/main/java/a8k/app/service/statemgr/OptScanModuleStateMgrService.java +++ b/src/main/java/a8k/app/service/statemgr/OptScanModuleStateMgrService.java @@ -6,9 +6,9 @@ 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 a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import a8k.app.service.data.UtilsProjectColorAllocer; -import a8k.app.utils.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; import cn.hutool.core.util.ObjectUtil; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/a8k/app/service/statemgr/ProjectContextMgrService.java b/src/main/java/a8k/app/service/statemgr/ProjectContextMgrService.java index 8bb5bb1..5d987d3 100644 --- a/src/main/java/a8k/app/service/statemgr/ProjectContextMgrService.java +++ b/src/main/java/a8k/app/service/statemgr/ProjectContextMgrService.java @@ -2,8 +2,8 @@ package a8k.app.service.statemgr; import a8k.app.a8ktype.device.Consumable; import a8k.app.a8ktype.state.*; -import a8k.app.dao.type.ProjExtInfoCard; -import a8k.app.utils.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; import a8k.app.utils.ZJsonHelper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/statemgr/TubeStateMgrService.java b/src/main/java/a8k/app/service/statemgr/TubeStateMgrService.java index 9cadd6d..c2b515e 100644 --- a/src/main/java/a8k/app/service/statemgr/TubeStateMgrService.java +++ b/src/main/java/a8k/app/service/statemgr/TubeStateMgrService.java @@ -7,7 +7,7 @@ import a8k.app.a8ktype.others.ConsumableStatInfo; import a8k.app.a8ktype.type.ProjBriefInfo; import a8k.app.dao.DeviceStatisticDao; import a8k.app.dao.SampleRecordDBDao; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.service.bases.UIMessage; import a8k.app.service.data.ProjInfoMgrService; @@ -22,8 +22,8 @@ import a8k.app.a8ktype.error.AppError; import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.device.BloodType; import a8k.app.service.data.UtilsProjectColorAllocer; -import a8k.app.utils.ProjBuildinInfo; -import a8k.app.utils.ProjInfoUtils; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; +import a8k.app.optalgo.type.ProjInfoUtils; import a8k.app.utils.ZAppChecker; import a8k.app.utils.ZJsonHelper; import cn.hutool.core.util.ObjectUtil; diff --git a/src/main/java/a8k/app/utils/ZCSVUtils.java b/src/main/java/a8k/app/utils/ZCSVUtils.java index f4c677f..a3fc915 100644 --- a/src/main/java/a8k/app/utils/ZCSVUtils.java +++ b/src/main/java/a8k/app/utils/ZCSVUtils.java @@ -1,7 +1,7 @@ package a8k.app.utils; -import a8k.app.dao.type.OptCfg; +import a8k.app.optalgo.projinfo.OptCfg; import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.text.csv.CsvReader; import cn.hutool.core.text.csv.CsvUtil; diff --git a/src/main/java/a8k/extui/factory/ProjExtInfoCardFactory.java b/src/main/java/a8k/extui/factory/ProjExtInfoCardFactory.java index 9f93af7..c8a8503 100644 --- a/src/main/java/a8k/extui/factory/ProjExtInfoCardFactory.java +++ b/src/main/java/a8k/extui/factory/ProjExtInfoCardFactory.java @@ -2,14 +2,14 @@ package a8k.extui.factory; import a8k.SpringBootBeanUtil; import a8k.app.a8ktype.exception.AppException; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import a8k.app.optalgo.type.a8kidcard.A8kNormalFn; import a8k.app.optalgo.type.a8kidcard.A8kOptFnFormula; import a8k.app.optalgo.type.a8kidcard.A8kPiecewiseFn; import a8k.app.optalgo.type.a8kidcard.A8kResultBuilderFn; import a8k.app.optalgo.type.a8kidcard.zenum.A8kFnType; import a8k.app.service.data.ProjInfoMgrService; -import a8k.app.utils.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; import java.util.Date; diff --git a/src/main/java/a8k/extui/page/debug/P01ProjInfoDebugPage.java b/src/main/java/a8k/extui/page/debug/P01ProjInfoDebugPage.java index 7074fb8..312387e 100644 --- a/src/main/java/a8k/extui/page/debug/P01ProjInfoDebugPage.java +++ b/src/main/java/a8k/extui/page/debug/P01ProjInfoDebugPage.java @@ -1,13 +1,13 @@ package a8k.extui.page.debug; import a8k.app.a8ktype.exception.AppException; -import a8k.app.dao.type.A8kProjInfoCardBreif; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.A8kProjInfoCardBreif; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import a8k.extui.factory.ProjExtInfoCardFactory; import a8k.app.service.data.ProjIdCardInfoMgrService; import a8k.app.service.data.ProjInfoMgrService; import a8k.app.service.statemgr.GStateMgrService; -import a8k.app.utils.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; import a8k.app.utils.ZDateUtils; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtApiStatu; diff --git a/src/main/java/a8k/extui/page/debug/P02ConsumablesMgrDebugPage.java b/src/main/java/a8k/extui/page/debug/P02ConsumablesMgrDebugPage.java index a4ab404..46a1492 100644 --- a/src/main/java/a8k/extui/page/debug/P02ConsumablesMgrDebugPage.java +++ b/src/main/java/a8k/extui/page/debug/P02ConsumablesMgrDebugPage.java @@ -9,7 +9,7 @@ import a8k.app.a8ktype.error.ConsumablesScanReportErrorType; import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.type.ConsumablesScanReport; import a8k.app.a8ktype.type.ConsumablesScanResultPacket; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.service.data.ProjIdCardInfoMgrService; import a8k.app.service.data.ProjInfoMgrService; diff --git a/src/main/java/a8k/extui/page/extapp/A8kOptVerification.java b/src/main/java/a8k/extui/page/extapp/A8kOptVerification.java index 6f5160c..eab3396 100644 --- a/src/main/java/a8k/extui/page/extapp/A8kOptVerification.java +++ b/src/main/java/a8k/extui/page/extapp/A8kOptVerification.java @@ -5,11 +5,11 @@ import a8k.app.optalgo.type.OptScanResult; import a8k.app.a8ktype.device.BloodType; import a8k.app.a8ktype.state.SampleInfo; import a8k.app.a8ktype.type.ReactionResult; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import a8k.app.service.lowerctrl.DeviceMoveToZeroCtrlService; import a8k.extui.factory.A8kScanCurveFactory; import a8k.app.service.data.ProjIdCardInfoMgrService; -import a8k.app.utils.ProjInfo; +import a8k.app.optalgo.projinfo.ProjInfo; import a8k.extui.type.ExtApiStatu; import a8k.extui.type.ret.FileToBeDownload; import a8k.extui.mgr.ExtApiPageMgr; @@ -23,7 +23,7 @@ import a8k.app.optalgo.type.a8kidcard.zenum.A8kOptType; import a8k.app.a8ktype.device.ConsumableGroup; import a8k.app.a8ktype.device.IncubatorPos; import a8k.app.a8ktype.exception.AppException; -import a8k.app.utils.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/extui/page/extapp/OptFullFlowVerificationPage.java b/src/main/java/a8k/extui/page/extapp/OptFullFlowVerificationPage.java index a51f71b..5c0375e 100644 --- a/src/main/java/a8k/extui/page/extapp/OptFullFlowVerificationPage.java +++ b/src/main/java/a8k/extui/page/extapp/OptFullFlowVerificationPage.java @@ -9,7 +9,7 @@ import a8k.app.a8ktype.param.type.A8kSamplePos; import a8k.app.a8ktype.state.SampleInfo; import a8k.app.a8ktype.type.ReactionResult; import a8k.app.a8ktype.type.TubeHolderScanResult; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import a8k.app.optalgo.type.a8kidcard.zenum.A8kReactionFlowType; import a8k.app.hardware.driver.PipetteCtrlDriver; import a8k.app.service.bases.AppEventBusService; @@ -18,9 +18,9 @@ import a8k.app.service.data.ProjIdCardInfoMgrService; import a8k.app.service.data.ProjInfoMgrService; import a8k.app.service.data.ReactionRecordMgrService; import a8k.app.service.lowerctrl.*; -import a8k.app.utils.ProjBuildinInfo; -import a8k.app.utils.ProjInfo; -import a8k.app.utils.ProjInfoReader; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjInfo; +import a8k.app.optalgo.type.ProjInfoReader; import a8k.app.utils.ZDateUtils; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtApiStatu; diff --git a/src/main/java/a8k/extui/page/extapp/UsrOperationSimulationPage.java b/src/main/java/a8k/extui/page/extapp/UsrOperationSimulationPage.java index 990f3d7..334b933 100644 --- a/src/main/java/a8k/extui/page/extapp/UsrOperationSimulationPage.java +++ b/src/main/java/a8k/extui/page/extapp/UsrOperationSimulationPage.java @@ -5,7 +5,7 @@ import a8k.app.a8ktype.device.ConsumableGroup; import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.type.TubeHolderScanResult; import a8k.app.a8ktype.type.TubesScanResult; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import a8k.extui.factory.ProjExtInfoCardFactory; import a8k.app.service.data.ProjIdCardInfoMgrService; import a8k.app.service.data.ProjInfoMgrService; diff --git a/src/main/java/a8k/extui/page/extapp/debug_assistant/FakeReactionRecordGeneratorPage.java b/src/main/java/a8k/extui/page/extapp/debug_assistant/FakeReactionRecordGeneratorPage.java index ac5d13a..5f9ecfe 100644 --- a/src/main/java/a8k/extui/page/extapp/debug_assistant/FakeReactionRecordGeneratorPage.java +++ b/src/main/java/a8k/extui/page/extapp/debug_assistant/FakeReactionRecordGeneratorPage.java @@ -14,7 +14,7 @@ import a8k.extui.factory.ProjExtInfoCardFactory; import a8k.app.service.data.ProjInfoMgrService; import a8k.app.service.data.ReactionRecordMgrService; import a8k.app.service.statemgr.GStateMgrService; -import a8k.app.utils.ProjInfo; +import a8k.app.optalgo.projinfo.ProjInfo; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtUIPageCfg; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/extapp/debug_assistant/IDCardDataGeneratorPage.java b/src/main/java/a8k/extui/page/extapp/debug_assistant/IDCardDataGeneratorPage.java index e2ef7d7..ca7b6c6 100644 --- a/src/main/java/a8k/extui/page/extapp/debug_assistant/IDCardDataGeneratorPage.java +++ b/src/main/java/a8k/extui/page/extapp/debug_assistant/IDCardDataGeneratorPage.java @@ -1,12 +1,12 @@ package a8k.extui.page.extapp.debug_assistant; import a8k.app.a8ktype.exception.AppException; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import a8k.extui.factory.ProjExtInfoCardFactory; import a8k.app.service.data.ProjIdCardInfoMgrService; import a8k.app.service.data.ProjInfoMgrService; import a8k.app.service.statemgr.GStateMgrService; -import a8k.app.utils.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtApiStatu; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/extsetting/db/ProjInfoMgrPage.java b/src/main/java/a8k/extui/page/extsetting/db/ProjInfoMgrPage.java index c6e0878..923fa3e 100644 --- a/src/main/java/a8k/extui/page/extsetting/db/ProjInfoMgrPage.java +++ b/src/main/java/a8k/extui/page/extsetting/db/ProjInfoMgrPage.java @@ -5,7 +5,7 @@ import a8k.app.controler.filemgr.StorageControler; import a8k.app.dao.ProjectBaseInfoDao; import a8k.app.service.data.ProjIdCardInfoMgrService; import a8k.app.service.data.ProjInfoMgrService; -import a8k.app.utils.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtUIPageCfg; import a8k.extui.type.ExtUiTable; diff --git a/src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPage.java b/src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPage.java index 868e7cb..756ba68 100644 --- a/src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPage.java +++ b/src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPage.java @@ -10,7 +10,7 @@ import a8k.app.a8ktype.type.ReactionResult; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.service.data.ProjIdCardInfoMgrService; import a8k.app.service.data.ProjInfoMgrService; -import a8k.app.utils.ProjInfo; +import a8k.app.optalgo.projinfo.ProjInfo; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtUIPageCfg; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPageV2.java b/src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPageV2.java index e741ea5..03be62c 100644 --- a/src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPageV2.java +++ b/src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPageV2.java @@ -14,7 +14,7 @@ import a8k.app.a8ktype.type.ReactionResult; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.service.data.ProjIdCardInfoMgrService; import a8k.app.service.data.ProjInfoMgrService; -import a8k.app.utils.ProjInfo; +import a8k.app.optalgo.projinfo.ProjInfo; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtApiStatu; import a8k.extui.type.ExtUIPageCfg; diff --git a/src/main/java/a8k/extui/page/test/verification/P10ProjejIDCardTestPage.java b/src/main/java/a8k/extui/page/test/verification/P10ProjejIDCardTestPage.java index 17fff34..aa166b8 100644 --- a/src/main/java/a8k/extui/page/test/verification/P10ProjejIDCardTestPage.java +++ b/src/main/java/a8k/extui/page/test/verification/P10ProjejIDCardTestPage.java @@ -1,7 +1,7 @@ package a8k.extui.page.test.verification; import a8k.app.a8ktype.exception.AppException; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import a8k.app.hardware.type.a8kcanprotocol.A8kEcode; import a8k.app.i18n.Internationalization; import a8k.app.service.data.ProjIdCardInfoMgrService; diff --git a/src/main/java/a8k/extui/page/test/verification/P51FullFlowVerificationPage.java b/src/main/java/a8k/extui/page/test/verification/P51FullFlowVerificationPage.java index d949ed7..475442a 100644 --- a/src/main/java/a8k/extui/page/test/verification/P51FullFlowVerificationPage.java +++ b/src/main/java/a8k/extui/page/test/verification/P51FullFlowVerificationPage.java @@ -9,7 +9,7 @@ import a8k.app.a8ktype.param.type.A8kSamplePos; import a8k.app.a8ktype.state.SampleInfo; import a8k.app.a8ktype.type.ReactionResult; import a8k.app.a8ktype.type.TubeHolderScanResult; -import a8k.app.dao.type.ProjExtInfoCard; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; import a8k.app.optalgo.type.a8kidcard.zenum.A8kReactionFlowType; import a8k.app.hardware.driver.PipetteCtrlDriver; import a8k.app.service.bases.AppEventBusService; @@ -18,9 +18,9 @@ import a8k.app.service.data.ProjIdCardInfoMgrService; import a8k.app.service.data.ProjInfoMgrService; import a8k.app.service.data.ReactionRecordMgrService; import a8k.app.service.lowerctrl.*; -import a8k.app.utils.ProjBuildinInfo; -import a8k.app.utils.ProjInfo; -import a8k.app.utils.ProjInfoReader; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjInfo; +import a8k.app.optalgo.type.ProjInfoReader; import a8k.app.utils.ZDateUtils; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtApiStatu;