From 3a41bd5e0ee47db5dff95489bc20f8ad88ca29a6 Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Tue, 5 Sep 2023 15:14:40 +0800 Subject: [PATCH] updates --- .../modules/ocr/service/impl/OcrIdentifyServiceImpl.java | 7 +++++-- .../java/org/jeecg/modules/ocr/utils/CallBackWlyUtils.java | 3 ++- 2 files changed, 7 insertions(+), 3 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 c2e53be..5cc0bf6 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 @@ -891,12 +891,15 @@ public class OcrIdentifyServiceImpl extends ServiceImpl!o).count(); //long count = ocrResultDTOList.stream().filter(o -> !o.getRuleValidation()).count(); responseBody.put("taskResult",count>0?0:1);//匹配成功或失败 - List haveRateTagList = ocrResultDTOList.stream().filter(o -> o.getTextRate() > 0).map(OcrResultDTO::getTag).collect(Collectors.toList()); + Set haveRateTagList = ocrResultDTOList.stream().filter(o -> o.getTextRate() > 0).map(OcrResultDTO::getTag).collect(Collectors.toSet()); List newResultDTOList=new ArrayList<>(); //过滤掉0的值 + for (OcrResultDTO o : ocrResultDTOList) { if (haveRateTagList.contains(o.getTag())) { - newResultDTOList.addAll(ocrResultDTOList.stream().filter(oo -> o.getTag().equals(oo.getTag()) && o.getTextRate() > 0).collect(Collectors.toList())); + if (o.getTextRate()>0) { + newResultDTOList.add(o); + } }else{ newResultDTOList.add(o); } 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 0427b46..1fa8332 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 @@ -2,6 +2,7 @@ package org.jeecg.modules.ocr.utils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.serializer.SerializerFeature; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -76,7 +77,7 @@ public class CallBackWlyUtils { System.out.println("============================================="); System.out.println(JSONObject.toJSONString(callBackWlyRequestBody)); System.out.println("============================================="); - semanticResponseJson = RestUtil.post("https://192.168.1.21:8686/api/task/image/ocr/callback", JSONObject.parseObject(JSONObject.toJSONString(callBackWlyRequestBody))); + semanticResponseJson = RestUtil.post("https://192.168.1.21:8686/api/task/image/ocr/callback", JSONObject.parseObject(JSONObject.toJSONString(callBackWlyRequestBody, SerializerFeature.WriteNullStringAsEmpty))); } catch (org.springframework.web.client.ResourceAccessException e) { log.error("请求无量云回调接口失败-拒绝连接 (Connection refused)"); log.error(e.getMessage());