diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java index 420578bb..63920804 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java @@ -329,7 +329,11 @@ public class OcrPictureController extends BaseController { IPage pageList = ocrPictureService.page(page, queryWrapper); List ocrPictures = pageList.getRecords(); List ocrPicturesNew = new ArrayList<>(); + + Map> completeSimilarGroupMap = ocrPictures.stream().filter(s->Objects.nonNull(s.getCompleteSimilarGroupId())).collect(Collectors.groupingBy(OcrPicture::getCompleteSimilarGroupId)); + for (OcrPicture ocrPictureOne : ocrPictures) { + filterScoreNoGroup(ocrPictureOne,completeSimilarGroupMap); LambdaQueryWrapper ocrTaskchildPictureLambdaQueryWrapper = new LambdaQueryWrapper<>(); ocrTaskchildPictureLambdaQueryWrapper.eq(OcrTaskchildPicture::getPictureid, ocrPictureOne.getId()); OcrTaskchildPicture ocrTaskchildPicture = ocrTaskchildPictureService.getOne(ocrTaskchildPictureLambdaQueryWrapper); @@ -357,6 +361,13 @@ public class OcrPictureController extends BaseController { return ResultVoUtil.success(pageList); } + private void filterScoreNoGroup(OcrPicture ocrPictureOne,Map> completeSimilarGroupMap){ + //过滤阈值为100的,但是没有对应分类的图片 + if(Objects.nonNull(ocrPictureOne.getSimilarityscore())&&ocrPictureOne.getSimilarityscore()==100&&Objects.nonNull(ocrPictureOne.getCompleteSimilarGroupId())&&completeSimilarGroupMap.get(ocrPictureOne.getCompleteSimilarGroupId()).size()>1){ + ocrPictureOne.setSimilarityscore(0); + ocrPictureOne.setIsRepeat(1); + } + } /** * 分页列表查询 * diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java index 317dcfd9..0f2cc342 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java @@ -95,15 +95,15 @@ public class ImageClassUtil { JSONObject jsonObjectSimi = JSON.parseObject(responseDataVi); if (null != jsonObjectSimi && jsonObjectSimi.getString("code").equals("0") && jsonObjectSimi.get("data") != null && jsonObjectSimi.getJSONArray("data").size() > 0) { ocrPictureLog.setCallStatus("1"); - ocrPictureLog.setCallMsg(responseDataVi); + ocrPictureLog.setCallMsg("req:"+jsonObjectVi.toJSONString()+"\nrep:"+responseDataVi); } else { ocrPictureLog.setCallStatus("2"); - ocrPictureLog.setCallMsg(responseDataVi); + ocrPictureLog.setCallMsg("req:"+jsonObjectVi.toJSONString()+"\nrep:"+responseDataVi); } } catch (Exception e) { logger.error("classify={}", e); ocrPictureLog.setCallStatus("3"); - ocrPictureLog.setCallMsg(responseDataVi+"Exception:"+e.getMessage()); + ocrPictureLog.setCallMsg("req:"+jsonObjectVi.toJSONString()+"\nrep:"+responseDataVi+"Exception:"+e.getMessage()); } finally { ApplicationContext applicationContext = SpringUtil.getApplicationContext(); OcrPictureLogService ocrPictureLogService = applicationContext.getBean(OcrPictureLogService.class);