diff --git a/app.db b/app.db index 2e61f1b..a8cb686 100644 Binary files a/app.db and b/app.db differ 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