From da1b77cc3fa6dacfc1f5aa241c6e8b9dee8df222 Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Fri, 31 May 2024 10:51:38 +0800
Subject: [PATCH] sss

---
 app.db                                             | Bin 978944 -> 983040 bytes
 .../com/iflytop/digester/StartResetTaskThread.java |  55 +++++++++------------
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/app.db b/app.db
index 17d008882574818a05ca574fccb3827a48489d41..2b77fa710646462dd2af9f9630a933e9ef772d98 100644
GIT binary patch
delta 1618
zcmcJPPiP!f9LHy7yV=cVc9tTVwgDSL5u?2Iy*KaAyiGA`4=F+gn{Hc;hrGW~47O?o
zp_J^1QV}tV$`I;ND0*m7D+}#SFZQ-*Yy8v0UIJ2U+OvZCHpYtwS(F~W47~T7`F`G;
z@9)>?&vZI_-<~LM1VM27oypm7BVT-NG5mZn`f$0LG%ot(;C2yrqFvR-#YhKN!uQ|(
zWae!5N+<d`8S$I9@`W>(RwA#G*EX-R*N9ietLioCRr4C_URsGCe<YkQ%Dwo(s9Y&v
zFWw)OQSovw#@+M1_^T*<ub916-_t$&O}rEynl7~?46!B@E1-lhfEccUz*GXpoJ$!@
zB|&MhHmD?$q?RfI{2B*DK?O3X3Bb-kX&^Pk;NaWt!nOFL+5n;-(;cIqj{QD%b?oEt
zRCq9)Zmc!V2Y=My=<CH3{g@=Rk@^?))%uCrtL5?0>&2V>c%pluA3s@%!Z(V&yFKT9
zKgB9s9=Hq5Q>|?Vw9XhHB1?g!SOcnsA}WJKDH2>CRA!bKixdS?dsw2F0TOEIu|?*%
z<3u15{4l6gjv$LU2g;ukkjy&&4r2fdO@-km%Zv%WpWZCxnmG;`uu^$@!#I!_B4Cv#
zanupd7kqaH-iW*KM*Zsg2&t?Fl`o5GFKI=U)$U`xWWKU_;g(sWX~qFJ7y|+o2AR$<
zFj^pE2|@&;;KzZd)-EMRO5if-5276bQfLb(=Z>b>a;I5vt^3PbGF~m+6Pzn5{bYBt
z?Uho$^l<b+_-lAHIOoIkBFsU)P;Kwb>vtcR8OFXiaWg^1%6c+4OGJyNO@vW?Z~k<p
zz4LkhiD52S>XXNgKX<CQFqiBpI>+L%<<qBMu+nISC?Tmxk&%pIW)w?dW-~;Hvd$tO
zM*<)PDVjvE<=vrZGAO+JQ(NxC{Io6islT36t*QBw#pStV$NwPVEy|l16HjvVZ;~N0
zaR*3PE6th&aZhq&i)5H4z5^t*g=jNF(32eAA{k~#{42@Qf67VPqM}J4%kR(IgQS;y
zOowQn;`q&EGCuT@vInJpcHfef#arviF0P$`HgiH!s+5y7g`6>hGCyc6OpW_TN^uLP
zO_9=Wb3OUGR;&B59X3eNAfIjTJkWS3-=9BIZI9=3cO94+VvH4!vbrudeyeXUX7?o%
O$z~@|-wbIJQuZfL^wz!r

delta 351
zcmWm7Pbh<79KiACdG@}0-@WheeRiN$#E6tXt+lw=vYq@ZVJ^yL;YM*rc^6u_jFx`1
za^b>ZCGpe_k`r-w!%|${VkKHT?TW|YbNODrwjHzG=uV?rB7{_TTjI2oPHm;=MT#A-
z>z2PLGpQojtU*_v*c`c|d%3e{UfkL2n`6s1^Ja=!CV3=9Ql<Z<NxI~d49OJ5EQ}`T
zB&rT{W5j`BTyr3zuzRH}3J%;d`ib$X)h_Z+ut@PL&AhY@mp-5iN8X`L%#`57pyQ~z
z&{uE%n9t@ZU8PCd>3{JT$gdH`qzk=0){S*wEgPF^fYrS7o}e{kH7gaUnLY3TN3f!8
zkdklTx1=txF;Q?KsWBG8SWu2TK4F&P;VU1&M9pl&<Qwloamku8;V%&3FYCFiM6?P)
l!{Pm6(BV^B?m9XxDla^sd;Dq$HJ1m^TPJi?gv$KU_ybYEe?tHO

diff --git a/src/main/java/com/iflytop/digester/StartResetTaskThread.java b/src/main/java/com/iflytop/digester/StartResetTaskThread.java
index 7740bb1..93ceba6 100644
--- a/src/main/java/com/iflytop/digester/StartResetTaskThread.java
+++ b/src/main/java/com/iflytop/digester/StartResetTaskThread.java
@@ -64,7 +64,29 @@ public class StartResetTaskThread extends Thread {
      * @issue : <a href="http://127.0.0.1:5566/issues/85">无法获取加液位置是否存在试管架</a>
      */
     private void setupHeatingSlotCover() {
-        boolean isDoorOpen = false;
+        UfMdbNotification.action("TaskStartResetTubeRackCleanConfirm", new HashMap<>());
+        this.waitAction("TaskStartResetTubeRackCleanConfirm");
+        var cleanConfirm = (Boolean)this.actionResult.get("confirm");
+        if ( cleanConfirm ) {
+            UfCmdSnippetExecutor.execute("DoorOpen");
+            for ( int i=0; i<5; i++ ) {
+                // 将试管架移至加液盘
+                UfCmdSnippetExecutor.execute(String.format("TubeRackMoveToLiquidPlate.%d", i));
+                // 禁用该区位密封盖，用于后续重置状态
+                UfCmdSnippetExecutor.execute(String.format("HeatingSlotCoverDisable.%d", i));
+
+                // 等待取出试管架
+                UfMdbNotification.action("StartResetTubeRackTakeOut", new HashMap<>());
+                this.waitAction("TaskStartResetErrorTubeRackTakeOut");
+                LOG.info("HeatingPlateMotorSlotCover #{} : take out", i);
+
+                // 重新启用密封盖
+                UfCmdSnippetExecutor.execute(String.format("HeatingSlotCoverEnable.%d", i));
+                UfCmdSnippetExecutor.execute(String.format("HeatingSlotCoverServoSetCurPosAsMiddle.%d", i));
+            }
+            UfCmdSnippetExecutor.execute("DoorClose");
+        }
+
         for ( int i=0; i<5; i++ ) {
             this.setProgressMessage("设备初始化 : 检查试管架 " + (i+1) + "/5");
             UfCmdSnippetExecutor.execute(String.format("HeatingSlotCoverEnable.%d",i));
@@ -72,36 +94,7 @@ public class StartResetTaskThread extends Thread {
             var currentPosStr = UfActuatorCmdExecutor.execute(actuatorKey, "motor_read_pos");
             var currentPos = Integer.parseInt(currentPosStr);
             LOG.info("HeatingPlateMotorSlotCover #{} : current pos = {}", i, currentPos);
-
-            // 如果是空的，则初始化位置后继续下一步
-            var rackExistsPos = UfMdbOption.getInteger("HeatingPlateMotorSlotCoverRackExists", 0);
-            if ( currentPos > rackExistsPos ) {
-                UfActuatorCmdExecutor.execute(actuatorKey, "motor_easy_set_current_pos", "2047");
-                continue;
-            }
-
-            // 将试管架移至加液盘
-            UfCmdSnippetExecutor.execute(String.format("TubeRackMoveToLiquidPlate.%d", i));
-            // 打开柜门
-            if ( !isDoorOpen ) {
-                UfCmdSnippetExecutor.execute("DoorOpen");
-                isDoorOpen = true;
-            }
-            // 禁用该区位密封盖，用于后续重置状态
-            UfCmdSnippetExecutor.execute(String.format("HeatingSlotCoverDisable.%d", i));
-
-            // 等待取出试管架
-            UfMdbNotification.action("StartResetTubeRackTakeOut", new HashMap<>());
-            this.waitAction("TaskStartResetErrorTubeRackTakeOut");
-            LOG.info("HeatingPlateMotorSlotCover #{} : take out", i);
-
-            // 重新启用密封盖
-            UfCmdSnippetExecutor.execute(String.format("HeatingSlotCoverEnable.%d", i));
-            UfCmdSnippetExecutor.execute(String.format("HeatingSlotCoverServoSetCurPosAsMiddle.%d", i));
-        }
-
-        if ( isDoorOpen ) {
-            UfCmdSnippetExecutor.execute("DoorClose");
+            UfActuatorCmdExecutor.execute(actuatorKey, "motor_easy_set_current_pos", "2047");
         }
     }