project_boditech_vidas_a8000_v3
/
a8k_app
7
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

update

tags/v0
zhaohe 1 year ago
parent
f6cb3d32b8
commit
2bfbd96898
3 changed files with 58 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/main/java/a8k/service/devicectrl/commonctrl/HardwareCommonCtrl.java
  2. 100
      src/main/java/a8k/service/devicectrl/param/PosParam.java
  3. BIN
      zhaohe_app.db

8
src/main/java/a8k/service/devicectrl/commonctrl/HardwareCommonCtrl.java
View File

@ -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) @EnginnerPageAction(name = "设备强制停止", order = ORDER.deviceForceStop)

100
src/main/java/a8k/service/devicectrl/param/PosParam.java
View File

@ -50,6 +50,14 @@ public class PosParam {
static final int getFOptPosOffset = 37; static final int getFOptPosOffset = 37;
static final int getOptTLasterGain = 38; static final int getOptTLasterGain = 38;
static final int getOptFLasterGain = 39; 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 // SamplesPreProcessModuleCtrlService
// //
@EnginnerPageParam(name = "抓手张开位置", group = "抓手")
@EnginnerPageParam(name = "抓手张开位置", group = "抓手", order = ORDER.getGripperOpenPos)
public Integer getGripperOpenPos() { public Integer getGripperOpenPos() {
return hpReader.getInteger("GripperOpenPos", 300 + 150); return hpReader.getInteger("GripperOpenPos", 300 + 150);
} }
@EnginnerPageParam(name = "抓手闭合位置", group = "抓手")
@EnginnerPageParam(name = "抓手闭合位置", group = "抓手", order = ORDER.getGripperClosePos)
public Integer getGripperClosePos() { public Integer getGripperClosePos() {
return hpReader.getInteger("GripperClosePos", 300 + 10); return hpReader.getInteger("GripperClosePos", 300 + 10);
} }
@EnginnerPageParam(name = "抓手取试管位置", group = "抓手")
@EnginnerPageParam(name = "抓手取试管位置", group = "抓手", order = ORDER.getGripperTakeCapPos)
public Integer getGripperTakeCapPos() { public Integer getGripperTakeCapPos() {
return hpReader.getInteger("GripperTakeCapPos", 300 + 55); return hpReader.getInteger("GripperTakeCapPos", 300 + 55);
} }
@EnginnerPageParam(name = "取试管位置", group = "抓手Y轴位置")
@EnginnerPageParam(name = "取试管位置", group = "抓手Y轴位置", order = ORDER.getGripperTakeTubeYPos)
public Integer getGripperTakeTubeYPos() { public Integer getGripperTakeTubeYPos() {
return hpReader.getInteger("GripperTakeTubeYPos", 2750 + 300); return hpReader.getInteger("GripperTakeTubeYPos", 2750 + 300);
} }
@EnginnerPageParam(name = "摇匀位置", group = "抓手Y轴位置")
@EnginnerPageParam(name = "摇匀位置", group = "抓手Y轴位置", order = ORDER.getGripperShakeYPos)
public Integer getGripperShakeYPos() { public Integer getGripperShakeYPos() {
return hpReader.getInteger("GripperShakeYPos", 1828 + 300); return hpReader.getInteger("GripperShakeYPos", 1828 + 300);
} }
@EnginnerPageParam(name = "待机位", group = "抓手Y轴位置")
@EnginnerPageParam(name = "待机位", group = "抓手Y轴位置", order = ORDER.getGripperZeroYPos)
public Integer getGripperZeroYPos() { public Integer getGripperZeroYPos() {
return hpReader.getInteger("GripperZeroYPos", 300); return hpReader.getInteger("GripperZeroYPos", 300);
} }
@EnginnerPageParam(name = "取高试管位置", group = "抓手Z轴位置")
@EnginnerPageParam(name = "取高试管位置", group = "抓手Z轴位置", order = ORDER.getGripperTakeHTubeZPos)
public Integer getGripperTakeHTubeZPos() { public Integer getGripperTakeHTubeZPos() {
return hpReader.getInteger("GripperTakeHTubeZPos", 739); return hpReader.getInteger("GripperTakeHTubeZPos", 739);
} }
@EnginnerPageParam(name = "取低试管位置", group = "抓手Z轴位置")
@EnginnerPageParam(name = "取低试管位置", group = "抓手Z轴位置", order = ORDER.getGripperTakeSTubeZPos)
public Integer getGripperTakeSTubeZPos() { public Integer getGripperTakeSTubeZPos() {
return hpReader.getInteger("GripperTakeSTubeZPos", 985); return hpReader.getInteger("GripperTakeSTubeZPos", 985);
} }
//JudgeTubeCapZ //JudgeTubeCapZ
@EnginnerPageParam(name = "高试管帽有无判断位", group = "抓手Z轴位置")
@EnginnerPageParam(name = "高试管帽有无判断位", group = "抓手Z轴位置", order = ORDER.getGripperJudgeHTubeCapZPos)
public Integer getGripperJudgeHTubeCapZPos() { public Integer getGripperJudgeHTubeCapZPos() {
return hpReader.getInteger("GripperJudgeHTubeCapZPos", 591); return hpReader.getInteger("GripperJudgeHTubeCapZPos", 591);
} }
@EnginnerPageParam(name = "低试管帽有无判断位", group = "抓手Z轴位置")
@EnginnerPageParam(name = "低试管帽有无判断位", group = "抓手Z轴位置", order = ORDER.getGripperJudgeSTubeCapZPos)
public Integer getGripperJudgeSTubeCapZPos() { public Integer getGripperJudgeSTubeCapZPos() {
return hpReader.getInteger("GripperJudgeSTubeCapZPos", 867); return hpReader.getInteger("GripperJudgeSTubeCapZPos", 867);
} }
//ShakeTubeZ //ShakeTubeZ
@EnginnerPageParam(name = "摇匀放置位置", group = "抓手Z轴位置")
@EnginnerPageParam(name = "摇匀放置位置", group = "抓手Z轴位置", order = ORDER.getGripperShakeTubeZPos)
public Integer getGripperShakeTubeZPos() { public Integer getGripperShakeTubeZPos() {
return hpReader.getInteger("GripperShakeTubeZPos", 835); return hpReader.getInteger("GripperShakeTubeZPos", 835);
} }
//TakeCapZ //TakeCapZ
@EnginnerPageParam(name = "取试管帽位", group = "抓手Z轴位置")
@EnginnerPageParam(name = "取试管帽位", group = "抓手Z轴位置", order = ORDER.getGripperTakeCapZPos)
public Integer getGripperTakeCapZPos() { public Integer getGripperTakeCapZPos() {
return hpReader.getInteger("GripperTakeCapZPos", 835); return hpReader.getInteger("GripperTakeCapZPos", 835);
} }
@EnginnerPageParam(name = "试管夹紧位", group = "试管夹紧模块")
@EnginnerPageParam(name = "试管夹紧位", group = "试管夹紧模块", order = ORDER.getShakeClampingPos)
public Integer getShakeClampingPos() { public Integer getShakeClampingPos() {
return hpReader.getInteger("ShakeClampingPos", 10); return hpReader.getInteger("ShakeClampingPos", 10);
} }
@EnginnerPageParam(name = "摇匀臂", group = "试管摇匀待机位")
@EnginnerPageParam(name = "摇匀臂", group = "试管摇匀待机位", order = ORDER.getShakeModShakeMStandbyPos)
public Integer getShakeModShakeMStandbyPos() { public Integer getShakeModShakeMStandbyPos() {
return hpReader.getInteger("ShakeModShakeMStandbyPos", 90); return hpReader.getInteger("ShakeModShakeMStandbyPos", 90);
} }
@ -137,57 +145,57 @@ public class PosParam {
// MotorTubeRackMoveCtrlService // MotorTubeRackMoveCtrlService
// //
@EnginnerPageParam(name = "入料X位置", group = "进出料<试管架>坐标")
@EnginnerPageParam(name = "入料X位置", group = "进出料<试管架>坐标", order = ORDER.getTREnterXPos)
public Integer getTREnterXPos() { public Integer getTREnterXPos() {
return hpReader.getInteger("TREnterXPos", -51); return hpReader.getInteger("TREnterXPos", -51);
} }
@EnginnerPageParam(name = "出料X位置", group = "进出料<试管架>坐标")
@EnginnerPageParam(name = "出料X位置", group = "进出料<试管架>坐标", order = ORDER.getTRExitXPos)
public Integer getTRExitXPos() { public Integer getTRExitXPos() {
return hpReader.getInteger("TRExitXPos", 3975); return hpReader.getInteger("TRExitXPos", 3975);
} }
@EnginnerPageParam(name = "试管架扫码X位置", group = "进出料<试管架>坐标")
@EnginnerPageParam(name = "试管架扫码X位置", group = "进出料<试管架>坐标", order = ORDER.getTRScanXPos)
public Integer getTRScanXPos() { public Integer getTRScanXPos() {
return hpReader.getInteger("TRScanXPos", 2202); return hpReader.getInteger("TRScanXPos", 2202);
} }
@EnginnerPageParam(name = "试管扫码位置", group = "进出料<试管位置>信息")
@EnginnerPageParam(name = "试管扫码位置", group = "进出料<试管位置>信息", order = ORDER.getTScanXPos)
public Integer getTScanXPos() { public Integer getTScanXPos() {
//运动方向: -> //运动方向: ->
return hpReader.getInteger("TScanXPos", 505); return hpReader.getInteger("TScanXPos", 505);
} }
@EnginnerPageParam(name = "试管高度判断位置", group = "进出料<试管位置>信息")
@EnginnerPageParam(name = "试管高度判断位置", group = "进出料<试管位置>信息", order = ORDER.getTAltitJudgXPos)
public Integer getTAltitJudgXPos() { public Integer getTAltitJudgXPos() {
//运动方向: -> //运动方向: ->
return hpReader.getInteger("TAltitJudgXPos", 505); return hpReader.getInteger("TAltitJudgXPos", 505);
} }
@EnginnerPageParam(name = "试管是否存在判断位置", group = "进出料<试管位置>信息")
@EnginnerPageParam(name = "试管是否存在判断位置", group = "进出料<试管位置>信息", order = ORDER.getTExistJudgXPos)
public Integer getTExistJudgXPos() { public Integer getTExistJudgXPos() {
//运动方向: <- //运动方向: <-
return hpReader.getInteger("TExistJudgXPos", 300); return hpReader.getInteger("TExistJudgXPos", 300);
} }
@EnginnerPageParam(name = "试管预处理位置", group = "进出料<试管位置>信息")
@EnginnerPageParam(name = "试管预处理位置", group = "进出料<试管位置>信息", order = ORDER.getTPreProcessXPos)
public Integer getTPreProcessXPos() { public Integer getTPreProcessXPos() {
//运动方向: <- //运动方向: <-
return hpReader.getInteger("TPreProcessXPos", 1244); return hpReader.getInteger("TPreProcessXPos", 1244);
} }
@EnginnerPageParam(name = "试管架孔间距", group = "其他")
@EnginnerPageParam(name = "试管架孔间距", group = "其他", order = ORDER.getTubeSpacing)
public Integer getTubeSpacing() { public Integer getTubeSpacing() {
return hpReader.getInteger("TubeSpacing", 200); return hpReader.getInteger("TubeSpacing", 200);
} }
@EnginnerPageParam(name = "扫码舵机转速(0..900)", group = "其他")
@EnginnerPageParam(name = "扫码舵机转速(0..900)", group = "其他", order = ORDER.getTubeScanServoTorque)
public Integer getTubeScanServoTorque() { public Integer getTubeScanServoTorque() {
return hpReader.getInteger("TubeScanServoTorque", 500); return hpReader.getInteger("TubeScanServoTorque", 500);
} }
@EnginnerPageParam(name = "试管扫码超时时间", group = "其他")
@EnginnerPageParam(name = "试管扫码超时时间", group = "其他", order = ORDER.getTubeScanOvertime)
public Integer getTubeScanOvertime() { public Integer getTubeScanOvertime() {
return hpReader.getInteger("TubeScanOvertime", 1000); 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() { public Integer getPBCh0Pos() {
return hpReader.getInteger("PBCh0Pos", -17); return hpReader.getInteger("PBCh0Pos", -17);
} }
@EnginnerPageParam(name = "板夹仓通道间距", group = "板夹仓参数")
@EnginnerPageParam(name = "板夹仓通道间距", group = "板夹仓参数", order = ORDER.getPBChSpacing)
public Integer getPBChSpacing() { public Integer getPBChSpacing() {
return hpReader.getInteger("PBChSpacing", 265); return hpReader.getInteger("PBChSpacing", 265);
} }
@EnginnerPageParam(name = "推杆到位坐标", group = "板夹仓参数")
@EnginnerPageParam(name = "推杆到位坐标", group = "板夹仓参数", order = ORDER.getPusherEndPos)
public Integer getPusherEndPos() { public Integer getPusherEndPos() {
return hpReader.getInteger("PusherEndPos", 1160); return hpReader.getInteger("PusherEndPos", 1160);
} }
@EnginnerPageParam(name = "推杆扫码开始坐标", group = "板夹仓参数")
@EnginnerPageParam(name = "推杆扫码开始坐标", group = "板夹仓参数", order = ORDER.getPusherScanStartPos)
public Integer getPusherScanStartPos() { public Integer getPusherScanStartPos() {
return hpReader.getInteger("PusherScanStartPos", 960); 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() { public Integer getTurntablePushPos0() {
return hpReader.getInteger("TurntablePushPos0", 1650); return hpReader.getInteger("TurntablePushPos0", 1650);
} }
@EnginnerPageParam(name = "仓位0出板位置", group = "转盘坐标参数")
@EnginnerPageParam(name = "仓位0出板位置", group = "转盘坐标参数", order = ORDER.getTurntablePullPos0)
public Integer getTurntablePullPos0() { public Integer getTurntablePullPos0() {
return hpReader.getInteger("TurntablePullPos0", 19700); return hpReader.getInteger("TurntablePullPos0", 19700);
} }
@EnginnerPageParam(name = "仓位0点滴位", group = "转盘坐标参数")
@EnginnerPageParam(name = "仓位0点滴位", group = "转盘坐标参数", order = ORDER.getTurntableDropLiquidPos0)
public Integer getTurntableDropLiquidPos0() { public Integer getTurntableDropLiquidPos0() {
return hpReader.getInteger("TurntableDropLiquidPos0", 1650 + 8950); 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() { public Integer getPullerTargetPos() {
return hpReader.getInteger("PullerTargetPos", 1147); return hpReader.getInteger("PullerTargetPos", 1147);
} }
@EnginnerPageParam(name = "丢板坐标", group = "光学模组坐标参数")
@EnginnerPageParam(name = "丢板坐标", group = "光学模组坐标参数", order = ORDER.getPlateDropPos)
public Integer getPlateDropPos() { public Integer getPlateDropPos() {
return hpReader.getInteger("PlateDropPos", -349); return hpReader.getInteger("PlateDropPos", -349);
} }
@EnginnerPageParam(name = "扫描待机位", group = "光学模组坐标参数")
@EnginnerPageParam(name = "扫描待机位", group = "光学模组坐标参数", order = ORDER.getOptScanScandbyPos)
public Integer getOptScanScandbyPos() { public Integer getOptScanScandbyPos() {
return hpReader.getInteger("OptScanScandbyPos", 305); return hpReader.getInteger("OptScanScandbyPos", 305);
} }
@EnginnerPageParam(name = "T光学扫描起始坐标", group = "光学模组坐标参数")
@EnginnerPageParam(name = "T光学扫描起始坐标", group = "光学模组坐标参数", order = ORDER.getTOptPosOffset)
public Integer getTOptPosOffset() { public Integer getTOptPosOffset() {
//3509 //3509
return hpReader.getInteger("TOptPosOffset", 3723); return hpReader.getInteger("TOptPosOffset", 3723);
} }
@EnginnerPageParam(name = "F光学扫描起始坐标", group = "光学模组坐标参数")
@EnginnerPageParam(name = "F光学扫描起始坐标", group = "光学模组坐标参数", order = ORDER.getFOptPosOffset)
public Integer getFOptPosOffset() { public Integer getFOptPosOffset() {
return hpReader.getInteger("FOptPosOffset", 2559); return hpReader.getInteger("FOptPosOffset", 2559);
} }
@EnginnerPageParam(name = "T光学发光增益", group = "光学模组坐标参数")
@EnginnerPageParam(name = "T光学发光增益", group = "光学模组坐标参数", order = ORDER.getOptTLasterGain)
public Integer getOptTLasterGain() { public Integer getOptTLasterGain() {
return hpReader.getInteger("OptTLasterGain", 0); return hpReader.getInteger("OptTLasterGain", 0);
} }
@EnginnerPageParam(name = "F光学发光增益", group = "光学模组坐标参数")
@EnginnerPageParam(name = "F光学发光增益", group = "光学模组坐标参数", order = ORDER.getOptFLasterGain)
public Integer getOptFLasterGain() { public Integer getOptFLasterGain() {
return hpReader.getInteger("OptFLasterGain", 0); return hpReader.getInteger("OptFLasterGain", 0);
} }
@EnginnerPageParam(name = "急诊位", group = "简单位置坐标")
@EnginnerPageParam(name = "急诊位", group = "简单位置坐标", order = ORDER.getEmergencyPos)
public Pos3d getEmergencyPos() { public Pos3d getEmergencyPos() {
return new Pos3d( return new Pos3d(
4858, 4858,
@ -290,7 +298,7 @@ public class PosParam {
); );
} }
@EnginnerPageParam(name = "TIP组位置信息", group = "HBOT位置坐标集合")
@EnginnerPageParam(name = "TIP组位置信息", group = "HBOT位置坐标集合", order = ORDER.getTipPickUpPosInfo)
public TipPickUpPosInfo getTipPickUpPosInfo() { public TipPickUpPosInfo getTipPickUpPosInfo() {
return hpReader.getObject("TipPickUpPosInfo", TipPickUpPosInfo.class, return hpReader.getObject("TipPickUpPosInfo", TipPickUpPosInfo.class,
new TipPickUpPosInfo( new TipPickUpPosInfo(
@ -306,7 +314,7 @@ public class PosParam {
} }
@EnginnerPageParam(name = "Tip丢弃位置", group = "简单位置坐标")
@EnginnerPageParam(name = "Tip丢弃位置", group = "简单位置坐标", order = ORDER.getTipDropPos)
public Pos3d getTipDropPos() { public Pos3d getTipDropPos() {
return new Pos3d( return new Pos3d(
4873, 4873,
@ -315,7 +323,7 @@ public class PosParam {
); );
} }
@EnginnerPageParam(name = "滴液反应位", group = "简单位置坐标")
@EnginnerPageParam(name = "滴液反应位", group = "简单位置坐标", order = ORDER.getReactionPos)
public Pos3d getReactionPos() { public Pos3d getReactionPos() {
return hpReader.getObject("ReactionPos", Pos3d.class, return hpReader.getObject("ReactionPos", Pos3d.class,
new Pos3d( new Pos3d(
@ -325,7 +333,7 @@ public class PosParam {
)); ));
} }
@EnginnerPageParam(name = "缓冲液位置", group = "HBOT位置坐标集合")
@EnginnerPageParam(name = "缓冲液位置", group = "HBOT位置坐标集合", order = ORDER.getBottleBufferPosInfo)
public BottleGroupsPosInfo getBottleBufferPosInfo() { public BottleGroupsPosInfo getBottleBufferPosInfo() {
return hpReader.getObject("BottleBufferPosInfo", BottleGroupsPosInfo.class, return hpReader.getObject("BottleBufferPosInfo", BottleGroupsPosInfo.class,
new BottleGroupsPosInfo( new BottleGroupsPosInfo(
@ -351,7 +359,7 @@ public class PosParam {
)); ));
} }
@EnginnerPageParam(name = "板夹仓扫码位置", group = "HBOT位置坐标集合")
@EnginnerPageParam(name = "板夹仓扫码位置", group = "HBOT位置坐标集合", order = ORDER.getPlates2dCodeScanPosInfo)
public Plates2dCodeScanPos getPlates2dCodeScanPosInfo() { public Plates2dCodeScanPos getPlates2dCodeScanPosInfo() {
return hpReader.getObject("Plates2dCodeScanPosInfo", Plates2dCodeScanPos.class,// return hpReader.getObject("Plates2dCodeScanPosInfo", Plates2dCodeScanPos.class,//
new Plates2dCodeScanPos( new Plates2dCodeScanPos(
@ -361,7 +369,7 @@ public class PosParam {
); );
} }
@EnginnerPageParam(name = "大瓶缓冲液位置", group = "HBOT位置坐标集合")
@EnginnerPageParam(name = "大瓶缓冲液位置", group = "HBOT位置坐标集合", order = ORDER.getLargeBottleBufferPosInfo)
public LargeBottleBufferPos getLargeBottleBufferPosInfo() { public LargeBottleBufferPos getLargeBottleBufferPosInfo() {
return hpReader.getObject("LargeBottleBufferPosInfo", LargeBottleBufferPos.class, return hpReader.getObject("LargeBottleBufferPosInfo", LargeBottleBufferPos.class,
new LargeBottleBufferPos( new LargeBottleBufferPos(
@ -375,7 +383,7 @@ public class PosParam {
)); ));
} }
@EnginnerPageParam(name = "Hbot采样区", group = "限制值")
@EnginnerPageParam(name = "Hbot采样区", group = "限制值", order = ORDER.getSampleCollectionArea)
public HbotLimitArea getSampleCollectionArea() { public HbotLimitArea getSampleCollectionArea() {
return hpReader.getObject("HbotPublicArea", HbotLimitArea.class, return hpReader.getObject("HbotPublicArea", HbotLimitArea.class,
new HbotLimitArea(0, 3643, 5060, 4074)); new HbotLimitArea(0, 3643, 5060, 4074));

BIN
zhaohe_app.db
View File

Write Preview
Loading…
Cancel
Save