Merge remote-tracking branch 'origin/master'

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/init/HandleTaskInit.java

@@ -88,6 +88,10 @@ public class HandleTaskInit implements ApplicationRunner {
                 String image;//图片
                 //执行获取到的任务
                 identifyFor: for (OcrIdentify ocrIdentify : list) {
+                    //过滤不需要的任务批次
+                    if(ocrIdentify.getRequestId().contains("c1b1f298e7ab4ba59103081e55f9cd01")){
+                        continue;
+                    }
                     image=null;
                     fileList=new ArrayList<>();
                     //识别的图片路径

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java

@@ -1480,17 +1480,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) {
-                //取第一个任务
+                for (int i = 0; i < 4; i++) {
-                TaskModel taskModel = waitingTaskList.get(0);
+                    if (i>waitingTaskList.size()-1){
-                waitingTaskList.get(0).setTaskStatus("1");
+                        continue;
-                //刷新redis，执行中
+                    }
-                flushTask(taskModel.getTaskId(), 1);
+                    //取第一个任务
-                //执行
+                    TaskModel taskModel = waitingTaskList.get(i);
-                executeTaskp(taskModel);
+                    waitingTaskList.get(i).setTaskStatus("1");
-                //刷新已知任务
+                    //刷新redis，执行中
-                taskList = getTaskList();
+                    flushTask(taskModel.getTaskId(), 1);
-                //刷新待运行任务
+                    //执行
-                waitingTaskList = taskList.stream().filter(t -> t.getTaskStatus().equals("0")).collect(Collectors.toList());
+                    executeTaskp(taskModel);
+                    //刷新已知任务
+                    taskList = getTaskList();
+                    //刷新待运行任务
+                    waitingTaskList = taskList.stream().filter(t -> t.getTaskStatus().equals("0")).collect(Collectors.toList());
+                }
             }
         }
         log.error("任务已全部执行");

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -299,5 +299,6 @@ third-app:
 system:
   project:
     env: customer_test
-    enableHandleTask: false
+    enableHandleTask: true
     fileReviewUrlPrefix: http://47.103.213.109:8072/files
+    wlyCallback: https://hyycsozs.prevailcloud.com/api/task/image/ocr/callback