From 2bfbd968983893c9a63d0b0f5d66e3ef5ab80f98 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 1 Aug 2024 20:11:11 +0800 Subject: [PATCH] update --- .../devicectrl/commonctrl/HardwareCommonCtrl.java | 8 +- .../a8k/service/devicectrl/param/PosParam.java | 100 +++++++++++---------- zhaohe_app.db | Bin 188416 -> 188416 bytes 3 files changed, 58 insertions(+), 50 deletions(-) diff --git a/src/main/java/a8k/service/devicectrl/commonctrl/HardwareCommonCtrl.java b/src/main/java/a8k/service/devicectrl/commonctrl/HardwareCommonCtrl.java index 4f16fe5..386cac1 100644 --- a/src/main/java/a8k/service/devicectrl/commonctrl/HardwareCommonCtrl.java +++ b/src/main/java/a8k/service/devicectrl/commonctrl/HardwareCommonCtrl.java @@ -181,10 +181,10 @@ public class HardwareCommonCtrl { } - @EnginnerPageAction(name = "清空板夹仓板夹", order = ORDER.deviceClear) - public void clearDevice() { - //TODO - } +// @EnginnerPageAction(name = "清空板夹仓板夹", order = ORDER.deviceClear) +// public void clearDevice() { +// //TODO +// } @EnginnerPageAction(name = "设备强制停止", order = ORDER.deviceForceStop) diff --git a/src/main/java/a8k/service/devicectrl/param/PosParam.java b/src/main/java/a8k/service/devicectrl/param/PosParam.java index a789fa5..d35e2ac 100644 --- a/src/main/java/a8k/service/devicectrl/param/PosParam.java +++ b/src/main/java/a8k/service/devicectrl/param/PosParam.java @@ -50,6 +50,14 @@ public class PosParam { static final int getFOptPosOffset = 37; static final int getOptTLasterGain = 38; static final int getOptFLasterGain = 39; + static final int getEmergencyPos = 40; + static final int getTipPickUpPosInfo = 41; + static final int getTipDropPos = 42; + static final int getReactionPos = 43; + static final int getBottleBufferPosInfo = 44; + static final int getPlates2dCodeScanPosInfo = 45; + static final int getLargeBottleBufferPosInfo = 46; + static final int getSampleCollectionArea = 47; } @@ -57,77 +65,77 @@ public class PosParam { // SamplesPreProcessModuleCtrlService // - @EnginnerPageParam(name = "抓手张开位置", group = "抓手") + @EnginnerPageParam(name = "抓手张开位置", group = "抓手", order = ORDER.getGripperOpenPos) public Integer getGripperOpenPos() { return hpReader.getInteger("GripperOpenPos", 300 + 150); } - @EnginnerPageParam(name = "抓手闭合位置", group = "抓手") + @EnginnerPageParam(name = "抓手闭合位置", group = "抓手", order = ORDER.getGripperClosePos) public Integer getGripperClosePos() { return hpReader.getInteger("GripperClosePos", 300 + 10); } - @EnginnerPageParam(name = "抓手取试管位置", group = "抓手") + @EnginnerPageParam(name = "抓手取试管位置", group = "抓手", order = ORDER.getGripperTakeCapPos) public Integer getGripperTakeCapPos() { return hpReader.getInteger("GripperTakeCapPos", 300 + 55); } - @EnginnerPageParam(name = "取试管位置", group = "抓手Y轴位置") + @EnginnerPageParam(name = "取试管位置", group = "抓手Y轴位置", order = ORDER.getGripperTakeTubeYPos) public Integer getGripperTakeTubeYPos() { return hpReader.getInteger("GripperTakeTubeYPos", 2750 + 300); } - @EnginnerPageParam(name = "摇匀位置", group = "抓手Y轴位置") + @EnginnerPageParam(name = "摇匀位置", group = "抓手Y轴位置", order = ORDER.getGripperShakeYPos) public Integer getGripperShakeYPos() { return hpReader.getInteger("GripperShakeYPos", 1828 + 300); } - @EnginnerPageParam(name = "待机位", group = "抓手Y轴位置") + @EnginnerPageParam(name = "待机位", group = "抓手Y轴位置", order = ORDER.getGripperZeroYPos) public Integer getGripperZeroYPos() { return hpReader.getInteger("GripperZeroYPos", 300); } - @EnginnerPageParam(name = "取高试管位置", group = "抓手Z轴位置") + @EnginnerPageParam(name = "取高试管位置", group = "抓手Z轴位置", order = ORDER.getGripperTakeHTubeZPos) public Integer getGripperTakeHTubeZPos() { return hpReader.getInteger("GripperTakeHTubeZPos", 739); } - @EnginnerPageParam(name = "取低试管位置", group = "抓手Z轴位置") + @EnginnerPageParam(name = "取低试管位置", group = "抓手Z轴位置", order = ORDER.getGripperTakeSTubeZPos) public Integer getGripperTakeSTubeZPos() { return hpReader.getInteger("GripperTakeSTubeZPos", 985); } //JudgeTubeCapZ - @EnginnerPageParam(name = "高试管帽有无判断位", group = "抓手Z轴位置") + @EnginnerPageParam(name = "高试管帽有无判断位", group = "抓手Z轴位置", order = ORDER.getGripperJudgeHTubeCapZPos) public Integer getGripperJudgeHTubeCapZPos() { return hpReader.getInteger("GripperJudgeHTubeCapZPos", 591); } - @EnginnerPageParam(name = "低试管帽有无判断位", group = "抓手Z轴位置") + @EnginnerPageParam(name = "低试管帽有无判断位", group = "抓手Z轴位置", order = ORDER.getGripperJudgeSTubeCapZPos) public Integer getGripperJudgeSTubeCapZPos() { return hpReader.getInteger("GripperJudgeSTubeCapZPos", 867); } //ShakeTubeZ - @EnginnerPageParam(name = "摇匀放置位置", group = "抓手Z轴位置") + @EnginnerPageParam(name = "摇匀放置位置", group = "抓手Z轴位置", order = ORDER.getGripperShakeTubeZPos) public Integer getGripperShakeTubeZPos() { return hpReader.getInteger("GripperShakeTubeZPos", 835); } //TakeCapZ - @EnginnerPageParam(name = "取试管帽位", group = "抓手Z轴位置") + @EnginnerPageParam(name = "取试管帽位", group = "抓手Z轴位置", order = ORDER.getGripperTakeCapZPos) public Integer getGripperTakeCapZPos() { return hpReader.getInteger("GripperTakeCapZPos", 835); } - @EnginnerPageParam(name = "试管夹紧位", group = "试管夹紧模块") + @EnginnerPageParam(name = "试管夹紧位", group = "试管夹紧模块", order = ORDER.getShakeClampingPos) public Integer getShakeClampingPos() { return hpReader.getInteger("ShakeClampingPos", 10); } - @EnginnerPageParam(name = "摇匀臂", group = "试管摇匀待机位") + @EnginnerPageParam(name = "摇匀臂", group = "试管摇匀待机位", order = ORDER.getShakeModShakeMStandbyPos) public Integer getShakeModShakeMStandbyPos() { return hpReader.getInteger("ShakeModShakeMStandbyPos", 90); } @@ -137,57 +145,57 @@ public class PosParam { // MotorTubeRackMoveCtrlService // - @EnginnerPageParam(name = "入料X位置", group = "进出料<试管架>坐标") + @EnginnerPageParam(name = "入料X位置", group = "进出料<试管架>坐标", order = ORDER.getTREnterXPos) public Integer getTREnterXPos() { return hpReader.getInteger("TREnterXPos", -51); } - @EnginnerPageParam(name = "出料X位置", group = "进出料<试管架>坐标") + @EnginnerPageParam(name = "出料X位置", group = "进出料<试管架>坐标", order = ORDER.getTRExitXPos) public Integer getTRExitXPos() { return hpReader.getInteger("TRExitXPos", 3975); } - @EnginnerPageParam(name = "试管架扫码X位置", group = "进出料<试管架>坐标") + @EnginnerPageParam(name = "试管架扫码X位置", group = "进出料<试管架>坐标", order = ORDER.getTRScanXPos) public Integer getTRScanXPos() { return hpReader.getInteger("TRScanXPos", 2202); } - @EnginnerPageParam(name = "试管扫码位置", group = "进出料<试管位置>信息") + @EnginnerPageParam(name = "试管扫码位置", group = "进出料<试管位置>信息", order = ORDER.getTScanXPos) public Integer getTScanXPos() { //运动方向: -> return hpReader.getInteger("TScanXPos", 505); } - @EnginnerPageParam(name = "试管高度判断位置", group = "进出料<试管位置>信息") + @EnginnerPageParam(name = "试管高度判断位置", group = "进出料<试管位置>信息", order = ORDER.getTAltitJudgXPos) public Integer getTAltitJudgXPos() { //运动方向: -> return hpReader.getInteger("TAltitJudgXPos", 505); } - @EnginnerPageParam(name = "试管是否存在判断位置", group = "进出料<试管位置>信息") + @EnginnerPageParam(name = "试管是否存在判断位置", group = "进出料<试管位置>信息", order = ORDER.getTExistJudgXPos) public Integer getTExistJudgXPos() { //运动方向: <- return hpReader.getInteger("TExistJudgXPos", 300); } - @EnginnerPageParam(name = "试管预处理位置", group = "进出料<试管位置>信息") + @EnginnerPageParam(name = "试管预处理位置", group = "进出料<试管位置>信息", order = ORDER.getTPreProcessXPos) public Integer getTPreProcessXPos() { //运动方向: <- return hpReader.getInteger("TPreProcessXPos", 1244); } - @EnginnerPageParam(name = "试管架孔间距", group = "其他") + @EnginnerPageParam(name = "试管架孔间距", group = "其他", order = ORDER.getTubeSpacing) public Integer getTubeSpacing() { return hpReader.getInteger("TubeSpacing", 200); } - @EnginnerPageParam(name = "扫码舵机转速(0..900)", group = "其他") + @EnginnerPageParam(name = "扫码舵机转速(0..900)", group = "其他", order = ORDER.getTubeScanServoTorque) public Integer getTubeScanServoTorque() { return hpReader.getInteger("TubeScanServoTorque", 500); } - @EnginnerPageParam(name = "试管扫码超时时间", group = "其他") + @EnginnerPageParam(name = "试管扫码超时时间", group = "其他", order = ORDER.getTubeScanOvertime) public Integer getTubeScanOvertime() { return hpReader.getInteger("TubeScanOvertime", 1000); } @@ -198,22 +206,22 @@ public class PosParam { // - @EnginnerPageParam(name = "板夹仓通道0位置", group = "板夹仓参数") + @EnginnerPageParam(name = "板夹仓通道0位置", group = "板夹仓参数", order = ORDER.getPBCh0Pos) public Integer getPBCh0Pos() { return hpReader.getInteger("PBCh0Pos", -17); } - @EnginnerPageParam(name = "板夹仓通道间距", group = "板夹仓参数") + @EnginnerPageParam(name = "板夹仓通道间距", group = "板夹仓参数", order = ORDER.getPBChSpacing) public Integer getPBChSpacing() { return hpReader.getInteger("PBChSpacing", 265); } - @EnginnerPageParam(name = "推杆到位坐标", group = "板夹仓参数") + @EnginnerPageParam(name = "推杆到位坐标", group = "板夹仓参数", order = ORDER.getPusherEndPos) public Integer getPusherEndPos() { return hpReader.getInteger("PusherEndPos", 1160); } - @EnginnerPageParam(name = "推杆扫码开始坐标", group = "板夹仓参数") + @EnginnerPageParam(name = "推杆扫码开始坐标", group = "板夹仓参数", order = ORDER.getPusherScanStartPos) public Integer getPusherScanStartPos() { return hpReader.getInteger("PusherScanStartPos", 960); } @@ -222,17 +230,17 @@ public class PosParam { * 转盘相关位置 */ - @EnginnerPageParam(name = "仓位0入板位置", group = "转盘坐标参数") + @EnginnerPageParam(name = "仓位0入板位置", group = "转盘坐标参数", order = ORDER.getTurntablePushPos0) public Integer getTurntablePushPos0() { return hpReader.getInteger("TurntablePushPos0", 1650); } - @EnginnerPageParam(name = "仓位0出板位置", group = "转盘坐标参数") + @EnginnerPageParam(name = "仓位0出板位置", group = "转盘坐标参数", order = ORDER.getTurntablePullPos0) public Integer getTurntablePullPos0() { return hpReader.getInteger("TurntablePullPos0", 19700); } - @EnginnerPageParam(name = "仓位0点滴位", group = "转盘坐标参数") + @EnginnerPageParam(name = "仓位0点滴位", group = "转盘坐标参数", order = ORDER.getTurntableDropLiquidPos0) public Integer getTurntableDropLiquidPos0() { return hpReader.getInteger("TurntableDropLiquidPos0", 1650 + 8950); } @@ -244,44 +252,44 @@ public class PosParam { /* * 光学模组相关 */ - @EnginnerPageParam(name = "拉板目标位置", group = "光学模组坐标参数") + @EnginnerPageParam(name = "拉板目标位置", group = "光学模组坐标参数", order = ORDER.getPullerTargetPos) public Integer getPullerTargetPos() { return hpReader.getInteger("PullerTargetPos", 1147); } - @EnginnerPageParam(name = "丢板坐标", group = "光学模组坐标参数") + @EnginnerPageParam(name = "丢板坐标", group = "光学模组坐标参数", order = ORDER.getPlateDropPos) public Integer getPlateDropPos() { return hpReader.getInteger("PlateDropPos", -349); } - @EnginnerPageParam(name = "扫描待机位", group = "光学模组坐标参数") + @EnginnerPageParam(name = "扫描待机位", group = "光学模组坐标参数", order = ORDER.getOptScanScandbyPos) public Integer getOptScanScandbyPos() { return hpReader.getInteger("OptScanScandbyPos", 305); } - @EnginnerPageParam(name = "T光学扫描起始坐标", group = "光学模组坐标参数") + @EnginnerPageParam(name = "T光学扫描起始坐标", group = "光学模组坐标参数", order = ORDER.getTOptPosOffset) public Integer getTOptPosOffset() { //3509 return hpReader.getInteger("TOptPosOffset", 3723); } - @EnginnerPageParam(name = "F光学扫描起始坐标", group = "光学模组坐标参数") + @EnginnerPageParam(name = "F光学扫描起始坐标", group = "光学模组坐标参数", order = ORDER.getFOptPosOffset) public Integer getFOptPosOffset() { return hpReader.getInteger("FOptPosOffset", 2559); } - @EnginnerPageParam(name = "T光学发光增益", group = "光学模组坐标参数") + @EnginnerPageParam(name = "T光学发光增益", group = "光学模组坐标参数", order = ORDER.getOptTLasterGain) public Integer getOptTLasterGain() { return hpReader.getInteger("OptTLasterGain", 0); } - @EnginnerPageParam(name = "F光学发光增益", group = "光学模组坐标参数") + @EnginnerPageParam(name = "F光学发光增益", group = "光学模组坐标参数", order = ORDER.getOptFLasterGain) public Integer getOptFLasterGain() { return hpReader.getInteger("OptFLasterGain", 0); } - @EnginnerPageParam(name = "急诊位", group = "简单位置坐标") + @EnginnerPageParam(name = "急诊位", group = "简单位置坐标", order = ORDER.getEmergencyPos) public Pos3d getEmergencyPos() { return new Pos3d( 4858, @@ -290,7 +298,7 @@ public class PosParam { ); } - @EnginnerPageParam(name = "TIP组位置信息", group = "HBOT位置坐标集合") + @EnginnerPageParam(name = "TIP组位置信息", group = "HBOT位置坐标集合", order = ORDER.getTipPickUpPosInfo) public TipPickUpPosInfo getTipPickUpPosInfo() { return hpReader.getObject("TipPickUpPosInfo", TipPickUpPosInfo.class, new TipPickUpPosInfo( @@ -306,7 +314,7 @@ public class PosParam { } - @EnginnerPageParam(name = "Tip丢弃位置", group = "简单位置坐标") + @EnginnerPageParam(name = "Tip丢弃位置", group = "简单位置坐标", order = ORDER.getTipDropPos) public Pos3d getTipDropPos() { return new Pos3d( 4873, @@ -315,7 +323,7 @@ public class PosParam { ); } - @EnginnerPageParam(name = "滴液反应位", group = "简单位置坐标") + @EnginnerPageParam(name = "滴液反应位", group = "简单位置坐标", order = ORDER.getReactionPos) public Pos3d getReactionPos() { return hpReader.getObject("ReactionPos", Pos3d.class, new Pos3d( @@ -325,7 +333,7 @@ public class PosParam { )); } - @EnginnerPageParam(name = "缓冲液位置", group = "HBOT位置坐标集合") + @EnginnerPageParam(name = "缓冲液位置", group = "HBOT位置坐标集合", order = ORDER.getBottleBufferPosInfo) public BottleGroupsPosInfo getBottleBufferPosInfo() { return hpReader.getObject("BottleBufferPosInfo", BottleGroupsPosInfo.class, new BottleGroupsPosInfo( @@ -351,7 +359,7 @@ public class PosParam { )); } - @EnginnerPageParam(name = "板夹仓扫码位置", group = "HBOT位置坐标集合") + @EnginnerPageParam(name = "板夹仓扫码位置", group = "HBOT位置坐标集合", order = ORDER.getPlates2dCodeScanPosInfo) public Plates2dCodeScanPos getPlates2dCodeScanPosInfo() { return hpReader.getObject("Plates2dCodeScanPosInfo", Plates2dCodeScanPos.class,// new Plates2dCodeScanPos( @@ -361,7 +369,7 @@ public class PosParam { ); } - @EnginnerPageParam(name = "大瓶缓冲液位置", group = "HBOT位置坐标集合") + @EnginnerPageParam(name = "大瓶缓冲液位置", group = "HBOT位置坐标集合", order = ORDER.getLargeBottleBufferPosInfo) public LargeBottleBufferPos getLargeBottleBufferPosInfo() { return hpReader.getObject("LargeBottleBufferPosInfo", LargeBottleBufferPos.class, new LargeBottleBufferPos( @@ -375,7 +383,7 @@ public class PosParam { )); } - @EnginnerPageParam(name = "Hbot采样区", group = "限制值") + @EnginnerPageParam(name = "Hbot采样区", group = "限制值", order = ORDER.getSampleCollectionArea) public HbotLimitArea getSampleCollectionArea() { return hpReader.getObject("HbotPublicArea", HbotLimitArea.class, new HbotLimitArea(0, 3643, 5060, 4074)); diff --git a/zhaohe_app.db b/zhaohe_app.db index 278ecde2fcc8ef26ae438ccd623f219ae3afdccb..1d7110f0c0b06898536041b3d92b5b55496bd160 100644 GIT binary patch delta 613 zcma)(y-Gtt5JvCKO~e@V+AFA}&}MLFclKwn5qyS}LU#A=K7g%Yw9s0gL?MW69>X`W z(85gwOHDDwz<2nVGq;P;?PBz}S6@BtU({E3)B9=tI_+KG%pxj8Cj=--9gy_`Tqia7 z)M;&H3>4Lvkuhg67)rn2`}gkfiW_8y3x z21+S_^W1^*Vit|h=sWV`oFg%cW`!UH#)J`)>`ICE37A3x&lV$UmfHHUGdVjWdMkpB z$kGymRiQL>n#&DBfp=MTF-2+6mX1Q8sDB7&%~|OdK#D@SJqKXp9B_!o0?|bxbwO2i!>iie&F*LQ>#TQkJGY5hQD$J%GMK0WgjNPnm|XJF zCWmn6Wp~+Y0^`v_ zU}BIg=NeH*ZCsczwbG>&BXQ3xsOH9?Z?Ma$7b6x=nD0un_BDvP9oWl}^1L4|s^s;aGK zR5hdKx_M}xoA<^nPmVwK=4btBy@|xFF1U%i;rim=%6^Rvy5M{hQ~fR(HW1W1?N4_) YFaK#77a!GrndQ#q=h55XrT2CI4Ueyyw*UYD