diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrCheckDuplicateController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrCheckDuplicateController.java index 8828f0d6..4f4b9dcd 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrCheckDuplicateController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrCheckDuplicateController.java @@ -84,6 +84,7 @@ public class OcrCheckDuplicateController { queryWrapper.eq("tenant_id", tenantId); queryWrapper.eq("suspiciousfile", "0"); + queryWrapper.orderBy(true,true,"submit_date_timestamp"); List pageList = ocrPictureService.listPage(queryWrapper); if (null != pageList && !pageList.isEmpty()) { if (pageList.size() == 1) { 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 e3a1eae7..e67df8d6 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 @@ -16,7 +16,7 @@ import lombok.experimental.Accessors; /** *

- * + * *

* * @author author @@ -50,5 +50,7 @@ public class OcrCheckDuplicateResult implements Serializable { @ApiModelProperty(value = "当前图片在当前任务包下比对最高阈值") private Double maxSimilarity; + @ApiModelProperty(value = "阈值分组排序值,数值越低排序越靠前,") + private Integer similarityGroupOrder; } 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 cf6c2c00..1e8f8bd1 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 @@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.databind.ObjectMapper; +import io.swagger.annotations.ApiModelProperty; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; @@ -184,7 +185,10 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl similarityGroupOrderMap = new HashMap<>(); //1.开启比对任务 for (OcrPicture ocrPicture : ocrPictureList) { @@ -247,12 +251,27 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl - order by t1.max_similarity ${oderType},t2.submit_date_timestamp ${oderType} + order by t1.max_similarity ${oderType},t1.similarity_group_order asc,t2.submit_date_timestamp ${oderType} order by t2.create_time ${oderType}