1

doc/MQTT.md

@@ -132,4 +132,12 @@ sequenceDiagram
     	"batchNo":"TR-01"
     },
 }
-```
+```
+
+
+
+
+
+异常加液不对
+
+【OK】异常加热倒计时不对

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"

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

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<Integer> tubes, List<Integer> 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++ ) {
             // 外圈

web

@@ -1 +1 @@
-Subproject commit 17fa1aef5ecda724d52d4773055fc41f3a76e67d
+Subproject commit c4b7e56e2578089ad30d12ebae9b4ece84d0dc6e