From 726048a8220a3be393b8f7983e87ce1c0312bd15 Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Sat, 15 Jun 2024 09:54:39 +0800
Subject: [PATCH] ~

---
 app.db                                             | Bin 270336 -> 270336 bytes
 src/main/java/com/iflytop/a800/TaskManager.java    |  33 +++++++++++++--------
 .../java/com/iflytop/a800/task/TubeRackTask.java   |   4 +--
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/app.db b/app.db
index b562b491bf7b8342ceea9b2ec454561edc97454e..fe28804a8a935fab68a54f5de981aa9cbf752690 100644
GIT binary patch
delta 1794
zcma)-Pl(i39LFcg%+AivCYizF*0MsOrIyN%zW;geB-(<C^w7hAC=2^u-h0~1%*~@&
z4|?)o5m$uLYw4k^rM63N(rYgsJ(c3oi>3EMe_6UXJ-CL1BqYCl-jDpg-*0xFPIjJ7
z?!A|8eDw9^IXvFlzP+8?-cEns&gN%6q?L|!%@x#M1Q4v!U_GrsXm6;dj8-D<|9vKV
z`DwS(AOA>)ll|dN_D}h4TJHAB-^<<N;{Ugwrjr-re*S0j173Zf^oyIlZ|_eh-=xVt
z-nf`FJRQuYCwo=kk|-U4Q!PPoZb1{pfjAj7r39aOLO(lu{`@(mW;{7~Niau<j}mCK
z8boacxJWrjqoWAgc}~phm)3f{URv(;%ID=?ajm#kj&U2dhjIBFoB5(hlSg>|Jo)nD
zY?gHCC_R<UMqRr2<#9G38|znk<%9B*;#qN{*vx;+ujj@3ll3dO=HqeNSNErryUpdb
z@oYBDlYE-zxgbI+YZ&MlJqX8Ya21OXrL1d8EG4S$GS&HFbam_UXo(!CB*rriRdB3T
zfC8hHg(eW^@k&z7bT{-WqF0yD)JhSZ3!qt`hz=YqE(alatD-PgllVq*v!uoOVu<MB
z61sAZP~5?rXh3+1UxrBr(tGZ-sOk#8Ne7kB7b{3!St1*yNL|~|fKo1E*Mfi!u7*Hy
z2v$`g^3V-EK=fb<T}4G{>o{!;4pCJ&M2<79y)jnRQ3(2)+#KP}`J#{L{u0`7<E%w=
z6oi8i1`W{8(<l)Lr;#zIx;334IYV-DC_QP63p_Y9ldnNkT%z>QmCPv3T=Xm|42-u2
z%6ySt-TEp;^s#(&Vq<zD*Th(yV+4v}gjRPPG<6k3BE37!rI*2)F6f8NtL%dd9y>)X
zQ!pI!LU4wfAkl#%tP;fOHU_%Vj_>}Jt-e$Iis5jlcu|USuiR?Wp}2=0y;L-9E_Cta
zT3h%gi!D2B)E0Iz%xYWMbkYB?tvr<TQEFak3%iJOa6m+<HE+{ezpd<|oUAQ8QV9R)
T;2>cSN4$B|jK9O*(fj`bNank;

delta 1999
zcma)-&x;&I6vw-#cXoDWGF>wy8X^%TMik+Zs_Oa)!m{fjf|`Rcc#y!>Pca8Co>WM0
z4#_zpZtng8t`KDLA~|@9UcBYv#e)YgidPY>?seA=OvXM;&osPOpZ8vUzi;**%=aJ6
z?>;kl>c>wn?xyFhz1w^F?Y+U*d&LLam%SClP*Q;-%mY)>fznihRgMTM1;$Do{jpvA
zdZk}zJ}*Y|qtSlx7b**6GW0z<Kqh?-?l0!ka*%(LzIXGwDu&C&vze=WAXr!sGC>(-
z7_89_go;LbYYa9OCa>*Wy}B#JvKq8W#*x5@h=3z!z(hz%LKvXjOTvQ-RJcx3-X?ig
zNgTZb%_;$uSxUe%Re>c|8e^P}!Ty&u$+E0KcQSN{?x07AA$EW9{EI06;j_j3+P%Z=
zd|3A=y?D7;=6%W?yi_d5kC(W*!rAP*Y&`iXLpP5mUlo5|IX``vq0iAP<+tVAvtMQ(
z&&o4joDtK9Y06(t>l>5la(Q-^UpT+GF!P=TD=h|Lo3VLDKx3tW=%_f?G7_Qt$l;^#
z;rOkcYs;NC-@QaGU4Liy_~pj9!@`v!!qzrIj7|g7nuFrZ0#84Msf@&m^n`7#f^BtR
z-gp_br9fhmFH4#N9b5&XHiB^L1E<XOgpF3gMjaRrn&K)MhFNW!DN@inh~yvTSfonQ
zN}aIkb*@Td+*}3Q?7))wk}sVA?HC6ZXqDt^85mD=>XYjv*%R0bR()#W1RJh`4LdMP
z4e>MvuvF6o(=CSsuPQ7Fi^(^qovna%SsTZ!`f-75bYQAE&<77#(j>;@KhQQBa9F1y
zswlW$*I5@<tZJ-iSoOckSDIUzdPp0>ri&xE86)Q)jg!O#rKRoL*<c0i{XyH<xOExP
zMoAkbc*9>!W7I~2CJh@CN)yOpM%UcgX=nH9--;Jr$An?YNPu)s<D=LtFy<gc5{0%V
zV%e+o=Cr2|elNDpp-1IiG)0Hy&**yEZLIvJd@pT_H_EzMR(+PlqzOEB_<Dnn+Y_JU
z&W<^^n!vh`wMH$whb=anz&?^5Hi3;C>;Kc^MjP2fOYPe43gJmQXxIM96<=I;$4BXp
J_3!8M>>t2d?u7sV

diff --git a/src/main/java/com/iflytop/a800/TaskManager.java b/src/main/java/com/iflytop/a800/TaskManager.java
index 771f411..8af5702 100644
--- a/src/main/java/com/iflytop/a800/TaskManager.java
+++ b/src/main/java/com/iflytop/a800/TaskManager.java
@@ -1,5 +1,6 @@
 package com.iflytop.a800;
 import com.iflytop.uf.model.UfMdbDictItem;
+import com.iflytop.uf.util.UfCommon;
 import jakarta.annotation.PostConstruct;
 import org.springframework.stereotype.Component;
 import java.util.ArrayList;
@@ -34,18 +35,26 @@ public class TaskManager {
         // 清理掉结束的任务
         tasks.removeIf(task -> UfMdbDictItem.match("TASK_STATUS", "FINISHED", task.getStatus()));
 
-        for ( var task : tasks ) {
-            if (UfMdbDictItem.match("TASK_STATUS", "READY", task.getStatus())) {
-                task.taskResume();
-                return ;
-            }
-        }
+        // 寻找新的可执行的任务
+        var thread = new Thread(() -> {
+            do {
+                for ( var task : tasks ) {
+                    if (UfMdbDictItem.match("TASK_STATUS", "READY", task.getStatus())) {
+                        task.taskResume();
+                        return ;
+                    }
+                }
 
-        for ( var task : tasks ) {
-            if (UfMdbDictItem.match("TASK_STATUS", "NEW", task.getStatus())) {
-                task.start();
-                return ;
-            }
-        }
+                for ( var task : tasks ) {
+                    if (UfMdbDictItem.match("TASK_STATUS", "NEW", task.getStatus())) {
+                        task.start();
+                        return ;
+                    }
+                }
+
+                UfCommon.delay(100);
+            } while ( true );
+        });
+        thread.start();
     }
 }
diff --git a/src/main/java/com/iflytop/a800/task/TubeRackTask.java b/src/main/java/com/iflytop/a800/task/TubeRackTask.java
index 16bb234..5884b2a 100644
--- a/src/main/java/com/iflytop/a800/task/TubeRackTask.java
+++ b/src/main/java/com/iflytop/a800/task/TubeRackTask.java
@@ -69,7 +69,7 @@ public class TubeRackTask extends TaskBase {
                 var testTask = new TubeTestTask();
                 testTask.tube = tube;
                 testTask.project = project;
-                testTask.on("StartIncubating", this::onTubeTaskStartIncubating);
+                testTask.on("TubeSamplingFinished", this::onTubeSamplingFinished);
                 taskMan.append(testTask);
             }
         }
@@ -87,7 +87,7 @@ public class TubeRackTask extends TaskBase {
     }
 
     // tube task finish callback
-    private void onTubeTaskStartIncubating(Task task, List<Object> args ) {
+    private void onTubeSamplingFinished(Task task, List<Object> args) {
         TubeTestTask tubeTask = null;
         if ( !(task instanceof TubeTestTask) ) {
             return ;