diff --git a/src/main/java/com/qyft/gd/device/service/DeviceService.java b/src/main/java/com/qyft/gd/device/service/DeviceService.java index aa01b5f..8d71f35 100644 --- a/src/main/java/com/qyft/gd/device/service/DeviceService.java +++ b/src/main/java/com/qyft/gd/device/service/DeviceService.java @@ -242,7 +242,7 @@ public class DeviceService { * @param pumpId 泵id * @param volume 液体体积 */ - public synchronized boolean addLiquid(String pumpId, int volume) { + public synchronized boolean addLiquid(Long pumpId, int volume) { Map params = new HashMap<>(); params.put("pumpId", pumpId); params.put("volume", volume); diff --git a/src/main/java/com/qyft/gd/model/bo/TubeSol.java b/src/main/java/com/qyft/gd/model/bo/TubeSol.java index b23b1dd..09bcfa1 100644 --- a/src/main/java/com/qyft/gd/model/bo/TubeSol.java +++ b/src/main/java/com/qyft/gd/model/bo/TubeSol.java @@ -23,7 +23,7 @@ public class TubeSol { /** * 溶液id */ - private String solId; + private Long solId; /** * 加液量 */ diff --git a/src/main/java/com/qyft/gd/service/CMDService.java b/src/main/java/com/qyft/gd/service/CMDService.java index 895558e..ccd66d1 100644 --- a/src/main/java/com/qyft/gd/service/CMDService.java +++ b/src/main/java/com/qyft/gd/service/CMDService.java @@ -156,7 +156,7 @@ public class CMDService { // TODO 溶液id 容量 Map params = cmdForm.getParams(); cmdList.add(() -> deviceService.moveLiquidArmToPoint(1,2,3)); - cmdList.add(() -> deviceService.addLiquid((String) params.get("pumpId"), ((Integer)params.get("volume")))); + cmdList.add(() -> deviceService.addLiquid((Long) params.get("pumpId"), ((Integer)params.get("volume")))); initExecutorThread(cmdList, cmdForm); return true; }