p_graphite_digester_v3
/
ore_graphite_digestion_instrument
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix:修复加液类型转换错误

master
白凤吉 5 months ago
parent
1abc3369f1
commit
53e0f03e2c
2 changed files with 17 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/main/java/com/qyft/gd/device/service/DeviceService.java
  2. 31
      src/main/java/com/qyft/gd/service/CMDService.java

4
src/main/java/com/qyft/gd/device/service/DeviceService.java
View File

@ -244,7 +244,7 @@ public class DeviceService {
* @param pumpId 泵id
* @param volume 液体体积
*/
public synchronized boolean addLiquid(Long pumpId, int volume) {
public synchronized boolean addLiquid(String pumpId, int volume) {
Map<String, Object> params = new HashMap<>();
params.put("pumpId", pumpId);
params.put("volume", volume);
@ -308,7 +308,7 @@ public class DeviceService {
* @param pumpId 泵id
* @param flowRate 流量值
*/
public synchronized boolean setFlowRate(int pumpId, int flowRate) {
public synchronized boolean setFlowRate(String pumpId, int flowRate) {
Map<String, Object> params = new HashMap<>();
params.put("pumpId", pumpId);
params.put("flowRate", flowRate);

31
src/main/java/com/qyft/gd/service/CMDService.java
View File

@ -39,7 +39,7 @@ public class CMDService {
Map<String, String> cmdMap;
@Autowired
public CMDService(DeviceService deviceService, WebSocketService webSocketService, BaseDataService baseDataService, TasksService tasksService, TaskStepsService taskStepsService, ContainerService containerService) {
public CMDService(DeviceService deviceService, WebSocketService webSocketService, BaseDataService baseDataService, TasksService tasksService, TaskStepsService taskStepsService, ContainerService containerService) {
this.deviceService = deviceService;
this.webSocketService = webSocketService;
this.baseDataService = baseDataService;
@ -136,19 +136,19 @@ public class CMDService {
// 打开钩子
cmdList.add(() -> deviceService.openClaw());
// 下降高度
cmdList.add(() -> deviceService.moveRailArmToPoint(x2, y2, z2 - Integer.parseInt((String)map.get("sys_offset_tube_rack_take_height"))));
cmdList.add(() -> deviceService.moveRailArmToPoint(x2, y2, z2 - Integer.parseInt((String) map.get("sys_offset_tube_rack_take_height"))));
// 闭合钩子
cmdList.add(() -> deviceService.closeClaw());
// 机械臂抬起高度
cmdList.add(() -> deviceService.moveRailArmToPoint(x2, y2, z2 + Integer.parseInt((String)map.get("sys_offset_tube_rack_take_height")) + Integer.parseInt((String)map.get("sys_offset_tube_height"))));
cmdList.add(() -> deviceService.moveRailArmToPoint(x2, y2, z2 + Integer.parseInt((String) map.get("sys_offset_tube_rack_take_height")) + Integer.parseInt((String) map.get("sys_offset_tube_height"))));
// 机械臂移动到指定加热位
cmdList.add(() -> deviceService.moveRailArmToPoint(x1, y1, z2 + Integer.parseInt((String)map.get("sys_offset_tube_rack_take_height")) + Integer.parseInt((String)map.get("sys_offset_tube_height"))));
cmdList.add(() -> deviceService.moveRailArmToPoint(x1, y1, z2 + Integer.parseInt((String) map.get("sys_offset_tube_rack_take_height")) + Integer.parseInt((String) map.get("sys_offset_tube_height"))));
// 机械臂下降高度
cmdList.add(() -> deviceService.moveRailArmToPoint(x1, y1, z1));
// 机械臂打开钩子
cmdList.add(() -> deviceService.openClaw());
// 机械臂上升高度
cmdList.add(() -> deviceService.moveRailArmToPoint(x1, y1, z1 + Integer.parseInt((String)map.get("sys_offset_tube_rack_take_height"))));
cmdList.add(() -> deviceService.moveRailArmToPoint(x1, y1, z1 + Integer.parseInt((String) map.get("sys_offset_tube_rack_take_height"))));
// 关闭钩子
cmdList.add(() -> deviceService.closeClaw());
@ -311,7 +311,7 @@ public class CMDService {
if (params.get("temperature") == null) {
temperature = Double.parseDouble(baseDataService.getHeatAreaTemperatureById((Integer) params.get("heatId")));
} else {
temperature = Double.parseDouble((String) params.get("temperature")) ;
temperature = Double.parseDouble((String) params.get("temperature"));
}
cmdList.add(() -> deviceService.startHeating(hardwareId, temperature));
return cmdList;
@ -354,19 +354,19 @@ public class CMDService {
// 打开钩子
cmdList.add(() -> deviceService.openClaw());
// 下降高度
cmdList.add(() -> deviceService.moveRailArmToPoint(x1, y1, z1 - Integer.parseInt((String)map.get("sys_offset_tube_rack_take_height"))));
cmdList.add(() -> deviceService.moveRailArmToPoint(x1, y1, z1 - Integer.parseInt((String) map.get("sys_offset_tube_rack_take_height"))));
// 闭合钩子
cmdList.add(() -> deviceService.closeClaw());
// 机械臂抬起高度
cmdList.add(() -> deviceService.moveRailArmToPoint(x1, y1, z1 + Integer.parseInt((String)map.get("sys_offset_tube_rack_take_height")) + Integer.parseInt((String)map.get("sys_offset_tube_height"))));
cmdList.add(() -> deviceService.moveRailArmToPoint(x1, y1, z1 + Integer.parseInt((String) map.get("sys_offset_tube_rack_take_height")) + Integer.parseInt((String) map.get("sys_offset_tube_height"))));
// 机械臂移动到加液位高度
cmdList.add(() -> deviceService.moveRailArmToPoint(x2, y2, z1 + Integer.parseInt((String)map.get("sys_offset_tube_rack_take_height")) + Integer.parseInt((String)map.get("sys_offset_tube_height"))));
cmdList.add(() -> deviceService.moveRailArmToPoint(x2, y2, z1 + Integer.parseInt((String) map.get("sys_offset_tube_rack_take_height")) + Integer.parseInt((String) map.get("sys_offset_tube_height"))));
// 机械臂下降高度
cmdList.add(() -> deviceService.moveRailArmToPoint(x2, y2, z2));
// 机械臂打开钩子
cmdList.add(() -> deviceService.openClaw());
// 机械臂上升高度
cmdList.add(() -> deviceService.moveRailArmToPoint(x2, y2, z2 + Integer.parseInt((String)map.get("sys_offset_tube_rack_take_height"))));
cmdList.add(() -> deviceService.moveRailArmToPoint(x2, y2, z2 + Integer.parseInt((String) map.get("sys_offset_tube_rack_take_height"))));
// 关闭钩子
cmdList.add(() -> deviceService.closeClaw());
@ -410,7 +410,7 @@ public class CMDService {
List<Supplier<Boolean>> cmdList = new ArrayList<>();
// 获取容器信息
ContainerListVO container = baseDataService.getContainerBySolutionId((Integer) params.get("solutionId"));
if(container.getCapacityTotal() - container.getCapacityUsed() < (Integer) params.get("volume")) {
if (container.getCapacityTotal() - container.getCapacityUsed() < (Integer) params.get("volume")) {
cmdList.add(() -> false);
}
@ -423,10 +423,10 @@ public class CMDService {
// 泵id
String pumpId = baseDataService.getPumpIdBySolutionId((Integer) params.get("solutionId"));
if (params.get("flowRate") != null) {
cmdList.add(() -> deviceService.setFlowRate(Integer.parseInt(pumpId), (Integer) params.get("flowRate")));
cmdList.add(() -> deviceService.setFlowRate(pumpId, (Integer) params.get("flowRate")));
}
cmdList.add(() -> deviceService.moveLiquidArmToPoint(x, y, z));
cmdList.add(() -> deviceService.addLiquid(Long.valueOf(pumpId), ((Integer) params.get("volume"))));
cmdList.add(() -> deviceService.addLiquid(pumpId, ((Integer) params.get("volume"))));
cmdList.add(() -> updateVolume(params));
return cmdList;
@ -455,13 +455,13 @@ public class CMDService {
return cmdList;
}
private boolean updateVolume (Map<String, Object> params) {
private boolean updateVolume(Map<String, Object> params) {
// 获取容器信息
ContainerListVO container = baseDataService.getContainerBySolutionId((Integer) params.get("solutionId"));
container.setCapacityUsed(container.getCapacityUsed() + (Integer) params.get("volume"));
containerService.updateById(container);
baseDataService.updateConfig();
List<ContainerListVO> list = containerService.getAllContainer();
List<ContainerListVO> list = containerService.getAllContainer();
Map<String, Object> containerMap = new HashMap<>();
containerMap.put("containerList", list);
webSocketService.pushMsg(WebSocketMessageType.CONTAINER, containerMap);
@ -513,5 +513,4 @@ public class CMDService {
}
}
Write Preview
Loading…
Cancel
Save