From 6083a85e34b7e60cf2a2afd5460ea387a556fa5d Mon Sep 17 00:00:00 2001
From: LiZhong <LZ020316@yeah.net>
Date: Mon, 22 Jan 2024 15:17:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1=E5=B9=B6?=
 =?UTF-8?q?=E5=8F=91=E6=89=A7=E8=A1=8C=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OcrIdentifyServiceImpl.java  | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
index ecd4f76..e24c336 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
@@ -966,17 +966,22 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
         List<TaskModel> waitingTaskList = taskList.stream().filter(t -> t.getTaskStatus().equals("0")).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(waitingTaskList)) {
             while (waitingTaskList.size() > 0) {
-                //取第一个任务
-                TaskModel taskModel = waitingTaskList.get(0);
-                waitingTaskList.get(0).setTaskStatus("1");
-                //刷新redis，执行中
-                flushTask(taskModel.getTaskId(), 1);
-                //执行
-                executeTaskp(taskModel);
-                //刷新已知任务
-                taskList = getTaskList();
-                //刷新待运行任务
-                waitingTaskList = taskList.stream().filter(t -> t.getTaskStatus().equals("0")).collect(Collectors.toList());
+                for (int i = 0; i < 4; i++) {
+                    if (i>waitingTaskList.size()-1){
+                        continue;
+                    }
+                    //取第一个任务
+                    TaskModel taskModel = waitingTaskList.get(i);
+                    waitingTaskList.get(i).setTaskStatus("1");
+                    //刷新redis，执行中
+                    flushTask(taskModel.getTaskId(), 1);
+                    //执行
+                    executeTaskp(taskModel);
+                    //刷新已知任务
+                    taskList = getTaskList();
+                    //刷新待运行任务
+                    waitingTaskList = taskList.stream().filter(t -> t.getTaskStatus().equals("0")).collect(Collectors.toList());
+                }
             }
         }
         log.error("任务已全部执行");