From 3a1b6be4c2e03f55d9ede4a7d23e6e1e758b7e2f Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 24 Jul 2024 13:34:19 +0800 Subject: [PATCH] add --- src/main/java/a8k/appbean/KeyValType.java | 22 ----------- .../java/a8k/appbean/LargeBottleBufferPosInfo.java | 19 --------- .../java/a8k/appbean/Plates2dCodeScanPosInfo.java | 16 -------- src/main/java/a8k/appbean/Pos2d.java | 13 ------ src/main/java/a8k/appbean/Pos3d.java | 13 ------ src/main/java/a8k/appbean/PosZ.java | 11 ------ .../java/a8k/appbean/SmallBottleBufferPosInfo.java | 27 ------------- src/main/java/a8k/appbean/TubeSamplePos.java | 35 ---------------- .../java/a8k/appbean/configparam/KeyValType.java | 22 +++++++++++ .../appbean/configparam/LargeBottleBufferPos.java | 15 +++++++ .../appbean/configparam/Plates2dCodeScanPos.java | 11 ++++++ src/main/java/a8k/appbean/configparam/Pos2d.java | 13 ++++++ src/main/java/a8k/appbean/configparam/Pos3d.java | 13 ++++++ .../a8k/appbean/configparam/SampleZPosInfo.java | 17 ++++++++ .../appbean/configparam/SmallBottleBufferPos.java | 46 ++++++++++++++++++++++ .../a8k/appbean/configparam/TubeSamplePos.java | 15 +++++++ .../java/a8k/base_hardware/A8kCanBusService.java | 2 +- .../a8k/service/db/dao/HbotControlParamsDao.java | 10 +++-- 18 files changed, 160 insertions(+), 160 deletions(-) delete mode 100644 src/main/java/a8k/appbean/KeyValType.java delete mode 100644 src/main/java/a8k/appbean/LargeBottleBufferPosInfo.java delete mode 100644 src/main/java/a8k/appbean/Plates2dCodeScanPosInfo.java delete mode 100644 src/main/java/a8k/appbean/Pos2d.java delete mode 100644 src/main/java/a8k/appbean/Pos3d.java delete mode 100644 src/main/java/a8k/appbean/PosZ.java delete mode 100644 src/main/java/a8k/appbean/SmallBottleBufferPosInfo.java delete mode 100644 src/main/java/a8k/appbean/TubeSamplePos.java create mode 100644 src/main/java/a8k/appbean/configparam/KeyValType.java create mode 100644 src/main/java/a8k/appbean/configparam/LargeBottleBufferPos.java create mode 100644 src/main/java/a8k/appbean/configparam/Plates2dCodeScanPos.java create mode 100644 src/main/java/a8k/appbean/configparam/Pos2d.java create mode 100644 src/main/java/a8k/appbean/configparam/Pos3d.java create mode 100644 src/main/java/a8k/appbean/configparam/SampleZPosInfo.java create mode 100644 src/main/java/a8k/appbean/configparam/SmallBottleBufferPos.java create mode 100644 src/main/java/a8k/appbean/configparam/TubeSamplePos.java diff --git a/src/main/java/a8k/appbean/KeyValType.java b/src/main/java/a8k/appbean/KeyValType.java deleted file mode 100644 index e660d13..0000000 --- a/src/main/java/a8k/appbean/KeyValType.java +++ /dev/null @@ -1,22 +0,0 @@ -package a8k.appbean; - -public enum KeyValType { - Pos3d("Pos3d"),// - Pos2d("Pos2d"),// - Bool("Bool"),// - Int("Int"),// - String("String"),// - LargeBottleBufferPosInfo("LargeBottleBufferPosInfo"),// - Plates2dCodeScanPosInfo("Plates2dCodeScanPosInfo"),// - SmallBottleBufferPosInfo("SmallBottleBufferPosInfo"),// - TipPickUpPosInfo("TipPickUpPosInfo"),// - TubeSamplePos("TubeSamplePos"),// - Float("Float"); - - final public String name; - - KeyValType(String name) { - this.name = name; - } - -} diff --git a/src/main/java/a8k/appbean/LargeBottleBufferPosInfo.java b/src/main/java/a8k/appbean/LargeBottleBufferPosInfo.java deleted file mode 100644 index 113d6d6..0000000 --- a/src/main/java/a8k/appbean/LargeBottleBufferPosInfo.java +++ /dev/null @@ -1,19 +0,0 @@ -package a8k.appbean; - -public class LargeBottleBufferPosInfo { - /* - * { - * "topLelf":[ - * {"x":x,"y":y} - * ], - * "xinterval":, - * "yinterval":, - * - * "scancodeLineEachRelaPos":dy, //扫码相对每个大屏缓冲液的位置,第一排-dy,第二排dy - * "sampleStartPos":z,//取样开始位置 - * "sampleHight":z,//取样深度 - * - * } - */ - -} diff --git a/src/main/java/a8k/appbean/Plates2dCodeScanPosInfo.java b/src/main/java/a8k/appbean/Plates2dCodeScanPosInfo.java deleted file mode 100644 index 11b4b1e..0000000 --- a/src/main/java/a8k/appbean/Plates2dCodeScanPosInfo.java +++ /dev/null @@ -1,16 +0,0 @@ -package a8k.appbean; - -public class Plates2dCodeScanPosInfo { - - public Pos2d getCh0ScanPos() { - return null; //通道1扫码位置 - } - - public Integer getInterval() { - return 0; - } - - public Pos2d getChScanPos(int chindex) { - return null; - } -} diff --git a/src/main/java/a8k/appbean/Pos2d.java b/src/main/java/a8k/appbean/Pos2d.java deleted file mode 100644 index 17c84d8..0000000 --- a/src/main/java/a8k/appbean/Pos2d.java +++ /dev/null @@ -1,13 +0,0 @@ -package a8k.appbean; - -public class Pos2d { - - public int x; - public int y; - - public Pos2d(int x, int y) { - this.x = x; - this.y = y; - } - -} diff --git a/src/main/java/a8k/appbean/Pos3d.java b/src/main/java/a8k/appbean/Pos3d.java deleted file mode 100644 index ff8e776..0000000 --- a/src/main/java/a8k/appbean/Pos3d.java +++ /dev/null @@ -1,13 +0,0 @@ -package a8k.appbean; - -public class Pos3d { - public int x; - public int y; - public int z; - - public Pos3d(int x, int y, int z) { - this.x = x; - this.y = y; - this.z = z; - } -} diff --git a/src/main/java/a8k/appbean/PosZ.java b/src/main/java/a8k/appbean/PosZ.java deleted file mode 100644 index 1bc5f5f..0000000 --- a/src/main/java/a8k/appbean/PosZ.java +++ /dev/null @@ -1,11 +0,0 @@ -package a8k.appbean; - -public class PosZ { - int zpos; - int depth; - - PosZ(int zpos, int depth) { - this.zpos = zpos; - this.depth = depth; - } -} diff --git a/src/main/java/a8k/appbean/SmallBottleBufferPosInfo.java b/src/main/java/a8k/appbean/SmallBottleBufferPosInfo.java deleted file mode 100644 index 2f179bb..0000000 --- a/src/main/java/a8k/appbean/SmallBottleBufferPosInfo.java +++ /dev/null @@ -1,27 +0,0 @@ -package a8k.appbean; - -public class SmallBottleBufferPosInfo { - /* - * { - * "topLelf":[ - * {"x":x,"y":y}, - * {"x":x,"y":y}, - * {"x":x,"y":y}, - * {"x":x,"y":y}, - * {"x":x,"y":y}, - * {"x":x,"y":y} - * ], - * "xinterval":, - * "yinterval":, - * - * "scancodeRelaPos":[dx,dy], - * "piercedZPos":z,//刺破高度 - * "distributeZPos":z,//吐液高度 - * "detectMaterialDistributeZpos":z//探测物质吐液高度 - - * - * } - */ - - -} diff --git a/src/main/java/a8k/appbean/TubeSamplePos.java b/src/main/java/a8k/appbean/TubeSamplePos.java deleted file mode 100644 index 7d75651..0000000 --- a/src/main/java/a8k/appbean/TubeSamplePos.java +++ /dev/null @@ -1,35 +0,0 @@ -package a8k.appbean; - -public class TubeSamplePos { - /* - "{ - "sampleXYPos0":[x,y], //非全血试管取样位置 - "sampleXYPos1":[x,y], //全血试管取样位置 - - "HighBlood":{ - "sampleStartPos":1, - "sampleDepth":2, - }, - "ShortBlood":{ - "sampleStartPos":1, - "sampleDepth":2, - } - "Mini":{ - "sampleStartPos":1, - "sampleDepth":2, - } - "MiniBlood":{ - "sampleStartPos":1, - "sampleDepth":2, - } - "BulletTube1P5":{ - "sampleStartPos":1, - "sampleDepth":2, - } - "BulletTube0P5":{ - "sampleStartPos":1, - "sampleDepth":2, - } - }" - */ -} diff --git a/src/main/java/a8k/appbean/configparam/KeyValType.java b/src/main/java/a8k/appbean/configparam/KeyValType.java new file mode 100644 index 0000000..cea9538 --- /dev/null +++ b/src/main/java/a8k/appbean/configparam/KeyValType.java @@ -0,0 +1,22 @@ +package a8k.appbean.configparam; + +public enum KeyValType { + Pos3d("Pos3d"),// + Pos2d("Pos2d"),// + Bool("Bool"),// + Int("Int"),// + String("String"),// + LargeBottleBufferPosInfo("LargeBottleBufferPosInfo"),// + Plates2dCodeScanPosInfo("Plates2dCodeScanPosInfo"),// + SmallBottleBufferPosInfo("SmallBottleBufferPosInfo"),// + TipPickUpPosInfo("TipPickUpPosInfo"),// + TubeSamplePos("TubeSamplePos"),// + Float("Float"); + + final public String name; + + KeyValType(String name) { + this.name = name; + } + +} diff --git a/src/main/java/a8k/appbean/configparam/LargeBottleBufferPos.java b/src/main/java/a8k/appbean/configparam/LargeBottleBufferPos.java new file mode 100644 index 0000000..4f5ac0b --- /dev/null +++ b/src/main/java/a8k/appbean/configparam/LargeBottleBufferPos.java @@ -0,0 +1,15 @@ +package a8k.appbean.configparam; + +/** + * 大瓶缓冲液位置信息 + */ +public class LargeBottleBufferPos { + public Pos2d topLelf; + + public Integer xinterval; //x间隔 + public Integer yinterval; //y间隔 + + public Integer scancodeRelaPos; //扫码相对每个大屏缓冲液的位置,第一排 -dy,第二排dy + public Integer sampleZPos; //取样开始位置 + public Integer sampleZDepth; //取样深度 +} diff --git a/src/main/java/a8k/appbean/configparam/Plates2dCodeScanPos.java b/src/main/java/a8k/appbean/configparam/Plates2dCodeScanPos.java new file mode 100644 index 0000000..21d2428 --- /dev/null +++ b/src/main/java/a8k/appbean/configparam/Plates2dCodeScanPos.java @@ -0,0 +1,11 @@ +package a8k.appbean.configparam; + +/** + * 板夹仓扫码信息 + */ +public class Plates2dCodeScanPos { + public Pos2d ch0ScanPos; //通道1扫码位置 + public Integer scanYInterval; //扫码间隔 + + +} diff --git a/src/main/java/a8k/appbean/configparam/Pos2d.java b/src/main/java/a8k/appbean/configparam/Pos2d.java new file mode 100644 index 0000000..f11558e --- /dev/null +++ b/src/main/java/a8k/appbean/configparam/Pos2d.java @@ -0,0 +1,13 @@ +package a8k.appbean.configparam; + +public class Pos2d { + + public Integer x; + public Integer y; + + public Pos2d(Integer x, Integer y) { + this.x = x; + this.y = y; + } + +} diff --git a/src/main/java/a8k/appbean/configparam/Pos3d.java b/src/main/java/a8k/appbean/configparam/Pos3d.java new file mode 100644 index 0000000..b7cd0ab --- /dev/null +++ b/src/main/java/a8k/appbean/configparam/Pos3d.java @@ -0,0 +1,13 @@ +package a8k.appbean.configparam; + +public class Pos3d { + public Integer x; + public Integer y; + public Integer z; + + public Pos3d(Integer x, Integer y, Integer z) { + this.x = x; + this.y = y; + this.z = z; + } +} diff --git a/src/main/java/a8k/appbean/configparam/SampleZPosInfo.java b/src/main/java/a8k/appbean/configparam/SampleZPosInfo.java new file mode 100644 index 0000000..08ed851 --- /dev/null +++ b/src/main/java/a8k/appbean/configparam/SampleZPosInfo.java @@ -0,0 +1,17 @@ +package a8k.appbean.configparam; + +public class SampleZPosInfo { + public Integer sampleZPos;//采样探测起始位 + public Integer sampleZDepth;//采样深度 + + /* + * 如果样本容器直径不随液面高度变化,那么LLFVelK=0,LLFVel=常数 + * 液面跟随速度=LLFVelK*液面相对起始位置高度+LLFVel + * + * 如果样本容器直径随液面高度变化,那么LLFVelK=常数,LLFVel=常数 + * 液面跟随速度=LLFVelK*液面相对起始位置高度+LLFVel + */ + + public Integer LLFVelK;//液面跟随速度 + public Integer LLFVel;//液面跟随速度 +} diff --git a/src/main/java/a8k/appbean/configparam/SmallBottleBufferPos.java b/src/main/java/a8k/appbean/configparam/SmallBottleBufferPos.java new file mode 100644 index 0000000..11ea93d --- /dev/null +++ b/src/main/java/a8k/appbean/configparam/SmallBottleBufferPos.java @@ -0,0 +1,46 @@ +package a8k.appbean.configparam; + +public class SmallBottleBufferPos { + /* + * { + * "topLelf":[ + * {"x":x,"y":y}, + * {"x":x,"y":y}, + * {"x":x,"y":y}, + * {"x":x,"y":y}, + * {"x":x,"y":y}, + * {"x":x,"y":y} + * ], + * "xinterval":, + * "yinterval":, + * + * "scancodeRelaPos":[dx,dy], + * "piercedZPos":z,//刺破高度 + * "distributeZPos":z,//吐液高度 + * "detectMaterialDistributeZpos":z//探测物质吐液高度 + + * + * } + */ + + public Pos2d g0TopLelf; + public Pos2d g1TopLelf; + public Pos2d g2TopLelf; + public Pos2d g3TopLelf; + public Pos2d g4TopLelf; + public Pos2d g5TopLelf; + + public Integer xInterval; //x间隔 + public Integer yInterval; //y间隔 + + public Integer sampleZPos; //取样开始位置 + public Integer sampleZDepth; //取样深度 + + public Pos2d scanRelaPos;//扫码相对配置 + + public Integer piercedZPos; //刺破高度 + public Integer smallBottleBufDistributeZPos; //小瓶缓冲液吐液高度 + public Integer detectMaterialDistributeZpos; //探测物质吐液高度 + + +} diff --git a/src/main/java/a8k/appbean/configparam/TubeSamplePos.java b/src/main/java/a8k/appbean/configparam/TubeSamplePos.java new file mode 100644 index 0000000..ef49fce --- /dev/null +++ b/src/main/java/a8k/appbean/configparam/TubeSamplePos.java @@ -0,0 +1,15 @@ +package a8k.appbean.configparam; + +public class TubeSamplePos { + + Pos2d sampleXYPos0; //不需要脱帽盖帽摇匀的取样位置 + Pos2d sampleXYPos1; //需要脱帽盖帽摇匀的取样位置 + + SampleZPosInfo HighBlood; //sampleXYPos1 + SampleZPosInfo ShortBlood;//sampleXYPos1 + + SampleZPosInfo Mini; //sampleXYPos0 + SampleZPosInfo MiniBlood; //sampleXYPos0 + SampleZPosInfo BulletTube1P5; //sampleXYPos0 + SampleZPosInfo BulletTube0P5; //sampleXYPos0 +} diff --git a/src/main/java/a8k/base_hardware/A8kCanBusService.java b/src/main/java/a8k/base_hardware/A8kCanBusService.java index 1290466..1954863 100644 --- a/src/main/java/a8k/base_hardware/A8kCanBusService.java +++ b/src/main/java/a8k/base_hardware/A8kCanBusService.java @@ -3,7 +3,7 @@ package a8k.base_hardware; import a8k.a8k_can_protocol.*; import a8k.a8k_can_protocol.MId; import a8k.appbean.HardwareException; -import a8k.appbean.Pos2d; +import a8k.appbean.configparam.Pos2d; import a8k.appbean.appevent.A8kHardwareReport; import a8k.service.AppEventBusService; import a8k.utils.ByteArray; diff --git a/src/main/java/a8k/service/db/dao/HbotControlParamsDao.java b/src/main/java/a8k/service/db/dao/HbotControlParamsDao.java index 9133b71..abee730 100644 --- a/src/main/java/a8k/service/db/dao/HbotControlParamsDao.java +++ b/src/main/java/a8k/service/db/dao/HbotControlParamsDao.java @@ -1,6 +1,10 @@ package a8k.service.db.dao; import a8k.appbean.*; +import a8k.appbean.configparam.LargeBottleBufferPos; +import a8k.appbean.configparam.Plates2dCodeScanPos; +import a8k.appbean.configparam.Pos3d; +import a8k.appbean.configparam.SmallBottleBufferPos; /** * XY机械臂控制相关参数访问 @@ -16,16 +20,16 @@ public class HbotControlParamsDao { } //TIP组0 位置信息 - SmallBottleBufferPosInfo getSmallBottleBufferPosInfo() { + SmallBottleBufferPos getSmallBottleBufferPosInfo() { return null; }//小瓶缓冲液位置 - Plates2dCodeScanPosInfo getPlates2dCodeScanPosInfo() { + Plates2dCodeScanPos getPlates2dCodeScanPosInfo() { return null; }//反应板夹仓位置 - LargeBottleBufferPosInfo getLargeBottleBufferPosInfo() { + LargeBottleBufferPos getLargeBottleBufferPosInfo() { return null; }//大瓶缓冲液位置