1. ocr 功能接口联调调整

src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java

@@ -294,12 +294,13 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
         List<CaseTaskRecord> taskList = caseTaskRecordService.lambdaQuery().eq(CaseTaskRecord::getCaseId, noteRecord.getCaseId()).list();
         Map<String, CaseTaskRecord> taskRecordMap = taskList.stream().collect(Collectors.toMap(CaseTaskRecord::getRecordId, Function.identity(), (k1, k2) -> k1));
 
-        List<RecordFileDTO> recordFileDTOS = fileOcrProcessService.queryFileList(fileIdList);
+        List<RecordFileDTO> recordFileDTOS = fileOcrProcessService.queryFileList(fileIdList)
+                .stream().filter(file->StrUtil.isEmpty(file.getOcrId())).toList();
         setRecordDetailSerialNumber(noteRecordDetailDTOList);
         for (NoteRecordDetailDTO recordDetailDTO : noteRecordDetailDTOList) {
             // 获取文件的文件名称
             Set<String> fileNameSet = recordDetailDTO.getFileList().stream().map(NoteRecordFileDTO::getFileName).collect(Collectors.toSet());
-            if (StrUtil.isEmpty(recordDetailDTO.getConfessionMaterial())){
+            if (StrUtil.isEmpty(recordDetailDTO.getConfessionMaterial()) || StrUtil.equals("null", recordDetailDTO.getConfessionMaterial())){
                 recordDetailDTO.setConfessionMaterial(CollUtil.join(fileNameSet, ";"));
             }
             recordDetailDTO.setPercentageValue(taskRecordMap.get(recordDetailDTO.getId()));

src/main/java/com/supervision/police/vo/NoteRecordReqVO.java

@@ -74,7 +74,7 @@ public class NoteRecordReqVO {
         if (NumberUtil.isNumber(this.indexNum)){
             noteRecord.setIndexNum(Integer.parseInt(this.indexNum));
         }
-       // noteRecord.setConfessionMaterial(confessionMaterial);
+        noteRecord.setConfessionMaterial(confessionMaterial);
         noteRecord.setLawAsker(lawAsker);
         noteRecord.setConfessionStartTime(confessionStartTime);
         noteRecord.setConfessionEndTime(confessionEndTime);
@@ -91,7 +91,7 @@ public class NoteRecordReqVO {
         Assert.notEmpty(fileIdList, "笔录文件id集合不能为空");
         Assert.notBlank(confessionStartTime, "供述开始时间不能为空");
         Assert.notBlank(confessionEndTime, " 供述结束时间不能为空");
-        Assert.notBlank(recordName, "笔录名称不能为空");
+        Assert.notBlank(confessionMaterial, "笔录名称不能为空");
 
     }