From 2609cc2e3bf2bbad9f86a10f752e6708e9e0e071 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Fri, 4 Aug 2023 15:35:18 +0800
Subject: [PATCH] updates

---
 .../modules/api/controller/ApiController.java      |  9 ---------
 .../jeecg/modules/ocr/init/HandleTransInit.java    |  4 ++++
 .../ocr/service/impl/OcrIdentifyServiceImpl.java   |  8 +++++++-
 .../modules/ocr/service/impl/TaskService.java      | 14 ++++----------
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java
index 0e94edd..f17649d 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java
@@ -198,15 +198,6 @@ public class ApiController {
         return JSONObject.parseObject("{\"requestId\":\"10001\",\"result\":{\"retrieveReviewCompliance\":\"80\",\"imageTagRetrievePercentage\":\"66.6\",\"failureReason\":\"图片不清晰\"}}");
     }
     //==========================================================================================
-    @ApiOperation(value = "刷新为完成的任务", notes = "任务完结通知")
-    @GetMapping("/test")
-    public Result test(){
-        JSONObject jsonObject=new JSONObject();
-        for (int i = 0; i < 100; i++) {
-        }
-        return Result.OK("111");
-    }
-
 
     @ApiOperation(value = "刷新为完成的任务", notes = "任务完结通知")
     @GetMapping("/restartTask")
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/init/HandleTransInit.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/init/HandleTransInit.java
index 7fd42f3..02d2e6e 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/init/HandleTransInit.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/init/HandleTransInit.java
@@ -36,6 +36,10 @@ public class HandleTransInit implements ApplicationRunner {
     TaskService taskService;
     @Resource
     IOcrIdentifyService ocrIdentifyService;
+
+    public static void main(String[] args) {
+
+    }
     /**
      * 处理转账数据
      *
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 bae024f..29e3ab6 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
@@ -245,12 +245,18 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
         updateWrapper.set(OcrIdentify::getEndTime, new Date());
         updateWrapper.set(OcrIdentify::getStatus, "1");
         super.update(updateWrapper);
-        //this.callbackWly(id);
+        this.callbackWly(id);
+        System.out.println("已通过一条！");
     }
 
     @Override
     @Async
     public void callbackWly(String ocrIdentifyId){
+        try {
+            Thread.sleep(10000l);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
         LambdaUpdateWrapper<OcrIdentify> updateWrapper = new LambdaUpdateWrapper<OcrIdentify>();
         updateWrapper.eq(OcrIdentify::getId, ocrIdentifyId);
         long time = new Date().getTime();
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/TaskService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/TaskService.java
index ba4d14d..2dbeda7 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/TaskService.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/TaskService.java
@@ -40,17 +40,10 @@ public class TaskService {
         //拼接子任务id
         String taskId = null;
         StringBuffer task_master = new StringBuffer();
-        for (int i = 0; i < identifyUrlList.size(); i++) {
-            taskId = String.format(id + "_" + (i + 1));
-            task_master.append(taskId).append(",");
-        }
-
-        //执行子任务.
-        JSONObject requestBody = new JSONObject();
-        TaskModel taskModel = new TaskModel();
         if (identifyUrlList.size()>0) {
-            redisUtil.set("identify_" + id, task_master.toString());
+            TaskModel taskModel = new TaskModel();
             for (int i = 0; i < identifyUrlList.size(); i++) {
+                taskId = String.format(id + "_" + (i + 1));
                 identifyUrl = identifyUrlList.get(i);
                 taskModel.setTaskId(taskId);
                 taskModel.setTaskType("identify");
@@ -59,9 +52,10 @@ public class TaskService {
                 taskModel.setParameter(id + "," + taskId + "," + identifyUrl);
                 //保存子任务
                 saveTask(taskModel);
+                task_master.append(taskId).append(",");
             }
+            redisUtil.set("identify_" + id, task_master.toString());
         }
-
     }
 
     public Result saveTask(TaskModel taskModel) {