diff --git a/app.db b/app.db index 2c686bb..afe0a4d 100644 Binary files a/app.db and b/app.db differ diff --git a/publish.ps1 b/publish.ps1 index da83308..a92035c 100644 --- a/publish.ps1 +++ b/publish.ps1 @@ -13,7 +13,7 @@ Rename-Item -Path target/digester-$version.jar -NewName "app-$version.jar" # upload scp target/app-$version.jar root@192.168.8.10:/app/ -scp ./app.db root@192.168.8.10:/app/device.db +# scp ./app.db root@192.168.8.10:/app/device.db # start ssh root:zwsd@192.168.8.10 "killall java" diff --git a/src/main/java/com/iflytop/digester/deviceinstance/LiquidAdditionInstance.java b/src/main/java/com/iflytop/digester/deviceinstance/LiquidAdditionInstance.java index 430dc1a..5ac55d1 100644 --- a/src/main/java/com/iflytop/digester/deviceinstance/LiquidAdditionInstance.java +++ b/src/main/java/com/iflytop/digester/deviceinstance/LiquidAdditionInstance.java @@ -218,7 +218,7 @@ public class LiquidAdditionInstance { // 获取蠕动泵索引 private List getPumpIndexForGroupOutAndIn( String type ) { for ( int i=0; i<8; i++ ) { - if ( liquids.get(i).type.equals(type) ) { + if ( liquids.get(i).type.equals(type) && 0 < liquids.get(i).volume ) { return List.of(i*2, i*2+1); } }