Browse Source

fix:修改溶液id为Long型

master
白凤吉 6 months ago
parent
commit
f6bfbd7758
  1. 2
      src/main/java/com/qyft/gd/device/service/DeviceService.java
  2. 2
      src/main/java/com/qyft/gd/model/bo/TubeSol.java
  3. 2
      src/main/java/com/qyft/gd/service/CMDService.java

2
src/main/java/com/qyft/gd/device/service/DeviceService.java

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

2
src/main/java/com/qyft/gd/model/bo/TubeSol.java

@ -23,7 +23,7 @@ public class TubeSol {
/** /**
* 溶液id * 溶液id
*/ */
private String solId;
private Long solId;
/** /**
* 加液量 * 加液量
*/ */

2
src/main/java/com/qyft/gd/service/CMDService.java

@ -156,7 +156,7 @@ public class CMDService {
// TODO 溶液id 容量 // TODO 溶液id 容量
Map<String, Object> params = cmdForm.getParams(); Map<String, Object> params = cmdForm.getParams();
cmdList.add(() -> deviceService.moveLiquidArmToPoint(1,2,3)); 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); initExecutorThread(cmdList, cmdForm);
return true; return true;
} }

Loading…
Cancel
Save