ocr测试地址

docus-segmentation/src/main/java/com/docus/server/controller/FileController.java

@@ -1,16 +1,18 @@
 package com.docus.server.controller;
 
+import com.docus.server.api.ocr.OcrApi;
 import com.docus.server.common.event.FlowEvent;
 import com.docus.server.common.service.IFileUploadService;
 import com.docus.server.dto.segmentation.UploadBatchFileRequest;
 import com.docus.server.entity.segmentation.OcrFileInfoTest;
-import com.docus.server.entity.segmentation.OcrVersion;
+import com.docus.server.service.IOcrCutConfigService;
-import com.docus.server.service.*;
+import com.docus.server.service.IOcrCutConfigTestService;
+import com.docus.server.service.IOcrFileInfoTestService;
+import com.docus.server.service.IOcrVersionService;
+import com.docus.server.service.IPublishEventService;
 import com.docus.server.service.impl.CommonService;
 import com.docus.server.service.impl.PlatformServiceImpl;
 import com.docus.server.vo.scheduling.management.schcollectorversionfile.UploadFileVO;
-import com.docus.server.vo.segmentation.ocrcutconfig.OcrCutConfigVO;
-import com.docus.server.vo.segmentation.ocrcutconfigtest.OcrCutConfigTestVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -34,7 +36,7 @@ import java.util.List;
  * @author AutoGenerator
  * @since 2023-07-15
  */
-@Api(value = "通用文件上传下载接口", tags = "通用文件上传下载接口")
+@Api(value = "通用接口", tags = "通用接口")
 @RestController
 @RequestMapping("/ocr/file")
 public class FileController {
@@ -54,6 +56,14 @@ public class FileController {
     private IOcrFileInfoTestService iOcrFileInfoTestService;
     @Resource
     private IOcrVersionService iOcrVersionService;
+    @Resource
+    private OcrApi ocrApi;
+
+    @ApiOperation("ocr测试")
+    @GetMapping("/orc-test")
+    public List<String> ocrTest(String path, String ocrHttpUrl) throws Exception {
+        return ocrApi.getText(path, ocrHttpUrl);
+    }
 
     @ApiOperation("文件下载")
     @GetMapping("/download")

docus-segmentation/src/main/java/com/docus/server/service/IOcrCutConfigService.java

@@ -5,7 +5,6 @@ import com.docus.infrastructure.web.response.PageResult;
 import com.docus.server.dto.segmentation.ocrcutconfig.AddOcrCutConfigDTO;
 import com.docus.server.dto.segmentation.ocrcutconfig.DeleteOcrCutConfigDTO;
 import com.docus.server.dto.segmentation.ocrcutconfig.EditOcrCutConfigDTO;
-import com.docus.server.entity.segmentation.OcrCutConfig;
 import com.docus.server.vo.segmentation.ocrcutconfig.OcrCutConfigVO;
 
 import java.util.List;

docus-segmentation/src/main/java/com/docus/server/service/IOcrVersionService.java

@@ -26,6 +26,7 @@ public interface IOcrVersionService {
     OcrVersionVO findById(Long id);
 
     OcrVersion finEnableVersion();
+
     /**
      * 查询所有
      *

docus-segmentation/src/main/java/com/docus/server/service/handler/StartSegmentHandler.java

@@ -2,12 +2,17 @@ package com.docus.server.service.handler;
 
 import cn.hutool.json.JSONUtil;
 import com.docus.core.util.Func;
+import com.docus.infrastructure.core.db.dao.IBaseDao;
 import com.docus.log.annotation.TrackRetryListener;
 import com.docus.server.api.ocr.OcrApi;
 import com.docus.server.common.service.IFileUploadService;
 import com.docus.server.dto.segmentation.FileDTO;
 import com.docus.server.dto.segmentation.UploadBatchFileRequest;
-import com.docus.server.entity.segmentation.*;
+import com.docus.server.entity.segmentation.OcrBasic;
+import com.docus.server.entity.segmentation.OcrFileInfo;
+import com.docus.server.entity.segmentation.OcrRuleResult;
+import com.docus.server.entity.segmentation.OcrSpecialResult;
+import com.docus.server.entity.segmentation.OcrVersion;
 import com.docus.server.enums.OcrStatusEnum;
 import com.docus.server.infrastructure.dao.IOcrBasicDao;
 import com.docus.server.infrastructure.dao.IOcrFileInfoDao;
@@ -171,8 +176,8 @@ public class StartSegmentHandler {
             p.setOcrStatue(OcrStatusEnum.COMPLETE);
         }).collect(Collectors.toList());
 
-        iOcrBasicDao.updateBatchById(collect, iOcrBasicDao.DEFAULT_BATCH_SIZE);
+        iOcrBasicDao.updateBatchById(collect, IBaseDao.DEFAULT_BATCH_SIZE);
-        iOcrFileInfoDao.updateBatchById(fileInfoList, iOcrFileInfoDao.DEFAULT_BATCH_SIZE);
+        iOcrFileInfoDao.updateBatchById(fileInfoList, IBaseDao.DEFAULT_BATCH_SIZE);
 
         //数据上传到3.0
         OcrBasic ocrBasic = ocrBasicList.get(0);

docus-segmentation/src/main/java/com/docus/server/service/impl/OcrServiceImpl.java

@@ -10,7 +10,6 @@ import com.docus.server.vo.ocr.Datas;
 import com.docus.server.vo.ocr.OcrResponse;
 import com.docus.server.vo.ocr.Sort;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 

docus-segmentation/src/main/java/com/docus/server/service/impl/OcrVersionServiceImpl.java

@@ -10,9 +10,6 @@ import com.docus.server.dto.segmentation.ocrversion.DeleteOcrVersionDTO;
 import com.docus.server.dto.segmentation.ocrversion.EditOcrVersionDTO;
 import com.docus.server.entity.segmentation.*;
 import com.docus.server.infrastructure.dao.*;
-import com.docus.server.service.IOcrRuleService;
-import com.docus.server.service.IOcrSpecialRuleService;
-import com.docus.server.service.IOcrSpecialRuleTestService;
 import com.docus.server.service.IOcrVersionService;
 import com.docus.server.vo.segmentation.ocrversion.OcrVersionVO;
 import org.springframework.stereotype.Service;