From 8cd7ae8032138971cc24bda0989412c15181be6a Mon Sep 17 00:00:00 2001 From: sige Date: Sun, 28 Apr 2024 14:21:23 +0800 Subject: [PATCH] 1 --- app.db | Bin 757760 -> 757760 bytes publish.ps1 | 2 +- .../deviceinstance/LiquidAdditionInstance.java | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app.db b/app.db index 2c686bba1285559e6aa036b7f008d71d545bfe47..afe0a4da315f5c0ed171e6489cbb8ade6a960373 100644 GIT binary patch delta 466 zcmaLTJxjwt7zgmX>m@OXZPGeAc%p)02?aMDbQ7mmojO%&t)mBmn;2X=2`Lo<;!sd@ z5~`&=i-R5dF&z34oCG0I|FwdOAP>JA?s++$^Xr~p_kzi!B!qOJ0TYB!ubN)cB=NGx z_od4zMf=9Uq2wXM-Fb)PiG5|=nJ;E&jO#t^U3=mMzDTFp3VUO1q(7sXUhCP6rJo_)gjHEN+s-%|MmUP+Vgy@GDbD*Ew{FeLF6~iI%i|Nine;Zg?!#=uluS}}hkh5s1-`y-q{8(N@X0n!kI0_;E@ ScA*4CD8oMNVatYdZ3iDP(|=n4 delta 9963 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 N*$NeZS~?``|6fgV)t~?X 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); } }