diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrCheckDuplicateResult.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrCheckDuplicateResult.java index 0dba40bc..fef242f0 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrCheckDuplicateResult.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrCheckDuplicateResult.java @@ -54,4 +54,8 @@ public class OcrCheckDuplicateResult implements Serializable { @ApiModelProperty(value = "阈值分组排序值,数值越低排序越靠前,") private Integer similarityGroupOrder; + @ApiModelProperty(value = "是否重复,0.不重复 1.重复 (历史比对中阈值存在100的会显示此值)") + @TableField(exist = false) + private Integer isRepeat; + } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java index f1aef307..a48cba8a 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java @@ -346,6 +346,10 @@ public class OcrPicture implements BaseDto, java.io.Serializable { @TableField(value = "submit_date_timestamp") private Long submitDateTimestamp; + @ApiModelProperty(value = "是否重复,0.不重复 1.重复 (历史比对中阈值存在100的会显示此值)") + @TableField(value = "is_repeat") + private Integer isRepeat; + @ApiModelProperty(value = "任务状态") @TableField(exist = false) private Integer states; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java index e642345c..2330f05d 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java @@ -195,4 +195,7 @@ public class OcrTaskchildPictureAppro implements java.io.Serializable { @ApiModelProperty(value = "提交时间") private Long finishTime; + @ApiModelProperty(value = "是否重复") + private Integer isRepeat; + } 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 dfa6beef..7f69cbcb 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 @@ -286,6 +286,12 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl saveList) throws Exception { List updateList = new ArrayList<>(); + List updateList1 = new ArrayList<>(); for (OcrCheckDuplicateResult ocrCheckDuplicateResult : saveList) { OcrPicture picture = pictureService.selectDtoById(ocrCheckDuplicateResult.getPictureId()); OcrPicture ocrPicture = new OcrPicture(); + if(ocrCheckDuplicateResult.getIsRepeat()==1){ + OcrPicture ocrPicture1 = new OcrPicture(); + if(picture.getIsRepeat() == null || picture.getIsRepeat() != 1){ + ocrPicture1.setId(picture.getId()); + ocrPicture1.setIsRepeat(1); + updateList1.add(ocrPicture1); + } + } + pictureService.updateBatchById(updateList1); //如果当前图片没有历史阈值,直接更新上阈值 if (picture.getSimilarityscore() == null) { ocrPicture.setId(picture.getId()); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java index b6e1472b..a65dbec1 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java @@ -138,7 +138,11 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl