From cfa767381d5273c93f5061a3558f9125e2db985c Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sun, 14 Jul 2024 14:40:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20scanClampModuleCompres?= =?UTF-8?q?s=20=E5=92=8C=20scanClampModuleReset=20=20=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hardware/MotorTubeRackMoveCtrlService.java | 19 +++++++++++++++++-- .../hardware/SamplesPreProcessModuleCtrlService.java | 11 ++--------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java b/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java index 5a6e07e..6ba7561 100644 --- a/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java +++ b/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java @@ -141,11 +141,11 @@ public class MotorTubeRackMoveCtrlService { public void moveTubeToExistJudgmentPos(String tubeType, Integer tubeIndex) { } - public boolean isTubeRackExitInEnterPos() { + public boolean isTubeRackInEnterPos() { return false; } - public boolean isTubeRackExitInExitPos() { + public boolean isTubeRackInExitPos() { return false; } @@ -163,4 +163,19 @@ public class MotorTubeRackMoveCtrlService { // + /** + * 扫描夹紧机构夹紧 + */ + public void scanClampModuleCompress() { + + } + + /** + * 扫描夹紧机构复位 + */ + public void scanClampModuleReset() { + + } + + } diff --git a/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java b/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java index 32065e5..b45c27f 100644 --- a/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java +++ b/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java @@ -4,13 +4,6 @@ import a8k.appbean.SampleTubeState; public class SamplesPreProcessModuleCtrlService { - - - - - - - /** * 样品预处理模块 * 主要负责样品预处理的相关操作 @@ -22,7 +15,7 @@ public class SamplesPreProcessModuleCtrlService { * 4.平移电机取试管位置 * 5.平移电机试管处理位置 * - * + * */ public void takeTube(String tubeType) { @@ -34,7 +27,7 @@ public class SamplesPreProcessModuleCtrlService { /** * 摇匀试管 - * @param tubeState + * @param tubeType * @param times * @param shakeDegree */ From 00d5cd69d4d127e63208074282b82236fb6449cc Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sun, 14 Jul 2024 15:10:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20scanClampModuleCompres?= =?UTF-8?q?s=20=E5=92=8C=20scanClampModuleReset=20=20=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/dao/A8KGeneralConsumablesPropertyDao.java | 36 ------------- .../a8k/service/db/dao/A8kDirectCtrlPosDao.java | 59 ---------------------- .../a8k/service/db/dao/ModulerParameterDao.java | 17 ------- .../MotorTubeRackMoveCtrlServiceParameterDao.java | 13 +++++ .../a8k/service/db/entity/A8kDirectCtrlPos.java | 27 ---------- .../db/entity/A8kGeneralConsumablesProperty.java | 20 -------- .../java/a8k/service/db/entity/A8kTubeInfo.java | 10 ++-- .../a8k/service/db/entity/ModuleParameter.java | 34 ------------- .../MotorTubeRackMoveCtrlServiceParameter.java | 40 +++++++++++++++ .../hardware/MotorTubeRackMoveCtrlService.java | 10 ++-- 10 files changed, 62 insertions(+), 204 deletions(-) delete mode 100644 src/main/java/a8k/service/db/dao/A8KGeneralConsumablesPropertyDao.java delete mode 100644 src/main/java/a8k/service/db/dao/A8kDirectCtrlPosDao.java delete mode 100644 src/main/java/a8k/service/db/dao/ModulerParameterDao.java create mode 100644 src/main/java/a8k/service/db/dao/MotorTubeRackMoveCtrlServiceParameterDao.java delete mode 100644 src/main/java/a8k/service/db/entity/A8kDirectCtrlPos.java delete mode 100644 src/main/java/a8k/service/db/entity/A8kGeneralConsumablesProperty.java delete mode 100644 src/main/java/a8k/service/db/entity/ModuleParameter.java create mode 100644 src/main/java/a8k/service/db/entity/MotorTubeRackMoveCtrlServiceParameter.java diff --git a/src/main/java/a8k/service/db/dao/A8KGeneralConsumablesPropertyDao.java b/src/main/java/a8k/service/db/dao/A8KGeneralConsumablesPropertyDao.java deleted file mode 100644 index eab14fe..0000000 --- a/src/main/java/a8k/service/db/dao/A8KGeneralConsumablesPropertyDao.java +++ /dev/null @@ -1,36 +0,0 @@ -package a8k.service.db.dao; - -import a8k.service.db.entity.A8kGeneralConsumablesProperty; -import com.iflytop.uf.UfActiveRecord; -import org.springframework.stereotype.Component; - -import java.util.Map; - -/** - * 用于存储耗材的一些属性信息 - */ -@Component -public class A8KGeneralConsumablesPropertyDao { - - - - public float getValAsFloat(String propertyKey) { - A8kGeneralConsumablesProperty val = UfActiveRecord.findOne(A8kGeneralConsumablesProperty.class, Map.of("propertyKey", propertyKey)); - assert val != null; - return Float.parseFloat(val.val); - } - - - public int getValAsInt(String propertyKey) { - A8kGeneralConsumablesProperty val = UfActiveRecord.findOne(A8kGeneralConsumablesProperty.class, Map.of("propertyKey", propertyKey)); - assert val != null; - return Integer.parseInt(val.val); - } - - public String getValAsString(String propertyKey) { - A8kGeneralConsumablesProperty val = UfActiveRecord.findOne(A8kGeneralConsumablesProperty.class, Map.of("propertyKey", propertyKey)); - assert val != null; - return val.val; - } - -} diff --git a/src/main/java/a8k/service/db/dao/A8kDirectCtrlPosDao.java b/src/main/java/a8k/service/db/dao/A8kDirectCtrlPosDao.java deleted file mode 100644 index b55c889..0000000 --- a/src/main/java/a8k/service/db/dao/A8kDirectCtrlPosDao.java +++ /dev/null @@ -1,59 +0,0 @@ -package a8k.service.db.dao; - -import a8k.appbean.PosBean; -import a8k.service.db.entity.A8kDirectCtrlPos; -import com.iflytop.uf.UfActiveRecord; -import org.springframework.stereotype.Component; - -import java.util.Map; - -/** - * - * 用于设备运行中的关键位置信息 - * - * - */ -@Component -public class A8kDirectCtrlPosDao { - - // - // 试管架移动相关坐标 - // 1.零点参考点为零点光电。 - // 2.移动坐标参考点为从左往右数第一个试管 - // 3.正方向为执行机构的正方向 - // - public static final String MotorTubeRackMotor_tubeScanPos = "MotorTubeRackMotor_tubeScanPos"; //扫码位置 - public static final String MotorTubeRackMotor_tubeHeighJudgmentPos = "MotorTubeRackMotor_tubeHeighJudgmentPos"; //高低试管判断位置 - public static final String MotorTubeRackMotor_tubePreProcessPos = "MotorTubeRackMotor_tubePreProcessPos"; //试管预处理位置 - public static final String MotorTubeRackMotor_tubeExistJudgmentPos = "MotorTubeRackMotor_tubeExistJudgmentPos";//试管有无 - public static final String MotorTubeRackMotor_tubeRackEnterPos = "MotorTubeRackMotor_tubeRackEnterPos"; //入料位置 - public static final String MotorTubeRackMotor_tubeRackExitPos = "MotorTubeRackMotor_tubeRackExitPos"; //出料位置 - public static final String MotorTubeRackMotor_tubeRackScanCodePos = "MotorTubeRackMotor_tubeRackScanCodePos"; //出料位置 - - // - // 试管扫码夹紧模块 - // - - public static final String MotorTubeScanClampModule_clampPos = "MotorTubeScanClampModule_clampPos";//试管扫码夹紧模组 夹紧位置 - public static final String MotorTubeScanClampModule_releasePos = "MotorTubeScanClampModule_releasePos";//试管扫码夹紧模组 释放位置 - - - // - // 试管预处理模块 - // - - - PosBean getPosBean(String posName) { - A8kDirectCtrlPos pos = UfActiveRecord.findOne(A8kDirectCtrlPos.class, Map.of("posName", posName)); - assert pos != null; - return new PosBean(pos.posX, pos.posY, pos.posZ); - } - - A8kDirectCtrlPos getPos(String posName) { - A8kDirectCtrlPos pos = UfActiveRecord.findOne(A8kDirectCtrlPos.class, Map.of("posName", posName)); - assert pos != null; - return pos; - } - - -} diff --git a/src/main/java/a8k/service/db/dao/ModulerParameterDao.java b/src/main/java/a8k/service/db/dao/ModulerParameterDao.java deleted file mode 100644 index e12796b..0000000 --- a/src/main/java/a8k/service/db/dao/ModulerParameterDao.java +++ /dev/null @@ -1,17 +0,0 @@ -package a8k.service.db.dao; - -import a8k.service.db.entity.ModuleParameter; - -import com.iflytop.uf.UfActiveRecord; -import org.springframework.stereotype.Component; - -import java.util.Map; - -@Component -public class ModulerParameterDao { - ModuleParameter getMotorParameter(int mid) { - var param = UfActiveRecord.findOne(ModuleParameter.class, Map.of("mid", mid)); - assert param != null; - return param; - } -} diff --git a/src/main/java/a8k/service/db/dao/MotorTubeRackMoveCtrlServiceParameterDao.java b/src/main/java/a8k/service/db/dao/MotorTubeRackMoveCtrlServiceParameterDao.java new file mode 100644 index 0000000..0c68036 --- /dev/null +++ b/src/main/java/a8k/service/db/dao/MotorTubeRackMoveCtrlServiceParameterDao.java @@ -0,0 +1,13 @@ +package a8k.service.db.dao; + +import a8k.service.db.entity.MotorTubeRackMoveCtrlServiceParameter; +import org.springframework.stereotype.Component; + +@Component +public class MotorTubeRackMoveCtrlServiceParameterDao { + + public MotorTubeRackMoveCtrlServiceParameter getParameter() { + //TODO: + return null; + } +} diff --git a/src/main/java/a8k/service/db/entity/A8kDirectCtrlPos.java b/src/main/java/a8k/service/db/entity/A8kDirectCtrlPos.java deleted file mode 100644 index 37112a9..0000000 --- a/src/main/java/a8k/service/db/entity/A8kDirectCtrlPos.java +++ /dev/null @@ -1,27 +0,0 @@ -package a8k.service.db.entity; - -import com.iflytop.uf.UfActiveRecord; -import com.iflytop.uf.UfActiveRecordField; - -/** - * A8kDirectCtrlPos - */ -public class A8kDirectCtrlPos extends UfActiveRecord { - - @UfActiveRecordField - public String posName; //位置名称 - @UfActiveRecordField - public Integer mid;//模块ID - @UfActiveRecordField - public String midName; //模块ID - @UfActiveRecordField - public Integer posX; //位置X，如果只有一个位置，则使用位置X - @UfActiveRecordField - public Integer posY; //位置Y，如果有两个位置，则使用位置X,Y - @UfActiveRecordField - public Integer posZ; //位置Z，如果有三个位置，则使用位置X,Y，Z - - public static String getTableName() { - return "A8kDirectCtrlPos" + "Table"; - } -} diff --git a/src/main/java/a8k/service/db/entity/A8kGeneralConsumablesProperty.java b/src/main/java/a8k/service/db/entity/A8kGeneralConsumablesProperty.java deleted file mode 100644 index 63f9043..0000000 --- a/src/main/java/a8k/service/db/entity/A8kGeneralConsumablesProperty.java +++ /dev/null @@ -1,20 +0,0 @@ -package a8k.service.db.entity; - -import com.iflytop.uf.UfActiveRecord; -import com.iflytop.uf.UfActiveRecordField; - -/** - * A8kDirectCtrlPos - */ -public class A8kGeneralConsumablesProperty extends UfActiveRecord { - - @UfActiveRecordField - public String propertyKey; - @UfActiveRecordField - public String val; - - - public static String getTableName() { - return "A8kGeneralConsumablesProperty" + "Table"; - } -} diff --git a/src/main/java/a8k/service/db/entity/A8kTubeInfo.java b/src/main/java/a8k/service/db/entity/A8kTubeInfo.java index 09ff0be..4bfa9a2 100644 --- a/src/main/java/a8k/service/db/entity/A8kTubeInfo.java +++ b/src/main/java/a8k/service/db/entity/A8kTubeInfo.java @@ -13,23 +13,21 @@ public class A8kTubeInfo extends UfActiveRecord { @UfActiveRecordField public String scanCode;//试管对应的编码 @UfActiveRecordField - public Integer tubeNum; //试管数量 - @UfActiveRecordField - public Double tubeSpacing; //试管之间的间隔 单位mm + public Integer tubeSpacing; //试管之间的间隔 单位0.1mm /** * 摇匀模组使用 */ @UfActiveRecordField - public Double takeTubeCapPos;//float mm 取试管帽高度 + public Integer takeTubeCapPos;// 0.1mm 取试管帽高度 /** * Z轴使用 */ @UfActiveRecordField - public Double sampleBeginPos;//float mm 取样高度 + public Integer sampleBeginPos;// 0.1mm 取样高度 @UfActiveRecordField - public Double sampleEndPos;//float mm 取样低位 + public Integer sampleEndPos;//0.1mm 取样低位 public static String getTableName() { return "A8kTubeInfo" + "Table"; diff --git a/src/main/java/a8k/service/db/entity/ModuleParameter.java b/src/main/java/a8k/service/db/entity/ModuleParameter.java deleted file mode 100644 index 8fe80d3..0000000 --- a/src/main/java/a8k/service/db/entity/ModuleParameter.java +++ /dev/null @@ -1,34 +0,0 @@ -package a8k.service.db.entity; - -import com.iflytop.uf.UfActiveRecord; -import com.iflytop.uf.UfActiveRecordField; - -public class ModuleParameter extends UfActiveRecord { - @UfActiveRecordField - Integer mid; //模块ID - - @UfActiveRecordField - String moduleName; //模块名称 - - @UfActiveRecordField - Integer zeroPosOff; //零点偏移 - - @UfActiveRecordField - Integer moveToZeroOvertime;// 回零超时时间 - - @UfActiveRecordField - Integer actionOvertime;// 执行动作的超时时间，该超时时间适用于当前模块在当前产品中所有动作的最大时间。 - - @UfActiveRecordField - Integer defaultVelocity; //默认速度 - - @UfActiveRecordField - Integer backToZeroVelocity; //回零速度 - - @UfActiveRecordField - Integer loseStepWarningJudgeDistance; //丢步异常警告距离 - - public static String getTableName() { - return "MotorParameter" + "Table"; - } -} diff --git a/src/main/java/a8k/service/db/entity/MotorTubeRackMoveCtrlServiceParameter.java b/src/main/java/a8k/service/db/entity/MotorTubeRackMoveCtrlServiceParameter.java new file mode 100644 index 0000000..3474975 --- /dev/null +++ b/src/main/java/a8k/service/db/entity/MotorTubeRackMoveCtrlServiceParameter.java @@ -0,0 +1,40 @@ +package a8k.service.db.entity; + +import com.iflytop.uf.UfActiveRecord; +import com.iflytop.uf.UfActiveRecordField; + +public class MotorTubeRackMoveCtrlServiceParameter { + @UfActiveRecordField + Integer moveToZeroOvertime;// 回零超时时间 + + @UfActiveRecordField + Integer actionOvertime;// 执行动作的超时时间，该超时时间适用于当前模块在当前产品中所有动作的最大时间。 + + @UfActiveRecordField + Integer tubeScanPos; //试管扫码位置 + + @UfActiveRecordField + Integer tubeHeighJudgmentPos; //高低试管判断位置 + + @UfActiveRecordField + Integer tubePreProcessPos; //试管预处理位置 + + @UfActiveRecordField + Integer tubeExistJudgmentPos; //入料位置 + + @UfActiveRecordField + Integer tubeRackEnterPos; //出料位置 + + @UfActiveRecordField + Integer tubeRackExitPos; //出料位置 + + @UfActiveRecordField + Integer tubeRackScanCodePos; //试管架扫码位置 + + @UfActiveRecordField + Integer horizontalMotorOffset; //水平移动电机位置偏移 + + public static String getTableName() { + return "MotorTubeRackMoveCtrlServiceParameter" + "Table"; + } +} diff --git a/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java b/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java index 6ba7561..7516313 100644 --- a/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java +++ b/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java @@ -1,8 +1,7 @@ package a8k.service.hardware; -import a8k.service.db.dao.A8kDirectCtrlPosDao; import a8k.service.db.dao.A8kTubeInfoDao; -import a8k.service.db.dao.ModulerParameterDao; +import a8k.service.db.dao.MotorTubeRackMoveCtrlServiceParameterDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -33,12 +32,13 @@ public class MotorTubeRackMoveCtrlService { // MotorTubeScanClampModule_clampPos // MotorTubeScanClampModule_releasePos - @Autowired - A8kDirectCtrlPosDao directCtrlPosTableDao; + @Autowired A8kTubeInfoDao tubeInfoDao; + @Autowired - ModulerParameterDao modulerParameterDao; + MotorTubeRackMoveCtrlServiceParameterDao serviceParameterDao; + //