From e012fc5cf1db67ff97dfded86fffbc63744ab6ce Mon Sep 17 00:00:00 2001 From: sige Date: Fri, 19 Apr 2024 14:27:26 +0800 Subject: [PATCH] ~ --- app.db | Bin 385024 -> 385024 bytes .../com/iflytop/digester/DigestionTaskThread.java | 76 +++++++++------------ 2 files changed, 32 insertions(+), 44 deletions(-) diff --git a/app.db b/app.db index ad3a744a27cba04eab47d0d393584854c63c38c4..6f192366839c372a7af53fc916a3c1f0a9ed048e 100644 GIT binary patch delta 13977 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 delta 21653 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 Lpc7Jn_qYB(=fm)& diff --git a/src/main/java/com/iflytop/digester/DigestionTaskThread.java b/src/main/java/com/iflytop/digester/DigestionTaskThread.java index db88389..8c4cbf2 100644 --- a/src/main/java/com/iflytop/digester/DigestionTaskThread.java +++ b/src/main/java/com/iflytop/digester/DigestionTaskThread.java @@ -108,17 +108,16 @@ public class DigestionTaskThread extends Thread { lastRound = rounds.remove(rounds.size() - 1); } -// // 执行第一轮 -// if ( null != firstRound ) { -// this.updateTaskStatus("FirstRound", "执行第一轮配置"); -// this.executeRound(firstRound); -// } -// // 执行中间轮 -// for (var round : rounds) { -// this.executeRound(round); -// } - // 执行最后一轮 - if ( null != lastRound ) { + if ( null != firstRound ) { // 执行第一轮 + this.updateTaskStatus("FirstRound", "执行第一轮配置"); + this.executeRound(firstRound); + } + for ( int i=0; i