|
|
@ -561,21 +561,21 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ocrPictureDuplicateHisService.remove(new LambdaQueryWrapper<OcrPictureDuplicateHis>().eq(OcrPictureDuplicateHis::getPictureId, id));
|
|
|
|
ocrPictureDuplicateHisService.remove(new LambdaQueryWrapper<OcrPictureDuplicateHis>().eq(OcrPictureDuplicateHis::getPictureId, id));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//查重结果
|
|
|
|
//删除任务包,查重结果
|
|
|
|
OcrCheckDuplicateResult duplicateResult = ocrCheckDuplicateResultService.getOne(new LambdaQueryWrapper<OcrCheckDuplicateResult>().eq(OcrCheckDuplicateResult::getPictureId, id));
|
|
|
|
// OcrCheckDuplicateResult duplicateResult = ocrCheckDuplicateResultService.getOne(new LambdaQueryWrapper<OcrCheckDuplicateResult>().eq(OcrCheckDuplicateResult::getPictureId, id));
|
|
|
|
String compareResultJson = duplicateResult.getCompareResultJson();
|
|
|
|
// String compareResultJson = duplicateResult.getCompareResultJson();
|
|
|
|
if (StringUtils.isNotBlank(compareResultJson)) {
|
|
|
|
// if (StringUtils.isNotBlank(compareResultJson)) {
|
|
|
|
JSONObject jsonObject = JSON.parseObject(compareResultJson);
|
|
|
|
// JSONObject jsonObject = JSON.parseObject(compareResultJson);
|
|
|
|
Set<String> keyList = jsonObject.keySet();
|
|
|
|
// Set<String> keyList = jsonObject.keySet();
|
|
|
|
List<OcrCheckDuplicateResult> list = ocrCheckDuplicateResultService.list(new LambdaQueryWrapper<OcrCheckDuplicateResult>().in(OcrCheckDuplicateResult::getPictureId, keyList));
|
|
|
|
// List<OcrCheckDuplicateResult> list = ocrCheckDuplicateResultService.list(new LambdaQueryWrapper<OcrCheckDuplicateResult>().in(OcrCheckDuplicateResult::getPictureId, keyList));
|
|
|
|
for (OcrCheckDuplicateResult checkDuplicateResult : list) {
|
|
|
|
// for (OcrCheckDuplicateResult checkDuplicateResult : list) {
|
|
|
|
String resultCompareResultJson = checkDuplicateResult.getCompareResultJson();
|
|
|
|
// String resultCompareResultJson = checkDuplicateResult.getCompareResultJson();
|
|
|
|
JSONObject json = JSON.parseObject(resultCompareResultJson);
|
|
|
|
// JSONObject json = JSON.parseObject(resultCompareResultJson);
|
|
|
|
json.remove(id.toString());
|
|
|
|
// json.remove(id.toString());
|
|
|
|
checkDuplicateResult.setCompareResultJson(JSON.toJSONString(json));
|
|
|
|
// checkDuplicateResult.setCompareResultJson(JSON.toJSONString(json));
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
ocrCheckDuplicateResultService.updateBatchById(list);
|
|
|
|
// ocrCheckDuplicateResultService.updateBatchById(list);
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
ocrCheckDuplicateResultService.remove(new LambdaQueryWrapper<OcrCheckDuplicateResult>().eq(OcrCheckDuplicateResult::getPictureId, id));
|
|
|
|
ocrCheckDuplicateResultService.remove(new LambdaQueryWrapper<OcrCheckDuplicateResult>().eq(OcrCheckDuplicateResult::getPictureId, id));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|