diff --git a/src/main/java/com/qyft/gd/service/CMDService.java b/src/main/java/com/qyft/gd/service/CMDService.java index adcf9d2..d35c2fc 100644 --- a/src/main/java/com/qyft/gd/service/CMDService.java +++ b/src/main/java/com/qyft/gd/service/CMDService.java @@ -49,20 +49,20 @@ public class CMDService { commandMap.put(Commands.CLOSE_CLAW, this::closeClaw); } // 机械臂爪子开启 - private List> openClaw(Map params) { + public List> openClaw(Map params) { List> cmdList = new ArrayList<>(); cmdList.add(() -> deviceService.openClaw()); return cmdList; } // 机械臂爪子闭合 - private List> closeClaw(Map params) { + public List> closeClaw(Map params) { List> cmdList = new ArrayList<>(); cmdList.add(() -> deviceService.closeClaw()); return cmdList; } // 移至加热 - private List> moveToHeatArea(Map params) { + public List> moveToHeatArea(Map params) { List> cmdList = new ArrayList<>(); Map map = baseDataService.getOffsetMap(); String heatAreaPosition = baseDataService.getHeatAreaPositionById((Integer) params.get("areaId")); @@ -100,14 +100,14 @@ public class CMDService { return cmdList; } // 移动单个试管 - private List >moveTube(Map params) { + public List >moveTube(Map params) { List> cmdList = new ArrayList<>(); return cmdList; } // 机械臂 - private List> moveMachineArm(Map params) { + public List> moveMachineArm(Map params) { List> cmdList = new ArrayList<>(); String position = (String) params.get("position"); String [] positionArr =position.split(","); @@ -118,7 +118,7 @@ public class CMDService { return cmdList; } // 装回盖子 - private List> putBackCap(Map params) { + public List> putBackCap(Map params) { List> cmdList = new ArrayList<>(); // 加热位机器代码 String heaterId = baseDataService.getHeatAreaHardwareIdById((Integer) params.get("areaId")); @@ -159,7 +159,7 @@ public class CMDService { return cmdList; } // 取试管架盖 - private List> takeOffCap(Map params) { + public List> takeOffCap(Map params) { List> cmdList = new ArrayList<>(); // 拍子坐标 String position = baseDataService.getHeatAreaLidPositionById((Integer) params.get("areaId")); @@ -202,20 +202,20 @@ public class CMDService { return cmdList; } // 拍照 - private List> takePhoto(Map params) { + public List> takePhoto(Map params) { List> cmdList = new ArrayList<>(); cmdList.add(() -> deviceService.takePhoto()); return cmdList; } // 停止加热 - private List> stopHeat(Map params) { + public List> stopHeat(Map params) { List> cmdList = new ArrayList<>(); String hardwareId = baseDataService.getHeatAreaHardwareIdById((Integer) params.get("areaId")); cmdList.add(() -> deviceService.stopHeating(hardwareId)); return cmdList; } // 开始加热 - private List> startHeat(Map params) { + public List> startHeat(Map params) { List> cmdList = new ArrayList<>(); String hardwareId = baseDataService.getHeatAreaHardwareIdById((Integer) params.get("areaId")); Double temperature; @@ -228,21 +228,21 @@ public class CMDService { return cmdList; } // 开始摇匀 - private List> startShakeUp(Map params) { + public List> startShakeUp(Map params) { List> cmdList = new ArrayList<>(); cmdList.add(() -> deviceService.setShakingSpeed((Integer) params.get("speed"))); cmdList.add(() -> deviceService.startShaking()); return cmdList; } // 结束摇匀 - private List> stopShakeUp(Map params) { + public List> stopShakeUp(Map params) { List> cmdList = new ArrayList<>(); cmdList.add(() -> deviceService.stopShaking()); return cmdList; } // 移至加液 - private List> moveToActionArea(Map params) { + public List> moveToActionArea(Map params) { List> cmdList = new ArrayList<>(); Map map = baseDataService.getOffsetMap(); String heatAreaPosition = baseDataService.getHeatAreaPositionById((Integer) params.get("areaId")); @@ -281,7 +281,7 @@ public class CMDService { } // 加液 - private List> injectFluid(Map params) { + public List> injectFluid(Map params) { List> cmdList = new ArrayList<>(); // 试管的坐标 String tubePosition = baseDataService.getTubePositionBySolutionArea((Integer) params.get("tubeNum")); @@ -296,7 +296,7 @@ public class CMDService { return cmdList; } // 放下托盘 - private List> downTray(Map params) { + public List> downTray(Map params) { List> cmdList = new ArrayList<>(); String hardwareId = baseDataService.getHeatAreaHardwareIdById((Integer) params.get("areaId")); if(params.get("height") != null && params.get("speed") != null) { @@ -307,7 +307,7 @@ public class CMDService { } // 抬起托盘 - private List> upTray(Map params) { + public List> upTray(Map params) { List> cmdList = new ArrayList<>(); String hardwareId = baseDataService.getHeatAreaHardwareIdById((Integer) params.get("areaId")); if(params.get("height") != null && params.get("speed") != null) {