From 2bbab678402e0cb71b3b5649be6b28da0e1eedb5 Mon Sep 17 00:00:00 2001 From: sige Date: Sun, 28 Apr 2024 21:06:05 +0800 Subject: [PATCH] 1 --- app.db | Bin 757760 -> 757760 bytes doc/MQTT.md | 10 +++++++++- publish.ps1 | 2 +- .../digester/controller/TestController.java | 7 ------- .../deviceinstance/LiquidAdditionInstance.java | 6 +++--- web | 2 +- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app.db b/app.db index 2e61f1bb7e18b147e958069d40e152fa54fa72ab..a8cb686c9e4fc2b4e9b495b7774747c44556668f 100644 GIT binary patch delta 4629 zcma)=dyHIF9mnTBX6~KYc~n6x4br7-mu}f}Ip^Mc?m1`MnzqJvDYV<7twoCTp8IG) zXuF`LgFLpBFe_?=u5vLZT1W&!FmB7^TGN)IK!^!aL;)p|LL`XNQm|IAJp9efIwc*G zoj-Py*_?dlcfRNM{r=9`ksa2^4(s-5Wi~&P$?S%oariOsnB}Q#{?4^KrW+;rTru|~ z#&~Y}LrV9ZW`A`wn_D?O(C7F*;~u6F5^?Mx*CsLYi6>DQ#)4Bf;(_?#J6-+Dx#yf` zQ;aW-t@E$7vF#%4BAa*HWB|JZlv)ha>Zsm?#4B*Jl3LK)J7%TvKde_6Sd+1GdCc} zcUeOL5BXdwP)U<~8pu!vAOVToKsaD3dPp3P1;OgpJodw>edb=_U~rOReP9bpI^fb3Y> z$mJeG0@4Bbl1Mv*sPP1e&-=m8cHORbn=>j5k~O1^6~`B<6?VshQy&V)pD*X&Z$WMI zwt0`G^Bz;480mt~({dkWDi2hGv^Za_<#LxR`bxSk86Q$FOs=SCr>7q+QX?}7HY#_e z$A{E6_L-iu28m^(b957KQ^vhl4SSmW2$*?a@T&nC*8MS|Fxm?C0n1? zXV09pc>|_>kREtica77&nt57Nry5(;h1#jvuAE^$XWo~;Hko=rzbD;uKwoGo*C!vp zq;Hwsr>#^wNeAuY^zJ|D!M$f(l6gkynp!wqc(U;0!f;_QzoT$w{;0Z0JtIFOIdde7 zRr9@M*+_Q1ZvL*aI^8#tg&nL&wvJ|(-cMI?ekbt@bg&cdx6(Iqmy5LqE zGB4zg&0SAB+*nCH9B@BIl6w%v0p+j=T81*)f$;P_fgSCwzI5rgv+12$cV;*-x^w4D z%Pq)0nLS^BMqi=*QM*|Ei|Q+{E0<>uWroL;?!I%Ywav{wti&c(C0yDBPNBksq~ri zi7^T}*9zvrzqO$q+j2ZG&NrH9Kk}sz6eC&pwj0G@M*>~%3g34i{9~FtH!WY!Io=B9 z!8h8e#PaGxt{u;5TD3t)_f9vn5{KAdt0Y1g1G_AaSU^dw?WamM(3k`AJisZqkPJ)sF$}Nl`=r>J3rNA;G(1C6MQxr}Jf&)e= z)GLEndQyx%zPo=JsM<>8!QZq)spZvkeq$3F5)A3XVb@VTk>Q?#1j8J~gu-A3MK?Z@ zv!JzjD~<<;Ph#Q$$FVR4O*b@|9XKahP?@-)E$6(I$%7l((b)1FXo9PnXh}JgB779N zkejaSK!Q?-z^w;FmJVnR1LQ~9`T*grP##>>hQ%J7ms_n}IZ<&34xZ?(mc<6Y)J}CQ z;Q;mPO={%CBH)-H9Dx~J4=%#eg|>y6Btkp(XiS;|WQe!iwK(`B6%SBv06UiLI@Q`0 zO=|2*J7ywAk%T^V1))gr(1#NXVB!ZZw&R8bGYJf#M0r=;q&|_oExWcjr)#X_CsPj^x1>7`8t3G- z?`Qgw1y5vq(!*~WOV!4AOrE~N)s7|6TLw~opPcoK*^{Ji84prakyKI(TDLtYbDt*VCRq{)`R4Kk*+*90M zTwnZr@lt8M=z4S|4&oov}et)Cd`+ez^wt3fH6E}f#krft`MsV-EfDu;`6OY4&LN6ba( zqesl0U25i*WX?7?^6!0Mu4(M5gC}LAXX~|g@;uN!s;``UUNKuc+Sh?ruWYMaTsg1duwCWR;$O>OE4$@F>0s&6 z(sxS|PPLrw-<03hrSy(H`0R|vzB{?%YVXxcoP733roGcxIq5(NZ0$&6-;<3Acx(~v z?X-MD{@C{VEpkf1Ij!ESXYp)lw86q&%J-Td7UyJ3#ZOf%eUACOzB_#w z7w$G18|omfW9{$hO}wyOTV1cOlUIlK@5agwE=1Zt>njtqBnKXvTd>s3@#Gg}^ryumg`+?HFYJrNcK`qY delta 1108 zcmXYwYfMyE5XbL1d(J)Qp1phTiqsGyxafi`bl1Dfx;%tNHx>+4j1LlgRDngsm|AH2 z!H|GUF^aZ^$C^&sCKZ|niJ>W=awHWYhBl@NO4Fv*ni^|blP1&= z&Wj!N7sMiA|G|QA-GNXzFF#TkJGf?R_HZZh@C>uW<|wg*J{axVu;tv@~tcqtm0026~I4HSfjh{lWZT zI8eKZhCHwkPtCT6^Oc9U8H{w&#C^l(5B3+xqrFc1b z;?#oeaazyKD$UEE@o9NIPVLIKp|zcEfvJAAMQ%P#uYTlMs*VBksH-n+>+DeFSe9D$ zcgjw*Nilyi2h8``kLX*o$_$v)xMvJOx`zdz!ovWt6y!02_7LDw{NB$piaXe!DVhkE5 zjlD+5;I8|wE3OZCwyVZf;4<|;^lN&zUa!BVC(HE~{}LrE_X&9<#6KRhm87#g1F~ni zXQfK$JvvO=9oOi78lgHV(v!$TM>n~Oqc{aU){CKGmY4E{R%-I=B64Jw4>>V<71p)c z`#Af8?}fUxykB;`$|wldpnGk2M57L^z_+Kqii*buGzDisX*6r|-3vgs$V<}F`5gaFdBS`7F^W4pMHo)FMUk3U>#xl#l-J$Dr=uN-7Moxv`(%EasKBTNPOcDH#J>KWP~5EL!oK5L z=7>iiH{q4acA%ChfsK|ZhfYf@OQJ3_K-Tde$ij~=m``4|L@y)y5?hv;pytK6Nggi{ z-43FU+RU+0)r*xWs7Vt6@R!@No-Gyuj56V?R;L$!D;7V){dAEdAC`#BVajc!L+Z0) G?)-n5UQoIK diff --git a/doc/MQTT.md b/doc/MQTT.md index c2bdbb4..a7c1cbb 100644 --- a/doc/MQTT.md +++ b/doc/MQTT.md @@ -132,4 +132,12 @@ sequenceDiagram "batchNo":"TR-01" }, } -``` \ No newline at end of file +``` + + + + + +异常加液不对 + +【OK】异常加热倒计时不对 \ No newline at end of file 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/controller/TestController.java b/src/main/java/com/iflytop/digester/controller/TestController.java index 56b729b..99a3c15 100644 --- a/src/main/java/com/iflytop/digester/controller/TestController.java +++ b/src/main/java/com/iflytop/digester/controller/TestController.java @@ -1,22 +1,15 @@ package com.iflytop.digester.controller; import com.iflytop.digester.deviceinstance.Device; -import com.iflytop.digester.underframework.UfCmdSnippetExecutor; import com.iflytop.digester.underframework.controller.UfApiControllerBase; import com.iflytop.digester.underframework.controller.UfApiResponse; -import com.iflytop.digester.underframework.dao.model.UfMdbNotification; import jakarta.annotation.Resource; -import org.opencv.core.Core; -import org.opencv.core.Mat; import org.opencv.core.MatOfByte; -import org.opencv.core.Rect; import org.opencv.imgcodecs.Imgcodecs; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.Base64; import java.util.List; import java.util.Map; @Controller diff --git a/src/main/java/com/iflytop/digester/deviceinstance/LiquidAdditionInstance.java b/src/main/java/com/iflytop/digester/deviceinstance/LiquidAdditionInstance.java index 5ac55d1..f378082 100644 --- a/src/main/java/com/iflytop/digester/deviceinstance/LiquidAdditionInstance.java +++ b/src/main/java/com/iflytop/digester/deviceinstance/LiquidAdditionInstance.java @@ -83,9 +83,9 @@ public class LiquidAdditionInstance { // add liquid to tubes by given pump indexes public void addLiquidToTubes(List tubes, List pumpIndexes, int volume ) { - var pumpGroupOutIndex = pumpIndexes.get(0); - var pumpGroupInIndex = pumpIndexes.get(1); - this.bucketVolumeCheck(pumpGroupOutIndex); + var pumpGroupInIndex = pumpIndexes.get(0); + var pumpGroupOutIndex = pumpIndexes.get(1); + this.bucketVolumeCheck(pumpGroupInIndex); for ( int batchIndex=0; batchIndex<4; batchIndex++ ) { // 外圈 diff --git a/web b/web index 17fa1ae..c4b7e56 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit 17fa1aef5ecda724d52d4773055fc41f3a76e67d +Subproject commit c4b7e56e2578089ad30d12ebae9b4ece84d0dc6e