From d519ba7f2d6a04556a36f8cb03918548e04e5c7c Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Mon, 18 Sep 2023 21:04:26 +0800
Subject: [PATCH] =?UTF-8?q?updates=20=E5=9B=9E=E4=BC=A0=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ocr/utils/CallBackWlyUtils.java    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/CallBackWlyUtils.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/CallBackWlyUtils.java
index 97a79d0..680877b 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/CallBackWlyUtils.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/CallBackWlyUtils.java
@@ -32,14 +32,14 @@ public class CallBackWlyUtils {
         //请求对象
         CallBackWlyResult result = new CallBackWlyResult();
 
-        List<JSONObject> taskResultInfoList=null;
+        List<JSONObject> jsonObjects=new ArrayList<>();
         //总明细数量
         int detail_detailCount = 0;
         int detailValidationCount=0;
         String taskResultInfo = ocrIdentify.getTaskResultInfo();
         if (StringUtils.isNotBlank(taskResultInfo)) {
             //循环获取哪些字段通过了
-            taskResultInfoList = JSONArray.parseArray(taskResultInfo).toJavaList(JSONObject.class);
+            List<JSONObject> taskResultInfoList = JSONArray.parseArray(taskResultInfo).toJavaList(JSONObject.class);
             detail_detailCount=taskResultInfoList.size();
             for (JSONObject jsonObject : taskResultInfoList) {
                 Boolean ruleValidation = (Boolean) jsonObject.getOrDefault("ruleValidation", false);
@@ -50,6 +50,16 @@ public class CallBackWlyUtils {
             }
         }
 
+        for (OcrIdentifyDetail identifyDetail : identifyDetails) {
+            if (StringUtils.isNotBlank(identifyDetail.getDataStructured())) {
+                List<JSONObject> jsonObjects1 = JSONArray.parseArray(identifyDetail.getDataStructured()).toJavaList(JSONObject.class);
+                if (CollectionUtils.isNotEmpty(jsonObjects1)) {
+                    jsonObjects.addAll(jsonObjects1);
+                }
+            }
+        }
+
+
         //组装回调参数
         //成功率
         double imageTagRetrievePercentage = 0.0d;
@@ -65,10 +75,10 @@ public class CallBackWlyUtils {
         result.setImageTagRetrievePercentage(imageTagRetrievePercentage + "");
         result.setRetrieveReviewCompliance(imageTagRetrievePercentage+"");
         result.setFailureReason(ocrIdentify.getErrorMsg());
-        if (CollectionUtils.isEmpty(taskResultInfoList)) {
+        if (CollectionUtils.isEmpty(jsonObjects)) {
             return false;
         }
-        result.setOcrResult(taskResultInfoList);
+        result.setOcrResult(jsonObjects);
 
         log.info("请求无量云回调接口");
         JSONObject semanticResponseJson = null;