fix: 解决取消查重任务线程不停止,可以文件夹没有含有缩略图问题

pull/157/head
shuliYao 1 year ago
parent 7b44e6778e
commit 0f78a00c44

@ -189,8 +189,13 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
int similarityGroupOrder = 1; int similarityGroupOrder = 1;
//阈值分组map //阈值分组map
Map<String,Integer> similarityGroupOrderMap = new HashMap<>(); Map<String,Integer> similarityGroupOrderMap = new HashMap<>();
//1.开启比对任务 //1.开启比对任务s
for (OcrPicture ocrPicture : ocrPictureList) { for (OcrPicture ocrPicture : ocrPictureList) {
//检查查重任务是否关闭
if(!this.isCheckDuplicateExist(checkDuplicateId)){
logger.info("查重任务,已取消!");
return;
}
// 添加相似度百分百分组id // 添加相似度百分百分组id
if (ObjectUtils.isEmpty(ocrPicture.getCompleteSimilarGroupId())) { if (ObjectUtils.isEmpty(ocrPicture.getCompleteSimilarGroupId())) {
@ -330,6 +335,14 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
} }
private boolean isCheckDuplicateExist(Long checkDuplicateId) {
OcrCheckDuplicate checkDuplicate = baseMapper.selectById(checkDuplicateId);
if(checkDuplicate!=null && checkDuplicate.getIsDelete()!=1){
return true;
}
return false;
}
/** /**
* *
* @return * @return

@ -986,6 +986,7 @@
t2.FROMPROJECTNAME fromProjectName, t2.FROMPROJECTNAME fromProjectName,
t2.FINISHTIME finishTime, t2.FINISHTIME finishTime,
t1.imgUrl, t1.imgUrl,
t1.server_thumbnail_url serverThumbnailUrl,
ifnull(t3.STATSHIS, 1) historyStates, ifnull(t3.STATSHIS, 1) historyStates,
t1.submit_date_timestamp submitDateTimestamp, t1.submit_date_timestamp submitDateTimestamp,
t1.photo_date_timestamp photoDateTimestamp, t1.photo_date_timestamp photoDateTimestamp,

Loading…
Cancel
Save