From 3c7b41abae19fd5c458d82fc967755e7333d46dd Mon Sep 17 00:00:00 2001
From: DELL <haox0404@outlook.com>
Date: Fri, 12 Apr 2024 18:32:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:ai=E7=BB=9F=E8=AE=A1=E5=BC=B9=E7=AA=97-?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=9B=BE=E7=89=87=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/dataobject/OcrCheckDuplicateResult.java  |  4 ++++
 .../jyjz/xiaoyao/ocr/dataobject/OcrPicture.java  |  4 ++++
 .../ocr/dataobject/OcrTaskchildPictureAppro.java |  3 +++
 .../impl/OcrCheckDuplicateServiceImpl.java       | 16 ++++++++++++++++
 .../impl/OcrSearchHistoryServiceImpl.java        |  5 +++++
 .../mapper/oa/OcrTaskchildPictureMapper.xml      |  6 ++++--
 6 files changed, 36 insertions(+), 2 deletions(-)

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<OcrCheckDuplicateM
                 OcrCheckDuplicateResult ocrCheckDuplicateResult = new OcrCheckDuplicateResult();
                 ocrCheckDuplicateResult.setPictureId(ocrPicture.getId());
                 ocrCheckDuplicateResult.setMaxSimilarity(maxSimilarity.doubleValue());
+                BigDecimal b3 = new BigDecimal("100");
+                if (maxSimilarity.compareTo(b3)==0) {
+                    ocrCheckDuplicateResult.setIsRepeat(1);
+                }else {
+                    ocrCheckDuplicateResult.setIsRepeat(0);
+                }
                 ocrCheckDuplicateResult.setCompareResultJson(JSONObject.toJSONString(resultMap));
                 ocrCheckDuplicateResult.setCheckDuplicateId(checkDuplicateId);
                 if(similarityGroupOrderMap.get(ocrPicture.getId().toString())!=null){
@@ -370,9 +376,19 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
      */
     private boolean updatePictureSimilarityScore(List<OcrCheckDuplicateResult> saveList) throws Exception {
         List<OcrPicture> updateList = new ArrayList<>();
+        List<OcrPicture> 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<OcrSearchHistoryMap
             int pendingApprovalCount = 0; // 待审批的数量
             int approvedCount = 0; // 通过的数量
             int notGoCount = 0; // 不通过的数量
+            int repeat = 0; // 重复数量
             for (OcrTaskchildPictureAppro ocrTaskchildPictureAppro : ocrTaskchildPictureApproList) {
+                if(ocrTaskchildPictureAppro.getIsRepeat() != null && ocrTaskchildPictureAppro.getIsRepeat() == 1){
+                    repeat++;
+                }
                 if (ocrTaskchildPictureAppro.getStatshis() != null) {
                     switch (ocrTaskchildPictureAppro.getStatshis()) {
                         case 1:
@@ -163,6 +167,7 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
             counts.put("total", approvedCount + pendingApprovalCount + notGoCount);
             counts.put("treat", pendingApprovalCount);
             counts.put("approvedCount", approvedCount+notGoCount);
+            counts.put("repeat", repeat);
             resultVo.setCode("OK");
             resultVo.setMessage("成功");
             resultVo.setData(counts);
diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
index 0f59d997..5d3a0d46 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
@@ -635,7 +635,8 @@
         uf.TASKNO,
 
                op.field6 as fromCustomerLevel,
-               op.releaseArea as fromCity
+               op.releaseArea as fromCity,
+               op.is_repeat
         from ocr_taskchild_picture tc
         LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID
         left join ocr_picture op on tc.PICTUREID = op.ID
@@ -658,7 +659,8 @@
         uf.TASKNO,
 
                op.field6 as fromCustomerLevel,
-               op.releaseArea as fromCity
+               op.releaseArea as fromCity,
+               op.is_repeat
         from ocr_taskchild_picture tc,
         OA_USERAPPROVE_T uf,
         ocr_picture op