From fb26dbbe95240b53459526d5fa20917180bd286f Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Thu, 30 May 2024 20:26:39 +0800
Subject: [PATCH] sss

---
 app.db                                             | Bin 978944 -> 978944 bytes
 .../digester/DigestionTaskTheadManager.java        |   6 +++---
 .../com/iflytop/digester/DigestionTaskThread.java  |   2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app.db b/app.db
index 96b3180c3c970e7ad5c5a850b6176ebf81b41817..d5f5aed5c38b09ed13d6ee7f9dc11b238f63f6f5 100644
GIT binary patch
delta 2499
zcma)-eT)?49mnT&cW!oW28E*>Cmfu2$cxYVyv@$cZh=z}B!bxJCP%1=^O~B-?TII*
zt<Bv6%^lzigeFf?FgX-7(bIsS(_D=D2W^pRxN1YIHT3#Nl>jYglfI-$n?AcG+JjBp
zO`gomZ=d;ne&6T!GQ(4);i=O84)NH5Th@rjPCR_V%1yUEBA=7Sh0DUH2TzpVIr-_V
z<5|UgO-xQcJ1-D3I~S;0x#!@C_T{;^MlZhn;^%Mw<cp&d2d}jM>Ex`AGlNU1M<EQ7
z0&pQjfO@eHJkNH3;}nu8!a+o0KiTr`#LoS1?H9%4IV%+AXU1gfmCRUb^hzU{*^hir
zQp(F7Ljj3k@ZH+|7WVu)si-3dIgl?@NH49EzOQ8jL0G?RMeR>Ka%i)}mz*BjtR&M)
z_Pnr_slDnkN&0}j(yJ~_f77e}Q_L@u%TnS6i4#K~L<zxw`Vj^m!Z9Ge$HT)EIZh&^
zwViDGS1sM?!ZqsW<MaB&!-93*dd=EpZL#jKRP*=d8|J8ZIGsPO4vWic+lgI>Vd6U=
zutN_}>bbzhQ3ApkMLzUGJET+{O@HyFy6SbYkEvssm69==-8GgOOn)|(c}5q1eejPT
zE@6+pni=o$+}L&f0H6>PevCE(LEwZS@oef7pN1}i>b{Yc;~BoP>B@2Km$%9f2|s7q
zNo|+JuX`souO5{HV?QP~1-@Sh0L4iJJQ@-Z(Fhm37)B_e%Kr4~q}JAX^A_Q+g0<7?
zljezk5l@Rhwa&9S)7sH=Vp_Y^lmvnO;Xm3x>TZ2%JCINUVBi)2e{ezIAq2vJ6c8n$
z>n23qv%BS#t_+Ag7XvzzlvC{RfW9bwXFxwEi_6)wgZhdd2crlR7dY6X+)tSB%0VG;
z+%O1e7`YVr%5x(Z2KDs9U~b91@;YTN%f6SZNXp)H$9uV(mH#C*!V&QZ1T^+-KtqqK
zjFJT4$VCZ+b^-%O-CIxU)d{_O<g?Sc^t02((%hW;gntXt->lzCPx9pMwzgVW{e;b(
zG@ee6P8uIcV!~EmZS77EeQd0f>L}=A61lJdoG{^O_IOqT2S$Jt!jSlJ0b{2id{{?S
zFPq)ziu1-NE#gL|P8q(Wzs`~=!%L4$84qX0<Luj=-1m};#;A1dRC%R9i~yo>2q>hy
zdqUn!HX#Y5F~QI!!UyT^E*ZDKDQ^|dvg}yv6B55ZHP+f&6wd0Wc~8`THGT*w@oj#X
zke3XgZVY)5g#|z&9w<$CfqH>*pdRV-RO(J|InsLZf-dV!Fei**ot<2K{}1%Fy9TR{
zSuQVL{NqyR2BmFR{MBPSQra}Ft%-(W=w-EM=<5dl`flqFyZS3##jdq?Z`uqVEZ=oE
zfL%Yj{RSgyWW<e(q>+)<j6>Ix>_%G)jf_qsqua>nH8P^Qrft{rQA1Uzp)Ax;7pe=p
z!7mr~5UaKs^Nggg5=HU0ivPr5B^`d++&x>KBd_LVV=mUzP#Ks1F0bZkw&XjiWM3{@
zURiaN5-*Hz96s#JC(X6SqT-^iwUx^DHIG&vXZP<g7jEdQ+=C&e0NQ}SMHm(_Dq=Se
z?Lrmr(`x`*DJ4yG>rBArfw-T2XNS3f1H2mmh~yD;xq_B!3YwWtGXejvK)VjWMbJEf
z9#^1UQ_#$;p9%O%!Ti4db29<RD`F>4Je0P-WL|EO=StgI_PBXlMm`|@OWMx!vr2lP
zs_eNbTQ0XFwbV>sH_?<ytwiQ;dw)<pJ2M`Pi?*Fdj$56*XBKC6Zct0jd`6mJvYS$E
zc|S+K&=5)7s<y}C$PPy>MNNDfnm{HDy{j(lc>nRC?Kdzn%sZ}=E;wa=v0{#<cM29X
zM_MP0OU9kK$MiFLCqMhFp0D;)H)YH1Lv5Q%O-z4QxnfpIy!4S%BsA}0o4>#D+WS8J
t<_XURu9*FEYYuoKNZzq=bz}8jt^BR(`VKa9*&Jn0{n@lr_lkK&{x5_U$+Q3f

delta 827
zcmXAleP~-%7{<>z_ais=-kg)RxOHp0wl;Kav#=&<+SIx=wr(nAU$C%``p1&kuraX#
zQ=B*@?V_pB&WwPssFYMT|JX8V*UsY#jv-|XKUka)wU(_GmTiqJ*;E9J!|QzEfrt0w
zf!`Zj>WVFOC9Cl9Q`Nor`1GM^rk%4K5w4RADxihbbl2sX1?!YaRKLgdGbby9I8`Vw
zOZnDkHF_R(`|a^PBlaqI?}A{n=084r`_z}WljHZ^9?!pjsei^=buHTD@p?jmj$pf^
zE!ggLw7J8bj$k+tb~r;`cfi>ZbPja7!UrN3N0Of>F`m*8LhI#60z1n>T=$WLth!%n
z4Gs{|-+UB~3}RPRfBxM|`OM@~J%MQGu*2Em>}d6PU2eC>-Nsk8lh+jp4dM?HtGkFH
zfv@fo<&sFgMF&ChNoOGAlbZMqpY%5tO*zy8-QSpPGMZ=>`~*sd=No#Zd}hr)d=;@A
zJI_wA18g&s=r8mF9p%*}DTY&r>NfGK52UT1;e8;b<t^}RT8<J|n17L$$5p(V`t`d;
zc=?>1fmeQ)S`s}O*^r6%WR$NOgcnf}Oj+dwjAfP1)LtX1m{p#rweCj`5gTFqNhQ9I
z=kbTIrlg!E`cXbtQW_{>Ik@#m`Aak&)B?F<=Ek^rRuv=Iz>25<6A`tJNDKUOM7=KH
zy>K$B+Tr0RYI9;as`BNi_GF*1O`HYO6>X3oyP}ng|51pKv5Rx6EwMPS@x^()Nh{xh
z{z2qV_9J=Cz>l+j=7P$sK1QSfKb_TY5S)bWqQ%BP`a$1H1kZp6b}s81|BrgJKyBQf
z(|<POK9H95032S@JMjun8{UK$;OSc9vhl7yN?^k*vB2aat>Hhd=$kGI2hks3N?V5D
zt+d5QwYBJLb>5(TTu}C^x)~<gNCU5)wA{U^5Iu(IoF1F0-#wtS__pD8>i0X{?`)}k
zL1a8OM&lKNRbFQV(t2a(fyCE+N(*M8LaYJP6y0d_iUO~hrFZOBSsOyEl_o56`ilOH
nHe}2KnmYXaaG&B|JN#S)yiuT|aDUZO2Hm~1j(dNj*Mxrod`Tg<

diff --git a/src/main/java/com/iflytop/digester/DigestionTaskTheadManager.java b/src/main/java/com/iflytop/digester/DigestionTaskTheadManager.java
index a96b667..33a6674 100644
--- a/src/main/java/com/iflytop/digester/DigestionTaskTheadManager.java
+++ b/src/main/java/com/iflytop/digester/DigestionTaskTheadManager.java
@@ -168,13 +168,13 @@ public class DigestionTaskTheadManager {
 
         var task = new MdbDigestionTask();
         task.digestionId = digestion.id;
-        task.outTaskId = "DEMO-01";
-        task.batchNo = "DEMO-01";
         task.tubes = UfJsonHelper.objectToJson(tubes);
         task.status = "pending";
         task.message = "等待中";
         task.startedAt = (int)(System.currentTimeMillis() / 1000);
-        task.startedBy = "";
+        task.outTaskId = task.startedAt.toString();
+        task.batchNo = task.startedAt.toString();
+        task.startedBy = "demo";
         task.mode = "auto";
         task.save();
 
diff --git a/src/main/java/com/iflytop/digester/DigestionTaskThread.java b/src/main/java/com/iflytop/digester/DigestionTaskThread.java
index a38f2e1..e635221 100644
--- a/src/main/java/com/iflytop/digester/DigestionTaskThread.java
+++ b/src/main/java/com/iflytop/digester/DigestionTaskThread.java
@@ -148,7 +148,7 @@ public class DigestionTaskThread extends Thread {
         this.taskModel.heatingSlotIndex = this.heatingSlot.index;
         this.taskModel.save();
 
-        if ( "auto".equals(this.taskModel.mode) ) {
+        if ( "auto".equals(this.taskModel.mode) && !("demo".equals(this.taskModel.startedBy)) ) {
             this.lockLiquidPlate("消解准备");
             // 打开门
             device.door.open();