From 950ac308df2cb2eb3907c8db933929cc1726478a Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Sun, 31 Mar 2024 13:35:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=9F=A5=E9=87=8D?=
 =?UTF-8?q?=E6=97=B6=E5=9B=A0=E4=B8=BA=E6=9F=90=E5=BC=A0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=B8=8B=E8=BD=BD=E5=88=B0=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=9F=A5=E9=87=8D=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OcrCheckDuplicateServiceImpl.java    | 36 +++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java
index 3f60c2be..cf6c2c00 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java
@@ -33,6 +33,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -104,6 +106,12 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
                         checkDuplicateService.comparePictureResultSave(ocrPictureList, sysUser, id);
                         checkDuplicate.setStatus(2);
                     } catch (Exception e) {
+                        StringWriter sw = new StringWriter();
+                        PrintWriter pw = new PrintWriter(sw);
+                        e.printStackTrace(pw);
+                        String exceptionDetails = sw.toString(); // 包含堆栈跟踪信息的字符串
+                        logger.error(exceptionDetails);
+                        logger.error("异步执行图片比对异常:", e);
                         logger.error("异步执行图片比对异常:", e.getMessage());
                         checkDuplicate.setStatus(3);
                     } finally {
@@ -182,7 +190,15 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
 
                 logService.addLog(103, "AI获取图片相似度接口", sysUser, "sendParams");
                 if (org.apache.commons.lang3.StringUtils.isBlank(ocrPicture.getImgHash())) {
-                    Map<String, String> map = this.getOcrPictureClassifyAndHash(ocrPicture.getLocalpictrueurl());
+                    String url = ocrPicture.getLocalpictrueurl();
+                    if(StringUtils.isBlank(url)){
+                        if(StringUtils.isBlank(ocrPicture.getImgurl())){
+                            continue;
+                        }
+                        url = ocrPicture.getImgurl();
+                    }
+
+                    Map<String, String> map = this.getOcrPictureClassifyAndHash(url);
                     if (map != null) {
                         ocrPicture.setImgHash(map.get("hash"));
                         ocrPicture.setClassificationid(map.get("classId"));
@@ -203,7 +219,15 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
                     //分类不一致的也不需要进行比对
                     //TODO 接口请求判断重复情况
                     if (org.apache.commons.lang3.StringUtils.isBlank(ocrPictureNext.getImgHash())) {
-                        Map<String, String> map = this.getOcrPictureClassifyAndHash(ocrPictureNext.getLocalpictrueurl());
+                        logger.info("图片没有hash值，进入分类并获取hash接口:{}",JSONObject.toJSON(ocrPictureNext));
+                        String url = ocrPictureNext.getLocalpictrueurl();
+                        if(StringUtils.isBlank(url)){
+                            if(StringUtils.isBlank(ocrPictureNext.getImgurl())){
+                                continue;
+                            }
+                            url = ocrPictureNext.getImgurl();
+                        }
+                        Map<String, String> map = this.getOcrPictureClassifyAndHash(url);
                         if (map != null) {
                             ocrPictureNext.setImgHash(map.get("hash"));
                             ocrPictureNext.setClassificationid(map.get("classId"));
@@ -247,18 +271,26 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
             }
 
         }
+        logger.info("查重任务:{},开启创建任务",checkDuplicateId);
         if (CollectionUtils.isNotEmpty(ocrPictureList)) {
             ocrTaskchildPictureService.createTask(ocrPictureList, ocrPictureList.get(0).getTenantId().toString(), sysUser);
         }
+        logger.info("查重任务:{},结束创建任务",checkDuplicateId);
         //批量入库
+        logger.info("查重任务:{},开启批量入库任务",checkDuplicateId);
         boolean b = checkDuplicateResultService.saveOrUpdateBatch(saveList);
         if (!b) {
             throw new Exception("批量入库比对结果失败!");
         }
+        logger.info("查重任务:{},结束批量入库任务",checkDuplicateId);
         //开始更新图片最高阈值
+        logger.info("查重任务:{},更新最高阈值",checkDuplicateId);
         this.updatePictureSimilarityScore(saveList);
+        logger.info("查重任务:{},结束更新最高阈值",checkDuplicateId);
         //开始更新 图片历史比对数据结果
+        logger.info("查重任务:{},更新图片历史比对结果",checkDuplicateId);
         this.updateCompareToPictureDuplicateHis(saveList);
+        logger.info("查重任务:{},结束图片历史比对结果",checkDuplicateId);
     }
 
     @Override