diff --git a/src/main/java/com/supervision/police/controller/OCRRecordController.java b/src/main/java/com/supervision/police/controller/OCRRecordController.java index 45daa9c..1283044 100644 --- a/src/main/java/com/supervision/police/controller/OCRRecordController.java +++ b/src/main/java/com/supervision/police/controller/OCRRecordController.java @@ -84,9 +84,15 @@ public class OCRRecordController { * @return */ @GetMapping("/submitTask") - public R submitRecordTask(String recordId) { + public R submitRecordTask(@RequestParam("recordId") String recordId) { Boolean success = ocrRecordService.submitRecordTask(recordId); return R.ok(success); } + @GetMapping("/deleteFile") + public R deleteFile(@RequestParam("recordId") String recordId ,@RequestParam("fileId") String fileId) { + Boolean success = ocrRecordService.deleteFile(recordId,fileId); + return R.ok(success); + } + } diff --git a/src/main/java/com/supervision/police/service/OCRRecordService.java b/src/main/java/com/supervision/police/service/OCRRecordService.java index 58b6092..e7b2c1a 100644 --- a/src/main/java/com/supervision/police/service/OCRRecordService.java +++ b/src/main/java/com/supervision/police/service/OCRRecordService.java @@ -22,4 +22,6 @@ public interface OCRRecordService { Boolean reOcr(String ocrId); Boolean submitRecordTask(String recordId); + + Boolean deleteFile(String recordId,String fileId); } diff --git a/src/main/java/com/supervision/police/service/impl/OCRRecordServiceImpl.java b/src/main/java/com/supervision/police/service/impl/OCRRecordServiceImpl.java index c9582c2..46c14a3 100644 --- a/src/main/java/com/supervision/police/service/impl/OCRRecordServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/OCRRecordServiceImpl.java @@ -150,6 +150,30 @@ public class OCRRecordServiceImpl implements OCRRecordService { return true; } + @Override + public Boolean deleteFile(String recordId, String fileId) { + + Assert.notEmpty(recordId, "recordId不能为空"); + if (StrUtil.isEmpty(fileId)){ + return false; + } + + NoteRecord noteRecord = noteRecordService.getById(recordId); + Assert.notNull(noteRecord, "recordId:{}对应的笔录信息不存在", recordId); + + String fileIds = noteRecord.getFileIds(); + if (StrUtil.isEmpty(fileIds)){ + return true; + } + + String fileIdJoin = Arrays.stream(fileIds.split(",")) + .filter(id -> !id.equals(fileId)).collect(Collectors.joining(",")); + noteRecordService.lambdaUpdate().set(NoteRecord::getFileIds, fileIdJoin).eq(NoteRecord::getId, recordId).update(); + + return true; + } + + public List batchSaveRecordSplit(NoteRecord noteRecord, RecordFileDTO recordFileDTO) { String ocrText = recordFileDTO.getOcrText();