From 3cd2ed221d9abd2af9417765004741136425f059 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 15 Apr 2025 09:14:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../a8k/app/a8kproj/A8kIdCardDataParseService.java | 4 +- .../app/a8ktype/appevent/AppIDCardMountEvent.java | 4 +- .../a8k/app/a8ktype/state/IncubationSubTank.java | 4 +- .../java/a8k/app/a8ktype/state/OptScanModule.java | 4 +- .../a8k/app/a8ktype/state/ProjectTaskContext.java | 6 +- src/main/java/a8k/app/a8ktype/state/Tube.java | 3 +- .../api/v1/app/data/A8kProjectCardControler.java | 2 +- .../api/v1/app/data/A8kProjectInfoControler.java | 2 +- .../java/a8k/app/dao/A8kProjExtInfoCardDao.java | 2 +- src/main/java/a8k/app/dao/ProjOptInfoDao.java | 2 +- src/main/java/a8k/app/dao/ProjectBaseInfoDao.java | 2 +- .../a8k/app/dao/type/A8kProjInfoCardBreif.java | 17 --- src/main/java/a8k/app/dao/type/OptCfg.java | 22 ---- .../java/a8k/app/dao/type/ProjExtInfoCard.java | 83 -------------- .../java/a8k/app/dao/type/ProjectBaseInfo.java | 42 -------- src/main/java/a8k/app/dao/type/ReactionReport.java | 2 +- .../a8k/app/factory/FakeReactionResultFactory.java | 2 +- .../java/a8k/app/optalgo/A8kOptCurveAnalyzer.java | 2 +- src/main/java/a8k/app/optalgo/A8kPeakAnalyzer.java | 6 +- .../app/optalgo/projinfo/A8kProjInfoCardBreif.java | 17 +++ src/main/java/a8k/app/optalgo/projinfo/OptCfg.java | 22 ++++ .../a8k/app/optalgo/projinfo/ProjBuildinInfo.java | 118 ++++++++++++++++++++ .../a8k/app/optalgo/projinfo/ProjExtInfoCard.java | 83 ++++++++++++++ .../java/a8k/app/optalgo/projinfo/ProjInfo.java | 16 +++ .../a8k/app/optalgo/projinfo/ProjectBaseInfo.java | 42 ++++++++ .../java/a8k/app/optalgo/type/ProjInfoReader.java | 32 ++++++ .../java/a8k/app/optalgo/type/ProjInfoUtils.java | 62 +++++++++++ .../java/a8k/app/optalgo/utils/A8kOptXGetter.java | 2 +- .../app/service/data/ProjIdCardInfoMgrService.java | 6 +- .../a8k/app/service/data/ProjInfoMgrService.java | 6 +- .../app/service/data/ReactionRecordMgrService.java | 2 +- .../lowerctrl/LiquidOperationCtrlService.java | 4 +- .../lowerctrl/OptScanModuleCtrlService.java | 2 +- .../lowerctrl/ProjIDCardCtrlAndMonitorService.java | 4 +- .../mainctrl/AppConsumablesScanService.java | 3 +- .../action/AC20ProcessCompletedPlate.java | 2 +- .../mainflowctrl/action/AC20ScanReactionPlate.java | 2 +- .../action/AC30ScanTubeHolderTask.java | 2 + .../service/statemgr/ConsumableStateAnalyzer.java | 2 +- .../statemgr/IncubationPlateStateMgrService.java | 6 +- .../statemgr/OptScanModuleStateMgrService.java | 4 +- .../service/statemgr/ProjectContextMgrService.java | 4 +- .../app/service/statemgr/TubeStateMgrService.java | 6 +- src/main/java/a8k/app/utils/ProjBuildinInfo.java | 120 --------------------- src/main/java/a8k/app/utils/ProjInfo.java | 18 ---- src/main/java/a8k/app/utils/ProjInfoReader.java | 31 ------ src/main/java/a8k/app/utils/ProjInfoUtils.java | 60 ----------- src/main/java/a8k/app/utils/ZCSVUtils.java | 2 +- .../a8k/extui/factory/ProjExtInfoCardFactory.java | 4 +- .../a8k/extui/page/debug/P01ProjInfoDebugPage.java | 6 +- .../page/debug/P02ConsumablesMgrDebugPage.java | 2 +- .../a8k/extui/page/extapp/A8kOptVerification.java | 6 +- .../page/extapp/OptFullFlowVerificationPage.java | 8 +- .../page/extapp/UsrOperationSimulationPage.java | 2 +- .../FakeReactionRecordGeneratorPage.java | 2 +- .../debug_assistant/IDCardDataGeneratorPage.java | 4 +- .../extui/page/extsetting/db/ProjInfoMgrPage.java | 2 +- .../page/test/codetest/OptFormulaTestPage.java | 2 +- .../page/test/codetest/OptFormulaTestPageV2.java | 2 +- .../test/verification/P10ProjejIDCardTestPage.java | 2 +- .../verification/P51FullFlowVerificationPage.java | 8 +- 61 files changed, 471 insertions(+), 470 deletions(-) delete mode 100644 src/main/java/a8k/app/dao/type/A8kProjInfoCardBreif.java delete mode 100644 src/main/java/a8k/app/dao/type/OptCfg.java delete mode 100644 src/main/java/a8k/app/dao/type/ProjExtInfoCard.java delete mode 100644 src/main/java/a8k/app/dao/type/ProjectBaseInfo.java create mode 100644 src/main/java/a8k/app/optalgo/projinfo/A8kProjInfoCardBreif.java create mode 100644 src/main/java/a8k/app/optalgo/projinfo/OptCfg.java create mode 100644 src/main/java/a8k/app/optalgo/projinfo/ProjBuildinInfo.java create mode 100644 src/main/java/a8k/app/optalgo/projinfo/ProjExtInfoCard.java create mode 100644 src/main/java/a8k/app/optalgo/projinfo/ProjInfo.java create mode 100644 src/main/java/a8k/app/optalgo/projinfo/ProjectBaseInfo.java create mode 100644 src/main/java/a8k/app/optalgo/type/ProjInfoReader.java create mode 100644 src/main/java/a8k/app/optalgo/type/ProjInfoUtils.java delete mode 100644 src/main/java/a8k/app/utils/ProjBuildinInfo.java delete mode 100644 src/main/java/a8k/app/utils/ProjInfo.java delete mode 100644 src/main/java/a8k/app/utils/ProjInfoReader.java delete mode 100644 src/main/java/a8k/app/utils/ProjInfoUtils.java 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/A8kProjInfoCardBreif.java b/src/main/java/a8k/app/dao/type/A8kProjInfoCardBreif.java deleted file mode 100644 index 48a4de7..0000000 --- a/src/main/java/a8k/app/dao/type/A8kProjInfoCardBreif.java +++ /dev/null @@ -1,17 +0,0 @@ -package a8k.app.dao.type; - -import java.util.Date; - -public class A8kProjInfoCardBreif { - public int id; - public String color;// - - // content in idcard - public String projName; // 项目名称 0x0001,15 - public String lotId; // 批次名称 0x0010,12 - - public Date expiryDate; // 有效日期 0x001C - public Integer projId; // 项目名称代码 0x001F - public Integer palteCode; // 板条条码代码 0x0020 - public Integer updateChipVersion; // 更新芯片版本号 0x0021 -} diff --git a/src/main/java/a8k/app/dao/type/OptCfg.java b/src/main/java/a8k/app/dao/type/OptCfg.java deleted file mode 100644 index 1252a69..0000000 --- a/src/main/java/a8k/app/dao/type/OptCfg.java +++ /dev/null @@ -1,22 +0,0 @@ -package a8k.app.dao.type; - -import a8k.app.optalgo.type.a8kidcard.zenum.A8kOptType; - -import java.io.Serializable; - -public class OptCfg implements Serializable { - public int id = 0; - public Integer projId; //项目INDEX - public String projName; //项目名称 - public Integer subProjIndex;//子项目INDEX - /*光学配置*/ - public String subProjName; //子项目 名称 - public String subProjShortName; //子项目 缩写名称 - - /*光学类型*/ - public A8kOptType optType; //子项目 光学类型 necessity - public Integer optScanRange; //子项目 扫描范围 扫描范围 - - public Integer optScanPeakNum; //子项目 实际扫描到的峰的数量 - public Integer peakNameRefNum; //子项目 峰的数量 -} diff --git a/src/main/java/a8k/app/dao/type/ProjExtInfoCard.java b/src/main/java/a8k/app/dao/type/ProjExtInfoCard.java deleted file mode 100644 index d5810fc..0000000 --- a/src/main/java/a8k/app/dao/type/ProjExtInfoCard.java +++ /dev/null @@ -1,83 +0,0 @@ -package a8k.app.dao.type; - -import a8k.app.optalgo.type.a8kidcard.A8kOptFnFormula; -import a8k.app.utils.ZDateUtils; -import com.fasterxml.jackson.databind.ObjectMapper; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class ProjExtInfoCard implements Serializable { - public int id; - public String color;// - public String projShortName; // 项目简称 0x - - // content in idcard - public String projName; // 项目名称 0x0001,15 - public String lotId; // 批次名称 0x0010,12 - - public Date expiryDate; // 有效日期 0x001C - - public String getExpiryDateStr() { - return expiryDate == null ? "" : ZDateUtils.toDateString(expiryDate); - } - - public Integer projId; // 项目名称代码 0x001F - public Integer palteCode; // 板条条码代码 0x0020 - public Integer updateChipVersion; // 更新芯片版本号 0x0021 - - public Double QCPeakMinVal = 0.0; // 质控峰最小值 0x0022 - public Double QCPeakMaxVal = 3000.0; // 质控峰最大值 设置值x10最大不超过250000 0x0027 - public Integer optType = -1; // 光学类型 光学类型(0=自动;1=F光学;2=T光学;3=F/T光学;其他=无效;) 0x002C - public Integer optFixedGainSetting = -1; // 光学固定增益设置 0x002D - public Integer optAreaPeakCount = -1; // 光学面积峰个数 0x002E - public Integer calculationDirection = 0; // 计算方向 0=默认；1=反向；2=正常； 0x002F - public Integer sampleType = 0; // 0=默认；1=血清；2=全血；其他值=无效 样本类型 0x0030 - public Integer equipmentManufacturer = 0; // 设备厂商 0x0031 - public Integer tOptIlluminationTime = -1; // T光学持续光照时间 0x0032 - public Integer incMultiInstruDataMerge = -1; // 是否包含多款仪器数据合并 0x0034 - public Integer multiInstruDataMerge0 = -1; // 多款仪器数据合并 0x0035 - public Integer multiInstruDataMerge1 = -1; // 多款仪器数据合并 0x0036 - public Integer wBloodSampleVolUl = -1; // 全血样本量 0x0037 - public Integer serumSampleVolUl = -1; // 血清/血浆样本量 0x0038 - public Integer tubeMixingCount = -1; // 试管混匀次数 0x0039 - public Integer bufferBottleSize = -1; // 缓冲液瓶大小 0x003A ,没有的配置 - public Integer bufferBottleCapacity = -1; // 缓冲液瓶容量 0x003B ,没有的配置 - public Integer bufferSolutionMixingCnt = -1; // 缓冲液吸吐混匀次数 0x003C - public Integer reactionPlateDropletVolUl = -1; // 缓冲液吐混混匀量 0x003D - public Integer buffLiquidReactionTime = -1; // 缓冲液反应时间 0x003E - public Integer reactionPlateReactionTime = -1; // 反应板反应时间 0x003F - public Integer reactionPlateDropletVol = -1; // 反应板滴样量 0x0040 - public Integer resultDecimalPlaces = -1; // 结果小数点位数 0x0041 - public Integer scanningRange = -1; // 扫描范围 0x0042 - - public Integer subProjNum = 1; // 当前项目是几联卡项目,val = 1,2,3 0x0100 - - public List projFnFormuals = new ArrayList<>(); - - public String toString() { - ObjectMapper mapper = new ObjectMapper(); - try { - return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(this); - } catch (Exception e) { - return "A8kIdCardInfo.toString() error"; - } - } - - - - public A8kProjInfoCardBreif toBreif() { - A8kProjInfoCardBreif breif = new A8kProjInfoCardBreif(); - breif.id = id; - breif.color = color; - breif.projName = projName; - breif.lotId = lotId; - breif.expiryDate = expiryDate; - breif.projId = projId; - breif.palteCode = palteCode; - breif.updateChipVersion = updateChipVersion; - return breif; - } -} diff --git a/src/main/java/a8k/app/dao/type/ProjectBaseInfo.java b/src/main/java/a8k/app/dao/type/ProjectBaseInfo.java deleted file mode 100644 index d0356e6..0000000 --- a/src/main/java/a8k/app/dao/type/ProjectBaseInfo.java +++ /dev/null @@ -1,42 +0,0 @@ -package a8k.app.dao.type; - -import a8k.app.optalgo.type.a8kidcard.zenum.A8kReactionFlowType; -import a8k.app.utils.ZJsonHelper; - -import java.io.Serializable; - -public class ProjectBaseInfo implements Serializable { - public int id; - - /*基础配置*/ - - public Integer projId; //项目index - public String projName; //项目名称 - public String projShortName;//项目缩写词 - public Integer subProjNum; //是否是多联卡 - public Integer reactionTemperature; //反应温度 - public String color; //项目颜色 - - /*流程类型*/ - public A8kReactionFlowType reactionFlowType; //反应流程 - - /*样本配置*/ - public Integer wBloodSampleVolUl; //全血样本量ul - public Integer serumSampleVolUl; //血清/血浆样本量ul - public Integer shakeTimes; //摇匀次数 - - /*缓冲液配置*/ - public Integer bigBufferSampleUl; //大瓶缓冲液取样量ul - - /*缓和液预处理配置*/ - public Integer mixedLiquidMixingTimes; //混合液混匀次数 - public Integer mixedLiquidMixingVolUl; //混合液混匀量ul - - /*孵育配置*/ - public Integer reactionPlateIncubationTimeMin; //反应板孵育时间Min - public Integer reactionPlateDropletVolUl; //反应板滴样量ul - - public String toString() { - return ZJsonHelper.objectToJson(this); - } -} 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/optalgo/projinfo/A8kProjInfoCardBreif.java b/src/main/java/a8k/app/optalgo/projinfo/A8kProjInfoCardBreif.java new file mode 100644 index 0000000..7d83456 --- /dev/null +++ b/src/main/java/a8k/app/optalgo/projinfo/A8kProjInfoCardBreif.java @@ -0,0 +1,17 @@ +package a8k.app.optalgo.projinfo; + +import java.util.Date; + +public class A8kProjInfoCardBreif { + public int id; + public String color;// + + // content in idcard + public String projName; // 项目名称 0x0001,15 + public String lotId; // 批次名称 0x0010,12 + + public Date expiryDate; // 有效日期 0x001C + public Integer projId; // 项目名称代码 0x001F + public Integer palteCode; // 板条条码代码 0x0020 + public Integer updateChipVersion; // 更新芯片版本号 0x0021 +} diff --git a/src/main/java/a8k/app/optalgo/projinfo/OptCfg.java b/src/main/java/a8k/app/optalgo/projinfo/OptCfg.java new file mode 100644 index 0000000..a68a7c7 --- /dev/null +++ b/src/main/java/a8k/app/optalgo/projinfo/OptCfg.java @@ -0,0 +1,22 @@ +package a8k.app.optalgo.projinfo; + +import a8k.app.optalgo.type.a8kidcard.zenum.A8kOptType; + +import java.io.Serializable; + +public class OptCfg implements Serializable { + public int id = 0; + public Integer projId; //项目INDEX + public String projName; //项目名称 + public Integer subProjIndex;//子项目INDEX + /*光学配置*/ + public String subProjName; //子项目 名称 + public String subProjShortName; //子项目 缩写名称 + + /*光学类型*/ + public A8kOptType optType; //子项目 光学类型 necessity + public Integer optScanRange; //子项目 扫描范围 扫描范围 + + public Integer optScanPeakNum; //子项目 实际扫描到的峰的数量 + public Integer peakNameRefNum; //子项目 峰的数量 +} diff --git a/src/main/java/a8k/app/optalgo/projinfo/ProjBuildinInfo.java b/src/main/java/a8k/app/optalgo/projinfo/ProjBuildinInfo.java new file mode 100644 index 0000000..1467d96 --- /dev/null +++ b/src/main/java/a8k/app/optalgo/projinfo/ProjBuildinInfo.java @@ -0,0 +1,118 @@ +package a8k.app.optalgo.projinfo; + +import a8k.app.optalgo.type.a8kidcard.zenum.A8kOptType; +import a8k.app.optalgo.type.a8kidcard.zenum.A8kReactionFlowType; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.Serializable; +import java.util.List; + +//@Slf4j +@Data +public class ProjBuildinInfo implements Serializable { + static Logger log = LoggerFactory.getLogger(ProjBuildinInfo.class); + /*基础配置*/ + public Integer projId; //项目index + public String projName; //项目名称 + public String projShortName;//项目缩写词 + public Integer subProjNum; //是否是多联卡 + public Integer reactionTemperature; //反应温度 + public String color; //项目颜色 + + /*流程类型*/ + public A8kReactionFlowType reactionFlowType; //反应流程 + + /*样本配置*/ + public Integer wBloodSampleVolUl; //全血样本量ul + public Integer serumSampleVolUl; //血清/血浆样本量ul + public Integer shakeTimes; //摇匀次数 + + /*缓冲液配置*/ + public Integer bigBufferSampleUl; //大瓶缓冲液取样量ul + + /*缓和液预处理配置*/ + public Integer mixedLiquidMixingTimes; //混合液混匀次数 + public Integer mixedLiquidMixingVolUl; //混合液混匀量ul + + /*孵育配置*/ + public Integer reactionPlateIncubationTimeMin; //反应板孵育时间Min + public Integer reactionPlateDropletVolUl; //反应板滴样量ul + + public List optcfg; + + public ProjBuildinInfo() {} //for json + + public A8kOptType getOptType(Integer subProjIndex) { + for (OptCfg optCfg : optcfg) { + if (optCfg.subProjIndex.equals(subProjIndex)) { + return optCfg.optType; + } + } + return null; + } + + @JsonIgnore + public OptCfg getFoptCfg() { + for (OptCfg optCfg : optcfg) { + if (optCfg.optType.equals(A8kOptType.FOPT)) { + return optCfg; + } + } + return null; + } + + @JsonIgnore + public OptCfg getToptCfg() { + for (OptCfg optCfg : optcfg) { + if (optCfg.optType.equals(A8kOptType.TOPT)) { + return optCfg; + } + } + return null; + } + + + public ProjBuildinInfo(ProjectBaseInfo baseInfo, List optInfos) { + //遍历所有ProjectBaseInfo字段，赋值给ProjBuildinInfo + for (var field : baseInfo.getClass().getDeclaredFields()) { + if (field.getName().equals("id")) { + continue; + } + + try { + field.setAccessible(true); + this.getClass().getField(field.getName()).set(this, field.get(baseInfo)); + } catch (IllegalAccessException | NoSuchFieldException e) { + log.error("constructor error,set field {} fail", field.getName(), e); + System.exit(1); + } + } + optcfg = optInfos; + } + + + public String getOptMark() { + boolean optT = false; + boolean optF = false; + for (OptCfg optCfg : optcfg) { + if (optCfg.optType.equals(A8kOptType.TOPT)) { + optT = true; + } + if (optCfg.optType.equals(A8kOptType.FOPT)) { + optF = true; + } + } + if (optT && optF) { + return "T/F"; + } else if (optT) { + return "T"; + } else if (optF) { + return "F"; + } else { + return "N/A"; + } + } +} \ No newline at end of file diff --git a/src/main/java/a8k/app/optalgo/projinfo/ProjExtInfoCard.java b/src/main/java/a8k/app/optalgo/projinfo/ProjExtInfoCard.java new file mode 100644 index 0000000..1b87118 --- /dev/null +++ b/src/main/java/a8k/app/optalgo/projinfo/ProjExtInfoCard.java @@ -0,0 +1,83 @@ +package a8k.app.optalgo.projinfo; + +import a8k.app.optalgo.type.a8kidcard.A8kOptFnFormula; +import a8k.app.utils.ZDateUtils; +import com.fasterxml.jackson.databind.ObjectMapper; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ProjExtInfoCard implements Serializable { + public int id; + public String color;// + public String projShortName; // 项目简称 0x + + // content in idcard + public String projName; // 项目名称 0x0001,15 + public String lotId; // 批次名称 0x0010,12 + + public Date expiryDate; // 有效日期 0x001C + + public String getExpiryDateStr() { + return expiryDate == null ? "" : ZDateUtils.toDateString(expiryDate); + } + + public Integer projId; // 项目名称代码 0x001F + public Integer palteCode; // 板条条码代码 0x0020 + public Integer updateChipVersion; // 更新芯片版本号 0x0021 + + public Double QCPeakMinVal = 0.0; // 质控峰最小值 0x0022 + public Double QCPeakMaxVal = 3000.0; // 质控峰最大值 设置值x10最大不超过250000 0x0027 + public Integer optType = -1; // 光学类型 光学类型(0=自动;1=F光学;2=T光学;3=F/T光学;其他=无效;) 0x002C + public Integer optFixedGainSetting = -1; // 光学固定增益设置 0x002D + public Integer optAreaPeakCount = -1; // 光学面积峰个数 0x002E + public Integer calculationDirection = 0; // 计算方向 0=默认；1=反向；2=正常； 0x002F + public Integer sampleType = 0; // 0=默认；1=血清；2=全血；其他值=无效 样本类型 0x0030 + public Integer equipmentManufacturer = 0; // 设备厂商 0x0031 + public Integer tOptIlluminationTime = -1; // T光学持续光照时间 0x0032 + public Integer incMultiInstruDataMerge = -1; // 是否包含多款仪器数据合并 0x0034 + public Integer multiInstruDataMerge0 = -1; // 多款仪器数据合并 0x0035 + public Integer multiInstruDataMerge1 = -1; // 多款仪器数据合并 0x0036 + public Integer wBloodSampleVolUl = -1; // 全血样本量 0x0037 + public Integer serumSampleVolUl = -1; // 血清/血浆样本量 0x0038 + public Integer tubeMixingCount = -1; // 试管混匀次数 0x0039 + public Integer bufferBottleSize = -1; // 缓冲液瓶大小 0x003A ,没有的配置 + public Integer bufferBottleCapacity = -1; // 缓冲液瓶容量 0x003B ,没有的配置 + public Integer bufferSolutionMixingCnt = -1; // 缓冲液吸吐混匀次数 0x003C + public Integer reactionPlateDropletVolUl = -1; // 缓冲液吐混混匀量 0x003D + public Integer buffLiquidReactionTime = -1; // 缓冲液反应时间 0x003E + public Integer reactionPlateReactionTime = -1; // 反应板反应时间 0x003F + public Integer reactionPlateDropletVol = -1; // 反应板滴样量 0x0040 + public Integer resultDecimalPlaces = -1; // 结果小数点位数 0x0041 + public Integer scanningRange = -1; // 扫描范围 0x0042 + + public Integer subProjNum = 1; // 当前项目是几联卡项目,val = 1,2,3 0x0100 + + public List projFnFormuals = new ArrayList<>(); + + public String toString() { + ObjectMapper mapper = new ObjectMapper(); + try { + return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(this); + } catch (Exception e) { + return "A8kIdCardInfo.toString() error"; + } + } + + + + public A8kProjInfoCardBreif toBreif() { + A8kProjInfoCardBreif breif = new A8kProjInfoCardBreif(); + breif.id = id; + breif.color = color; + breif.projName = projName; + breif.lotId = lotId; + breif.expiryDate = expiryDate; + breif.projId = projId; + breif.palteCode = palteCode; + breif.updateChipVersion = updateChipVersion; + return breif; + } +} diff --git a/src/main/java/a8k/app/optalgo/projinfo/ProjInfo.java b/src/main/java/a8k/app/optalgo/projinfo/ProjInfo.java new file mode 100644 index 0000000..d26bfa8 --- /dev/null +++ b/src/main/java/a8k/app/optalgo/projinfo/ProjInfo.java @@ -0,0 +1,16 @@ +package a8k.app.optalgo.projinfo; + +import java.io.Serializable; + +public class ProjInfo implements Serializable { + public ProjBuildinInfo buildIn; + public ProjExtInfoCard ext; + + public ProjInfo(ProjBuildinInfo buildIn, ProjExtInfoCard ext) { + this.buildIn = buildIn; + this.ext = ext; + } + + public ProjInfo() { + } +} \ No newline at end of file diff --git a/src/main/java/a8k/app/optalgo/projinfo/ProjectBaseInfo.java b/src/main/java/a8k/app/optalgo/projinfo/ProjectBaseInfo.java new file mode 100644 index 0000000..f767999 --- /dev/null +++ b/src/main/java/a8k/app/optalgo/projinfo/ProjectBaseInfo.java @@ -0,0 +1,42 @@ +package a8k.app.optalgo.projinfo; + +import a8k.app.optalgo.type.a8kidcard.zenum.A8kReactionFlowType; +import a8k.app.utils.ZJsonHelper; + +import java.io.Serializable; + +public class ProjectBaseInfo implements Serializable { + public int id; + + /*基础配置*/ + + public Integer projId; //项目index + public String projName; //项目名称 + public String projShortName;//项目缩写词 + public Integer subProjNum; //是否是多联卡 + public Integer reactionTemperature; //反应温度 + public String color; //项目颜色 + + /*流程类型*/ + public A8kReactionFlowType reactionFlowType; //反应流程 + + /*样本配置*/ + public Integer wBloodSampleVolUl; //全血样本量ul + public Integer serumSampleVolUl; //血清/血浆样本量ul + public Integer shakeTimes; //摇匀次数 + + /*缓冲液配置*/ + public Integer bigBufferSampleUl; //大瓶缓冲液取样量ul + + /*缓和液预处理配置*/ + public Integer mixedLiquidMixingTimes; //混合液混匀次数 + public Integer mixedLiquidMixingVolUl; //混合液混匀量ul + + /*孵育配置*/ + public Integer reactionPlateIncubationTimeMin; //反应板孵育时间Min + public Integer reactionPlateDropletVolUl; //反应板滴样量ul + + public String toString() { + return ZJsonHelper.objectToJson(this); + } +} diff --git a/src/main/java/a8k/app/optalgo/type/ProjInfoReader.java b/src/main/java/a8k/app/optalgo/type/ProjInfoReader.java new file mode 100644 index 0000000..ef88eb5 --- /dev/null +++ b/src/main/java/a8k/app/optalgo/type/ProjInfoReader.java @@ -0,0 +1,32 @@ +package a8k.app.optalgo.type; + +import a8k.app.a8ktype.device.BloodType; +import a8k.app.optalgo.projinfo.ProjBuildinInfo; +import a8k.app.optalgo.projinfo.ProjExtInfoCard; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class ProjInfoReader { + + static public Integer getSampleVol(ProjBuildinInfo buildinInfo, ProjExtInfoCard extInfoCard, BloodType bloodType) { + + if (bloodType.equals(BloodType.WHOLE_BLOOD)) { + if (isEffectiveValue(extInfoCard.wBloodSampleVolUl)) { + return extInfoCard.wBloodSampleVolUl; + } else { + return buildinInfo.wBloodSampleVolUl; + } + } else { + if (isEffectiveValue(extInfoCard.serumSampleVolUl)) { + return extInfoCard.serumSampleVolUl; + } else { + return buildinInfo.serumSampleVolUl; + } + + } + } + + private static Boolean isEffectiveValue(Integer val) { + return val != null && val >= 0; + } +} diff --git a/src/main/java/a8k/app/optalgo/type/ProjInfoUtils.java b/src/main/java/a8k/app/optalgo/type/ProjInfoUtils.java new file mode 100644 index 0000000..f92c3de --- /dev/null +++ b/src/main/java/a8k/app/optalgo/type/ProjInfoUtils.java @@ -0,0 +1,62 @@ +package a8k.app.optalgo.type; + +import a8k.app.a8ktype.state.ProjectTaskContext; +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; + +import java.util.ArrayList; +import java.util.List; + +public class ProjInfoUtils { + static public ProjBriefInfo buildProjBrefInfo(ProjectTaskContext taskCxt) { + ProjBuildinInfo buildinInfo = taskCxt.getProjBuildinInfo(); + if (buildinInfo == null ) { + return null; + } + return buildProjBrefInfo(buildinInfo); + } + + static public ProjBriefInfo buildProjBrefInfo(ProjBuildinInfo buildinInfo) { + ProjBriefInfo projBriefInfo = new ProjBriefInfo(); + projBriefInfo.projId = buildinInfo.projId; + projBriefInfo.projName = buildinInfo.projName; + projBriefInfo.projShortName = buildinInfo.projShortName; + projBriefInfo.color = buildinInfo.color; + return projBriefInfo; + } + + static public List buidProjBriefInfoList(List projBuildinInfos) { + List projBriefInfos = new ArrayList<>(); + for (ProjBuildinInfo projBuildinInfo : projBuildinInfos) { + ProjBriefInfo projBriefInfo = buildProjBrefInfo(projBuildinInfo); + projBriefInfos.add(projBriefInfo); + } + return projBriefInfos; + } + + static public Integer getReactionPlateIncubationTimeMin(ProjBuildinInfo projBuildinInfo, ProjExtInfoCard extInfoCard) { + if (extInfoCard != null && extInfoCard.reactionPlateReactionTime > 0) { + return extInfoCard.reactionPlateReactionTime; + } + if (projBuildinInfo != null) { + return projBuildinInfo.reactionPlateIncubationTimeMin; + } + return 0; + } + + + + static public A8kOptFnFormula getA8kOptFnFormula(ProjExtInfoCard extInfoCard, Integer subProjIndex) { + return extInfoCard.projFnFormuals.get(subProjIndex); + } + + static public ProjInfo buildProjInfo(ProjectTaskContext taskCxt) { + ProjInfo projInfo = new ProjInfo(); + projInfo.buildIn = taskCxt.getProjBuildinInfo(); + projInfo.ext = taskCxt.getProjExtInfoCard(); + return projInfo; + } +} 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/ProjBuildinInfo.java b/src/main/java/a8k/app/utils/ProjBuildinInfo.java deleted file mode 100644 index 4a1b58d..0000000 --- a/src/main/java/a8k/app/utils/ProjBuildinInfo.java +++ /dev/null @@ -1,120 +0,0 @@ -package a8k.app.utils; - -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; -import lombok.Data; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.Serializable; -import java.util.List; - -//@Slf4j -@Data -public class ProjBuildinInfo implements Serializable { - static Logger log = LoggerFactory.getLogger(ProjBuildinInfo.class); - /*基础配置*/ - public Integer projId; //项目index - public String projName; //项目名称 - public String projShortName;//项目缩写词 - public Integer subProjNum; //是否是多联卡 - public Integer reactionTemperature; //反应温度 - public String color; //项目颜色 - - /*流程类型*/ - public A8kReactionFlowType reactionFlowType; //反应流程 - - /*样本配置*/ - public Integer wBloodSampleVolUl; //全血样本量ul - public Integer serumSampleVolUl; //血清/血浆样本量ul - public Integer shakeTimes; //摇匀次数 - - /*缓冲液配置*/ - public Integer bigBufferSampleUl; //大瓶缓冲液取样量ul - - /*缓和液预处理配置*/ - public Integer mixedLiquidMixingTimes; //混合液混匀次数 - public Integer mixedLiquidMixingVolUl; //混合液混匀量ul - - /*孵育配置*/ - public Integer reactionPlateIncubationTimeMin; //反应板孵育时间Min - public Integer reactionPlateDropletVolUl; //反应板滴样量ul - - public List optcfg; - - public ProjBuildinInfo() {} //for json - - public A8kOptType getOptType(Integer subProjIndex) { - for (OptCfg optCfg : optcfg) { - if (optCfg.subProjIndex.equals(subProjIndex)) { - return optCfg.optType; - } - } - return null; - } - - @JsonIgnore - public OptCfg getFoptCfg() { - for (OptCfg optCfg : optcfg) { - if (optCfg.optType.equals(A8kOptType.FOPT)) { - return optCfg; - } - } - return null; - } - - @JsonIgnore - public OptCfg getToptCfg() { - for (OptCfg optCfg : optcfg) { - if (optCfg.optType.equals(A8kOptType.TOPT)) { - return optCfg; - } - } - return null; - } - - - public ProjBuildinInfo(ProjectBaseInfo baseInfo, List optInfos) { - //遍历所有ProjectBaseInfo字段，赋值给ProjBuildinInfo - for (var field : baseInfo.getClass().getDeclaredFields()) { - if (field.getName().equals("id")) { - continue; - } - - try { - field.setAccessible(true); - this.getClass().getField(field.getName()).set(this, field.get(baseInfo)); - } catch (IllegalAccessException | NoSuchFieldException e) { - log.error("constructor error,set field {} fail", field.getName(), e); - System.exit(1); - } - } - optcfg = optInfos; - } - - - public String getOptMark() { - boolean optT = false; - boolean optF = false; - for (OptCfg optCfg : optcfg) { - if (optCfg.optType.equals(A8kOptType.TOPT)) { - optT = true; - } - if (optCfg.optType.equals(A8kOptType.FOPT)) { - optF = true; - } - } - if (optT && optF) { - return "T/F"; - } else if (optT) { - return "T"; - } else if (optF) { - return "F"; - } else { - return "N/A"; - } - } -} \ No newline at end of file diff --git a/src/main/java/a8k/app/utils/ProjInfo.java b/src/main/java/a8k/app/utils/ProjInfo.java deleted file mode 100644 index 13fd1b2..0000000 --- a/src/main/java/a8k/app/utils/ProjInfo.java +++ /dev/null @@ -1,18 +0,0 @@ -package a8k.app.utils; - -import a8k.app.dao.type.ProjExtInfoCard; - -import java.io.Serializable; - -public class ProjInfo implements Serializable { - public ProjBuildinInfo buildIn; - public ProjExtInfoCard ext; - - public ProjInfo(ProjBuildinInfo buildIn, ProjExtInfoCard ext) { - this.buildIn = buildIn; - this.ext = ext; - } - - public ProjInfo() { - } -} \ No newline at end of file diff --git a/src/main/java/a8k/app/utils/ProjInfoReader.java b/src/main/java/a8k/app/utils/ProjInfoReader.java deleted file mode 100644 index 1b1b513..0000000 --- a/src/main/java/a8k/app/utils/ProjInfoReader.java +++ /dev/null @@ -1,31 +0,0 @@ -package a8k.app.utils; - -import a8k.app.a8ktype.device.BloodType; -import a8k.app.dao.type.ProjExtInfoCard; -import lombok.extern.slf4j.Slf4j; - -@Slf4j -public class ProjInfoReader { - - static public Integer getSampleVol(ProjBuildinInfo buildinInfo, ProjExtInfoCard extInfoCard, BloodType bloodType) { - - if (bloodType.equals(BloodType.WHOLE_BLOOD)) { - if (isEffectiveValue(extInfoCard.wBloodSampleVolUl)) { - return extInfoCard.wBloodSampleVolUl; - } else { - return buildinInfo.wBloodSampleVolUl; - } - } else { - if (isEffectiveValue(extInfoCard.serumSampleVolUl)) { - return extInfoCard.serumSampleVolUl; - } else { - return buildinInfo.serumSampleVolUl; - } - - } - } - - private static Boolean isEffectiveValue(Integer val) { - return val != null && val >= 0; - } -} diff --git a/src/main/java/a8k/app/utils/ProjInfoUtils.java b/src/main/java/a8k/app/utils/ProjInfoUtils.java deleted file mode 100644 index 1fbd46e..0000000 --- a/src/main/java/a8k/app/utils/ProjInfoUtils.java +++ /dev/null @@ -1,60 +0,0 @@ -package a8k.app.utils; - -import a8k.app.a8ktype.state.ProjectTaskContext; -import a8k.app.dao.type.ProjExtInfoCard; -import a8k.app.optalgo.type.a8kidcard.A8kOptFnFormula; -import a8k.app.a8ktype.type.ProjBriefInfo; - -import java.util.ArrayList; -import java.util.List; - -public class ProjInfoUtils { - static public ProjBriefInfo buildProjBrefInfo(ProjectTaskContext taskCxt) { - ProjBuildinInfo buildinInfo = taskCxt.getProjBuildinInfo(); - if (buildinInfo == null ) { - return null; - } - return buildProjBrefInfo(buildinInfo); - } - - static public ProjBriefInfo buildProjBrefInfo(ProjBuildinInfo buildinInfo) { - ProjBriefInfo projBriefInfo = new ProjBriefInfo(); - projBriefInfo.projId = buildinInfo.projId; - projBriefInfo.projName = buildinInfo.projName; - projBriefInfo.projShortName = buildinInfo.projShortName; - projBriefInfo.color = buildinInfo.color; - return projBriefInfo; - } - - static public List buidProjBriefInfoList(List projBuildinInfos) { - List projBriefInfos = new ArrayList<>(); - for (ProjBuildinInfo projBuildinInfo : projBuildinInfos) { - ProjBriefInfo projBriefInfo = buildProjBrefInfo(projBuildinInfo); - projBriefInfos.add(projBriefInfo); - } - return projBriefInfos; - } - - static public Integer getReactionPlateIncubationTimeMin(ProjBuildinInfo projBuildinInfo, ProjExtInfoCard extInfoCard) { - if (extInfoCard != null && extInfoCard.reactionPlateReactionTime > 0) { - return extInfoCard.reactionPlateReactionTime; - } - if (projBuildinInfo != null) { - return projBuildinInfo.reactionPlateIncubationTimeMin; - } - return 0; - } - - - - static public A8kOptFnFormula getA8kOptFnFormula(ProjExtInfoCard extInfoCard, Integer subProjIndex) { - return extInfoCard.projFnFormuals.get(subProjIndex); - } - - static public ProjInfo buildProjInfo(ProjectTaskContext taskCxt) { - ProjInfo projInfo = new ProjInfo(); - projInfo.buildIn = taskCxt.getProjBuildinInfo(); - projInfo.ext = taskCxt.getProjExtInfoCard(); - return projInfo; - } -} 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;