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 map = this.getOcrPictureClassifyAndHash(ocrPicture.getLocalpictrueurl()); + String url = ocrPicture.getLocalpictrueurl(); + if(StringUtils.isBlank(url)){ + if(StringUtils.isBlank(ocrPicture.getImgurl())){ + continue; + } + url = ocrPicture.getImgurl(); + } + + Map 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 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 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