From e41ec545b89e81e48ced6e10b6cc578248581a11 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 25 Jul 2024 15:02:07 +0800 Subject: [PATCH] update --- .../java/a8k/service/db/dao/A8kTubeInfoDao.java | 30 ------- .../MotorTubeRackMoveCtrlServiceParameterDao.java | 98 --------------------- .../java/a8k/service/db/entity/A8kTubeInfo.java | 34 ------- .../service/db/entity/ModuleRegConfigIterm.java | 22 ----- .../hardware/ModuleRegConfigMgrService.java | 25 ------ .../hardware/MotorTubeRackMoveCtrlService.java | 29 +++--- src/main/java/a8k/utils/HardwareParamReader.java | 2 +- zhaohe_app.db | Bin 487424 -> 487424 bytes 8 files changed, 14 insertions(+), 226 deletions(-) delete mode 100644 src/main/java/a8k/service/db/dao/A8kTubeInfoDao.java delete mode 100644 src/main/java/a8k/service/db/dao/MotorTubeRackMoveCtrlServiceParameterDao.java delete mode 100644 src/main/java/a8k/service/db/entity/A8kTubeInfo.java delete mode 100644 src/main/java/a8k/service/db/entity/ModuleRegConfigIterm.java delete mode 100644 src/main/java/a8k/service/hardware/ModuleRegConfigMgrService.java diff --git a/src/main/java/a8k/service/db/dao/A8kTubeInfoDao.java b/src/main/java/a8k/service/db/dao/A8kTubeInfoDao.java deleted file mode 100644 index 8ee0cc0..0000000 --- a/src/main/java/a8k/service/db/dao/A8kTubeInfoDao.java +++ /dev/null @@ -1,30 +0,0 @@ -package a8k.service.db.dao; - -import a8k.service.db.entity.A8kTubeInfo; -import com.iflytop.uf.UfActiveRecord; -import org.springframework.stereotype.Component; - -import java.util.Map; - -@Component -public class A8kTubeInfoDao { - public static final String BloodTubeCode = "0000"; //全血试管 - public static final String MiniTubeCode = "1111"; //迷你试管 - public static final String MiniBloodCode = "2222"; //阳普管 - public static final String BulletTube1P5Code = "5555"; //子弹头试管1.5mL - public static final String BulletTube0P5Code = "4444"; //子弹头试管0.5mL - - public static final String TubeType_HighBlood = "HighBloodTube"; //全血试管 - public static final String TubeType_ShortBlood = "ShortBloodTube"; //全血试管 - public static final String TubeType_Mini = "MiniTube"; //迷你试管 - public static final String TubeType_MiniBlood = "MiniBloodTube"; //阳普管 - public static final String TubeType_BulletTube1P5 = "BulletTube1P5"; //子弹头试管1.5mL - public static final String TubeType_BulletTube0P5 = "BulletTube0P5"; //子弹头试管0.5mL - - - public A8kTubeInfo getTubeInfo(String TypeName) { - var info = UfActiveRecord.findOne(A8kTubeInfo.class, Map.of("typeName", TypeName)); - assert info != null; - return info; - } -} diff --git a/src/main/java/a8k/service/db/dao/MotorTubeRackMoveCtrlServiceParameterDao.java b/src/main/java/a8k/service/db/dao/MotorTubeRackMoveCtrlServiceParameterDao.java deleted file mode 100644 index faffcbf..0000000 --- a/src/main/java/a8k/service/db/dao/MotorTubeRackMoveCtrlServiceParameterDao.java +++ /dev/null @@ -1,98 +0,0 @@ -package a8k.service.db.dao; - -import a8k.service.db.entity.HardwareServiceSetting; -import com.iflytop.uf.UfActiveRecord; -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.Map; - -@Component -public class MotorTubeRackMoveCtrlServiceParameterDao { - /** - * 参数存放在HardwareServiceSetting中， - * 每个参数，依赖于Key+serviceName进行索引 - */ - public final String serviceName = "MotorTubeRackMoveCtrlServiceParameterDao"; - - public List listOptions() { - return UfActiveRecord.find(HardwareServiceSetting.class, Map.of("serviceName", this.serviceName)); - } - - public HardwareServiceSetting getOption(String optionName) { - return HardwareServiceSetting.getOption(this.serviceName, optionName); - } - - // 回零超时时间 - public int getMoveToZeroOvertime() { - return HardwareServiceSetting.getInteger(this.serviceName, "MoveToZeroOvertime", 0); - } - - // 执行动作的超时时间，该超时时间适用于当前模块在当前产品中所有动作的最大时间 - public int getActionOvertime() { - return HardwareServiceSetting.getInteger(this.serviceName, "ActionOvertime", 0); - } - - //试管扫码位置 - public int getTubeScanPos() { - return HardwareServiceSetting.getInteger(this.serviceName, "TubeScanPos", 0); - } - - //高低试管判断位置 - public Integer getTubeHeighJudgmentPos() { - return HardwareServiceSetting.getInteger(this.serviceName, "TubeHeighJudgmentPos", 0); - } - - //试管预处理位置 - public Integer getTubePreProcessPos() { - return HardwareServiceSetting.getInteger(this.serviceName, "TubePreProcessPos", 0); - } - - //入料位置 - public Integer getTubeExistJudgmentPos() { - return HardwareServiceSetting.getInteger(this.serviceName, "TubeExistJudgmentPos", 0); - } - - //出料位置 - public Integer getTubeRackEnterPos() { - return HardwareServiceSetting.getInteger(this.serviceName, "TubeRackEnterPos", 0); - } - - //出料位置 - public Integer getTubeRackExitPos() { - return HardwareServiceSetting.getInteger(this.serviceName, "TubeRackExitPos", 0); - } - - //试管架扫码位置 - public Integer getTubeRackScanCodePos() { - return HardwareServiceSetting.getInteger(this.serviceName, "TubeRackScanCodePos", 0); - } - - //水平电机丢步判断 - public Integer getHorizontalMotorLostStepThresholdVal() { - return HardwareServiceSetting.getInteger(this.serviceName, "HorizontalMotorLostStepThresholdVal", 0); - } - - //试管扫码夹紧位置 - public Integer getScanCodeClampPos() { - return HardwareServiceSetting.getInteger(this.serviceName, "ScanCodeClampPos", 0); - } - - //试管扫码释放位置 - public Integer getScanCodeReleasePos() { - return HardwareServiceSetting.getInteger(this.serviceName, "ScanCodeReleasePos", 0); - } - - // - public Integer getTubeSpacing() { - return HardwareServiceSetting.getInteger(this.serviceName, "TubeSpacing", 0); - } - - public Integer getTubeScanServoTorque() { - return HardwareServiceSetting.getInteger(this.serviceName, "TubeScanServoTorque", 0); - } - - public Integer getTubeScanOvertime() { - return HardwareServiceSetting.getInteger(this.serviceName, "TubeScanOvertime", 100); - } -} diff --git a/src/main/java/a8k/service/db/entity/A8kTubeInfo.java b/src/main/java/a8k/service/db/entity/A8kTubeInfo.java deleted file mode 100644 index 6e8bff8..0000000 --- a/src/main/java/a8k/service/db/entity/A8kTubeInfo.java +++ /dev/null @@ -1,34 +0,0 @@ -package a8k.service.db.entity; - -import com.iflytop.uf.UfActiveRecord; -import com.iflytop.uf.UfActiveRecordField; - -public class A8kTubeInfo extends UfActiveRecord { - - /** - * 所有高度均是距离试管架底部的高度 - */ - @UfActiveRecordField - public String typeName; //试管类型编码 - @UfActiveRecordField - public String scanCode;//试管对应的编码 - @UfActiveRecordField - public Integer tubeSpacing; //试管之间的间隔 单位0.1mm - - /** - * 摇匀模组使用 - */ - /* - @UfActiveRecordField - public Integer takeTubeCapPos;// 0.1mm 取试管帽高度 - - @UfActiveRecordField - public Integer sampleBeginPos;// 0.1mm 取样高度 - - @UfActiveRecordField - public Integer sampleEndPos;//0.1mm 取样低位 - */ - public static String getTableName() { - return "A8kTubeInfo" + "Table"; - } -} diff --git a/src/main/java/a8k/service/db/entity/ModuleRegConfigIterm.java b/src/main/java/a8k/service/db/entity/ModuleRegConfigIterm.java deleted file mode 100644 index b1ff16a..0000000 --- a/src/main/java/a8k/service/db/entity/ModuleRegConfigIterm.java +++ /dev/null @@ -1,22 +0,0 @@ -package a8k.service.db.entity; - -import com.iflytop.uf.UfActiveRecordField; - -public class ModuleRegConfigIterm { - @UfActiveRecordField - Integer mid; //模块id - - @UfActiveRecordField - Integer regIndex; //寄存器地址 - - @UfActiveRecordField - Integer regval; //寄存器地址 - - @UfActiveRecordField - String comment; //注释 - - - public static String getTableName() { - return "ModuleRegConfigIterm" + "Table"; - } -} diff --git a/src/main/java/a8k/service/hardware/ModuleRegConfigMgrService.java b/src/main/java/a8k/service/hardware/ModuleRegConfigMgrService.java deleted file mode 100644 index 7c940e1..0000000 --- a/src/main/java/a8k/service/hardware/ModuleRegConfigMgrService.java +++ /dev/null @@ -1,25 +0,0 @@ -package a8k.service.hardware; - -import a8k.service.db.entity.ModuleRegConfigIterm; -import a8k.utils.HardwareService; -import org.springframework.stereotype.Component; - -@Component -@HardwareService(name="模块配置") -public class ModuleRegConfigMgrService { - - - void updateReg() { - //更新所有寄存器配置到设备中 - - - } - - /* - * 支持增删改查 - */ - - - - -} diff --git a/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java b/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java index 67391d9..1ab8b3e 100644 --- a/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java +++ b/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java @@ -39,65 +39,62 @@ public class MotorTubeRackMoveCtrlService implements HardwareCtrlModule { @HardwareServiceParam(name = "超时时间", group = "基础参数") public Integer getActionOvertime() { - return 10000; + return hpReader.getInteger("ActionOvertime", 8000); } @HardwareServiceParam(name = "入料X位置", group = "试管架位置信息") public Integer getTREnterXPos() { - return -51; + return hpReader.getInteger("TREnterXPos", -51); } - // public void setTREnterXPos(Integer val){ - // return; - // } - @HardwareServiceParam(name = "出料X位置", group = "试管架位置信息") public Integer getTRExitXPos() { - return 3980; + return hpReader.getInteger("TRExitXPos", 3980); } @HardwareServiceParam(name = "试管架扫码X位置", group = "试管架位置信息") public Integer getTRScanXPos() { - return 2202; + return hpReader.getInteger("TRScanXPos", 2202); } @HardwareServiceParam(name = "试管扫码位置", group = "试管位置信息") public Integer getTScanXPos() { //运动方向: -> - return 505; + return hpReader.getInteger("TScanXPos", 505); + } @HardwareServiceParam(name = "试管高度判断位置", group = "试管位置信息") public Integer getTAltitJudgXPos() { //运动方向: -> - return 505; + return hpReader.getInteger("TAltitJudgXPos", 505); } @HardwareServiceParam(name = "试管是否存在判断位置", group = "试管位置信息") public Integer getTExistJudgXPos() { //运动方向: <- - return 300; + return hpReader.getInteger("TExistJudgXPos", 300); } @HardwareServiceParam(name = "试管预处理位置", group = "试管位置信息") public Integer getTPreProcessXPos() { //运动方向: <- - return 1244; + return hpReader.getInteger("TPreProcessXPos", 1244); } @HardwareServiceParam(name = "试管架孔间距", group = "其他") public Integer getTubeSpacing() { - return 200; + return hpReader.getInteger("TubeSpacing", 200); } @HardwareServiceParam(name = "扫码舵机转速(0..900)", group = "其他") public Integer getTubeScanServoTorque() { - return 500; + return hpReader.getInteger("TubeScanServoTorque", 500); } @HardwareServiceParam(name = "试管扫码超时时间", group = "其他") public Integer getTubeScanOvertime() { - return 1000; + return hpReader.getInteger("TubeScanOvertime", 1000); } /*========================================================================================= @@ -261,7 +258,7 @@ public class MotorTubeRackMoveCtrlService implements HardwareCtrlModule { public void moveTubeRackToExitPos() throws HardwareException, InterruptedException { moveTubeRackTo(getTRExitXPos(), TargetPosMeasureDirection.NOTCARE, false); moveTubeRackTo(getTRExitXPos() - 10, TargetPosMeasureDirection.NOTCARE, false); -// moveTubeRackTo(getTRExitXPos(), TargetPosMeasureDirection.NOTCARE, false); + // moveTubeRackTo(getTRExitXPos(), TargetPosMeasureDirection.NOTCARE, false); } /** diff --git a/src/main/java/a8k/utils/HardwareParamReader.java b/src/main/java/a8k/utils/HardwareParamReader.java index eb653c6..ce73afb 100644 --- a/src/main/java/a8k/utils/HardwareParamReader.java +++ b/src/main/java/a8k/utils/HardwareParamReader.java @@ -10,7 +10,7 @@ public class HardwareParamReader { String serviceName; public HardwareParamReader(Class cla) { - this.serviceName = cla.getName(); + this.serviceName = cla.getSimpleName(); } public Integer getInteger(String key, Integer defaultValue) { diff --git a/zhaohe_app.db b/zhaohe_app.db index 403b4d31cf5f8fb39a7eae7555d3595942a2c97a..95aca0e5ad8899cbba5d24740b9b8d3f4f3d9ccf 100644 GIT binary patch delta 3869 zcma)8OK4nW6rLpQO_O=GrtuX;#Dy<@{NE2jL1OWNrEM~UTCC=O#$e2hlW9?0+`2Fe zL8wawaU+TwU5J8fHzJ5jT?TieJE6D|&%KlAL_5jd%-qG{ob!L@JKuM%?%sKI_s(le zQ`g_SV|nWOTWfExO?|aC{c+DMWwl!S)Alp1KU*KQo@)Nl{IK~%mVJ5m$#0M6FD_+WbfI=ic@kxc6dCJ1;?_B2 zE%As(jBzs32*+1nwy(tHP5WwpV{83Wkb%ik$RZu^x=2ytmK>plq6j!Xq@qC}Ax3kW5NT=8QWJT1Ztf?;KW zJPwvOd)u*6euCFdmuy|s)Osrjut_EdY$X&~t_AWihM)*HO6$D`lw5j#QvUoPT{W;{ zA?q?2vIZbRz`#|4p@fbC8Lu5Oi3d%E;EeCjpunhe*~N)f4iuqE;7d1+aH2U;PFfw1 zrhq>WEFep)Mvh^paFRsX5m0e(F%EjwDiG{XWnBTw;5<=LVS|`W5eAKcNJax)MeXoU!4X2e5^{`At7Ap-BLu`~ z;oGAsEG4Fe<;cYdiyd)9&IO91h{?Mku(o!r%9CSNCKt&|nNrNyR@Nnjd~nMX5fTM& zVD=cs?u7J6G0uW9Sb8=77FdnSaIH5>DO^yINF1C(!m%8-!#a$dG6G2l(q)vD-iN)H zlrmKUR=tu`>y1$*gSAu%6i^TjgYk(YBO>fMBN~>5_?Y|sMK3FrpjECU40)~&iggAg zkut%Og$)N6DO49DZJj}ZD-xo_(Z+O863_OAy+J1jzO7jQ%GutPao^AwlNaV;5zo{X ztPNBr<4__IQfsM^VN$^tx7ui}gLlQOSH0aTY^T@h4PLt(NBM7@9<=u294N_|TE2)A z^$}o4F$OR`;uF$}Ddd?ZiGivpZuisg%lTos3Fvs|MAp3rT4ydY9!Wqx7CM^%f2XxY z*l~-gNHis`e*O2RE*rkO3b6WkqfAsBLr6CjCZ z+*oij8#(~N_OKxK#LW5Lp#p?mnaR3$!O$Eq83?BlO$i9$BH$cY0Rv1e;S_yHoht1L zES{eRorj5GZfT;h;;;;GF)%5>uLMUV2W(stAy}zDRU^U3;8jgOn(Hfqh+;Ii!3^ZRDH zQ&q0Yr6O>`d3fMDyuApla^Brm1m;z)v|EeFD%aL6W#GSe)5Nps=CVmRfAXX5pT#1w z${};Q46JaDER;>|T@?9YC&f)g}J>g23F6CcK`qY delta 63 zcmZp8AlvXjc7imc?L--8M%%`O)&$0_2~11!x3dT^{^j4!*ucabu$bk6Ks(C=CLm@8 PViq7~-OloW?N2`d$H*4t