From 960d62027ddb8124162c23e3f452c8f8baecf454 Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Thu, 18 Apr 2024 19:39:25 +0800
Subject: [PATCH] ~

---
 app.db                                             | Bin 360448 -> 360448 bytes
 .../com/iflytop/digester/DigestionTaskThread.java  |  84 ++++++++++-----------
 .../com/iflytop/digester/StartResetTaskThread.java |   4 +-
 .../deviceinstance/HeatingTurntableSlot.java       |   4 +
 web                                                |   2 +-
 5 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/app.db b/app.db
index d87a68b8dd54b35225c088c6c2d409b40a133feb..dbb8750d2137e3508063c43b672b38a3501445b0 100644
GIT binary patch
delta 12954
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
ObMMeN?mppV+y4S`gMYUG

delta 1019
zcmb7CU1%It6ux)n-ksT*ou92SX*X$hf-5A3iSxHR`@_Q0N?XW7Q`)URZAf;TT@6ay
zS^@^t?3y1W64^T7U`5zq42iTfc3>|eeXuWiD7H$W_*CnYXod8pq7PMP5+qMPcs~w@
z^WFQMbMCpfUhk~eJDV}F;{*WU1>a8khA#G}LOwHe{OvC%K9!<E8DM4!h*v~D{5`+L
zEO{q1n~5weAj}q@Ud+5Z1KiE8QNsDEE9xzE<q?|Oj~MS}_a!K76bH{Y;yC2H>D^Nw
z#=0H3M|al+*yFT%1&{CjQx9Ru0@A1#8TnguG<ndye*~kQq~6)Fb(wxbT5*`#AQigf
zS+!Rr=f^4Rt<2hTf67Q!jgqaYx@BsrWm%e9o-k8txnfjGR;FU74ZW(|d-+-u$_J!T
z@FH{}ex25Z^N|6zpUd+L>}T*7r?;gzg;w3U(bE0$mv_p0pR7#Y3IQ1awu^8zI4=2H
zAGPc75es$l`+KlW`TolL@DhZ&du$oL<A+<zFi-7>gx?6)gtr1w|5^*yNK~PI4WiC9
zg_8H8#RAnX(C~iTpL`6)f%Gc#ym(hUB&-V^ky-u$e;UTQZ#dOe6f_xhK;nH!45LOg
z!V~=&^p^xpqGi!{mA#x{!A}N-Eg+ESCi((-+Q<WTV18^$oIf)q7K^&MnD4uQB$hp3
zlq&N_|K)P}4o9}GqwJwBGz?g<0fig<eE0~%;>YMAH3K%BKKUZqXrWb_0-w9bSJ6qz
zjJnHVJWRG%QIv1Xn2|B<cQ8yM3VtL>Gz(I&2QUWr6P%*w+<h88)j?mT+L3Ris}aDT
zMK@tj_+u_l-qdiDLTCmIxZ7<y;c8DoOp+#k4kCQeC$ElD33nv{-y#Q-_-Br`8N+1?
z_%OwX$w&b=L;iqH?|z=_B$Xg99mQ+=XM<@3?+E`lz#m{N5bv$VzHX*ieAdRfl3h-k
z)`Y1xIs?kg;oP}u*|IVjO|>(|gleVBwpvb`qNS#_w2`sxYQ{{J+#jx^g!?c<DaM8A
z*Q(QROrBG8_`&w=^?Qb9SgK~JdRoz~td`7L_E1VsHe#`$z+nI+FIs;r4sk(0{)MRJ
dUC_FZx&MMYUc)19t%eP<S;M)oH?BPy`UiMA1HAwM

diff --git a/src/main/java/com/iflytop/digester/DigestionTaskThread.java b/src/main/java/com/iflytop/digester/DigestionTaskThread.java
index 556070c..9b0a7b5 100644
--- a/src/main/java/com/iflytop/digester/DigestionTaskThread.java
+++ b/src/main/java/com/iflytop/digester/DigestionTaskThread.java
@@ -188,48 +188,6 @@ public class DigestionTaskThread extends Thread {
         device.transferArm.moveTubeRackToHeatingTurntable(this.heatingSlot.index);
     }
 
-    // 启动异常处理线程
-    private void startErrorProcessThread() {
-        this.errorProcessThread = new Thread(() -> {
-            if ( this.errorTubeIndexes.isEmpty() ) {
-                // 无异常，直接返回
-                return ;
-            }
-
-            try {
-                // 异常处理执行
-                var errorRound = this.solution.getDigestionErrorRounds();
-                for ( int i=0; i<errorRound.maxRounds; i++ ) {
-                    this.executeErrorRound(errorRound);
-                    if (this.errorTubeIndexes.isEmpty()) {
-                        break;
-                    }
-                }
-
-                // 如果还存在异常， 则直接取出
-                if ( !this.errorTubeIndexes.isEmpty() ) {
-                    var device = Device.getInstance();
-                    // 等待放入空试管架
-                    device.door.open();
-                    this.waitForEmptyTubeRackPutIn();
-                    device.door.close();
-
-                    // 取出剩余异常试管
-                    device.door.open();
-                    device.transferArm.takeOutTubesFromErrorSlot(this.errorTubeIndexes);
-                    device.door.close();
-
-                    // 等待取出试管架
-                    this.waitForTubeRackTakeOut();
-                }
-            } catch (InterruptedException e) {
-                UfMdbNotification.error("消解异常处理失败 : " + e.getMessage());
-                this.updateTaskStatus("Error", String.format("消解异常处理失败 : %s", e.getMessage()));
-            }
-        });
-        this.errorProcessThread.start();
-    }
-
     // 执行消解每轮配置
     private void executeRound( MdbDigestionSolution.DigestionSolutionRound digestionRound ) throws InterruptedException {
         this.updateTaskStatus("RoundStart", "配置轮次开始执行");
@@ -282,7 +240,8 @@ public class DigestionTaskThread extends Thread {
                     // 检查试管
                     DigestionTaskThread.this.tubeCheckAndMove();
                     // 启动异常处理线程
-                    DigestionTaskThread.this.startErrorProcessThread();
+                    DigestionTaskThread.this.errorProcessThread = new Thread(DigestionTaskThread.this::executeErrorProcess);
+                    DigestionTaskThread.this.errorProcessThread.start();
                     // 预检查完成
                     DigestionTaskThread.this.isPrecheckFinished = true;
                     synchronized ( DigestionTaskThread.this.precheckLock ) {
@@ -341,6 +300,45 @@ public class DigestionTaskThread extends Thread {
         this.updateTaskStatus("LastRound", "执行最后一轮配置结束");
     }
 
+    // 启动异常处理线程
+    private void executeErrorProcess() {
+        if ( this.errorTubeIndexes.isEmpty() ) {
+            return ; // 无异常，直接返回
+        }
+
+        try {
+            // 异常处理执行
+            var errorRound = this.solution.getDigestionErrorRounds();
+            for ( int i=0; i<errorRound.maxRounds; i++ ) {
+                this.executeErrorRound(errorRound);
+                if (this.errorTubeIndexes.isEmpty()) {
+                    break; // 如果没有异常试管了， 后面的就不执行了
+                }
+            }
+            if ( this.errorTubeIndexes.isEmpty() ) {
+                return ;
+            }
+
+            // 如果还存在异常， 则直接取出
+            var device = Device.getInstance();
+            // 等待放入空试管架
+            device.door.open();
+            this.waitForEmptyTubeRackPutIn();
+            device.door.close();
+
+            // 取出剩余异常试管
+            device.door.open();
+            device.transferArm.takeOutTubesFromErrorSlot(this.errorTubeIndexes);
+            device.door.close();
+
+            // 等待取出试管架
+            this.waitForTubeRackTakeOut();
+        } catch (InterruptedException e) {
+            UfMdbNotification.error("消解异常处理失败 : " + e.getMessage());
+            this.updateTaskStatus("Error", String.format("消解异常处理失败 : %s", e.getMessage()));
+        }
+    }
+
     /**
      * 执行消解异常处理配置
      * @param errorRound - 异常处理配置
diff --git a/src/main/java/com/iflytop/digester/StartResetTaskThread.java b/src/main/java/com/iflytop/digester/StartResetTaskThread.java
index 46ebfc7..db141be 100644
--- a/src/main/java/com/iflytop/digester/StartResetTaskThread.java
+++ b/src/main/java/com/iflytop/digester/StartResetTaskThread.java
@@ -37,8 +37,8 @@ public class StartResetTaskThread extends Thread {
             this.setupErrorTubeRack();
         }
 
-        this.setProgressMessage("设备初始化 : 相机");
-        device.camera.enable();
+//        this.setProgressMessage("设备初始化 : 相机");
+//        device.camera.enable();
 
         this.setProgressMessage("设备初始化 : 定时刷新加热盘温度");
         device.heatingTurntable.temperatureMonitorStart();
diff --git a/src/main/java/com/iflytop/digester/deviceinstance/HeatingTurntableSlot.java b/src/main/java/com/iflytop/digester/deviceinstance/HeatingTurntableSlot.java
index 2e5f3a8..5c261b0 100644
--- a/src/main/java/com/iflytop/digester/deviceinstance/HeatingTurntableSlot.java
+++ b/src/main/java/com/iflytop/digester/deviceinstance/HeatingTurntableSlot.java
@@ -15,6 +15,8 @@ public class HeatingTurntableSlot {
     public Integer curTemperature = 0;
     // 目标温度
     public Integer destTemperature = 0;
+    //
+    public Integer heatingStartedAt = 0;
     // 加热时长
     public Integer heatingDuration = 0;
     // 加热状态
@@ -72,6 +74,7 @@ public class HeatingTurntableSlot {
         this.destTemperature = temperature;
         this.heatingDuration = duration;
         this.heatingStatus = "on";
+        this.heatingStartedAt = (int)(System.currentTimeMillis()/1000);
 
         var snippetName = "HeatingTurntableSlotHeating." + this.index;
         Map<String,Object> snippetParams = Map.of(
@@ -83,6 +86,7 @@ public class HeatingTurntableSlot {
         // 加热完成
         this.destTemperature = 0;
         this.heatingDuration = 0;
+        this.heatingStartedAt = 0;
         this.heatingStatus = "off";
     }
 
diff --git a/web b/web
index bb67f94..ce67e9b 160000
--- a/web
+++ b/web
@@ -1 +1 @@
-Subproject commit bb67f94bd77d640a6f80187d24076b54846aa9f5
+Subproject commit ce67e9b72a9ff101cd15bb714b9aabbdf23ad1f5