1. 修复bug

docker/docker-compose/docker-compose-base.yml

@@ -78,7 +78,7 @@ services:
     ports:
       - ${OCR_PORT_HTTP}:8000
     environment:
-      - MINIO_ENDPOINT_URL=http://fu-hsi-minio:9000
+      - MINIO_ENDPOINT_URL=${OCR_MINIO_ENDPOINT_URL}
       - MINIO_ACCESS_KEY=${MINIO_USER}
       - MINIO_SECRET_KEY=${MINIO_PASSWORD}
     networks:

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

@@ -63,7 +63,7 @@ public class FileOcrProcessServiceImpl extends ServiceImpl<FileOcrProcessMapper,
 
     private List<FileOcrProcess> submitOCR(List<String> fileIdList, Consumer<List<FileOcrProcess>> consumer){
         if (CollUtil.isEmpty(fileIdList)){
-            log.info("submitOCR:fileIds为空。提交ocr任务...");
+            log.info("submitOCR:fileIds为空。不提交ocr任务...");
             return new ArrayList<>(1);
         }
 
@@ -74,7 +74,7 @@ public class FileOcrProcessServiceImpl extends ServiceImpl<FileOcrProcessMapper,
         List<FileOcrProcess> processList = new ArrayList<>();
         for (String fileId : fileIdList) {
             if (null != ocrProcessMap.get(fileId)){
-                // 跳过识别成功的文件
+                // 重新识别识别失败的文件
                 FileOcrProcess fileOcrProcess = ocrProcessMap.get(fileId);
                 if (OcrProcessStatus.isFailCode(fileOcrProcess.getStatus())){
                     fileOcrProcess.setStatus(OcrProcessStatus.UNPROCESS.getCode());
@@ -88,6 +88,7 @@ public class FileOcrProcessServiceImpl extends ServiceImpl<FileOcrProcessMapper,
             }
         }
 
+        log.debug("submitOCR:提交识别任务到异步处理器中...");
         consumer.accept(processList);
         return processList;
     }
@@ -95,6 +96,8 @@ public class FileOcrProcessServiceImpl extends ServiceImpl<FileOcrProcessMapper,
     @Override
     public synchronized void doOCRTask(List<FileOcrProcess> fileOcrProcesses) {
 
+        log.info("doOCRTask:开始识别文件...{}",JSONUtil.toJsonStr(fileOcrProcesses));
+
         if (CollUtil.isEmpty(fileOcrProcesses)){
             log.info("asyncOcr:当前暂无识别的任务，结束...");
             return;
@@ -130,7 +133,7 @@ public class FileOcrProcessServiceImpl extends ServiceImpl<FileOcrProcessMapper,
     @Async
     @Override
     public void asyncDoOCRTask(List<FileOcrProcess> fileOcrProcesses) {
-
+        log.debug("asyncDoOCRTask:开始识别文件...{}", JSONUtil.toJsonStr(fileOcrProcesses));
         doOCRTask(fileOcrProcesses);
     }
 

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

@@ -206,7 +206,7 @@ public class OCREvidenceServiceImpl implements OCREvidenceService {
             return false;
         }
         DateTime dateTime = timedCache.get(join);
-        return DateUtil.between(dateTime, DateUtil.date(), DateUnit.SECOND) > fileIdList.size() * 20L;
+        return DateUtil.between(dateTime, DateUtil.date(), DateUnit.SECOND) > fileIdList.size() * 10L;
     }
 
     @Override

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

@@ -90,7 +90,6 @@ public class OCRRecordServiceImpl implements OCRRecordService {
     public Boolean reviseOcrText(String id,String reviseText) {
 
         Assert.notEmpty(id, "id不能为空");
-        Assert.notEmpty(reviseText, "reviseText不能为空");
 
         return fileOcrProcessService.lambdaUpdate()
                 .eq(FileOcrProcess::getId, id)