From 3c9f89372fede6248a31232a435c65ec07602496 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 15 Apr 2022 19:02:45 +0800 Subject: [PATCH] =?UTF-8?q?ocr,=E6=8B=86=E5=88=86-=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOController.java | 26 ++++++++++---- .../ocr/controller/OcrRecordEOController.java | 3 ++ .../FileSplitItemsEOController.java | 1 + .../SarFileSplitInfoController.java | 36 +++++++++++++++++++ .../SarFileSplitMenuEOController.java | 1 + .../impl/FileSplitItemsEOServiceImpl.java | 32 +++++++++-------- 6 files changed, 78 insertions(+), 21 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java index 0c8e287b9..63b88366e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java @@ -83,7 +83,7 @@ public class BussDocumentLibraryEOController extends JeroController ocrPageInfo(@RequestBody Map parameter) { IPage infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter); return Result.OK(infoPage); @@ -207,13 +207,27 @@ public class BussDocumentLibraryEOController extends JeroController>> getHeaderOrConditionForOcr(@RequestParam(name="flag",required=true) String flag, @RequestParam(name="cut",required=true) String cut) { List> list = bussDocumentLibraryEOService.getHeaderOrConditionForOcr(flag,cut); return Result.OK(list); } + /** + * @param flag 标识传 1-->用于查询文档库字段属性 + * @return + */ + @AutoLog(value = "文档库信息表-文档拆分表头和查询条件") + @ApiOperation(value="文档库信息表-文档拆分表头和查询条件", notes="文档库信息表-文档拆分表头和查询条件") + @GetMapping(value = "/getHeaderOrConditionForSplitFile") + @RequiresPermissions("split:sarFileSplitInfo:splitFile") + public Result>> getHeaderOrConditionForSplitFile(@RequestParam(name="flag",required=true) String flag, + @RequestParam(name="cut",required=true) String cut) { + List> list = bussDocumentLibraryEOService.getHeaderOrConditionForSplit(flag,cut); + return Result.OK(list); + } + /** * ocr识别调取已入库文件-中英文切换 * @param flag 标识传 1-->用于查询文档库字段属性 @@ -221,10 +235,10 @@ public class BussDocumentLibraryEOController extends JeroController>> getHeaderOrConditionForSplit(@RequestParam(name="flag",required=true) String flag, - @RequestParam(name="cut",required=true) String cut) { + @GetMapping(value = "/getHeaderOrConditionForSplitResult") + @RequiresPermissions("split:sarFileSplitInfo:splitResult") + public Result>> getHeaderOrConditionForSplitResult(@RequestParam(name="flag",required=true) String flag, + @RequestParam(name="cut",required=true) String cut) { List> list = bussDocumentLibraryEOService.getHeaderOrConditionForSplit(flag,cut); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java index a9021cf89..b34da628d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java @@ -58,6 +58,7 @@ public class OcrRecordEOController extends JeroController queryPageList(@RequestBody OcrRecordEOPage ocrRecordEOPage) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.like(StringUtils.isNotEmpty(ocrRecordEOPage.getStandName()), OcrRecordEO::getStandName, ocrRecordEOPage.getStandName()) @@ -110,6 +111,7 @@ public class OcrRecordEOController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, @RequestParam(name = "cut") String cut) { List> list = ocrRecordService.getHeader(flag, cut); @@ -124,6 +126,7 @@ public class OcrRecordEOController extends JeroController>> queryCondition(@RequestParam(name = "flag") String flag, @RequestParam(name = "cut") String cut) { List> list = ocrRecordService.queryCondition(flag, cut); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java index a032848ce..810c86f2b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java @@ -50,6 +50,7 @@ public class FileSplitItemsEOController extends JeroController page(@RequestBody Map parameter) throws Exception { IPage infoPage = fileSplitItemsEOService.getInfoPage(parameter); return Result.OK(infoPage); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java index 0a2f1ede0..f529bf754 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.page.SarFileSplitInfoEOPage; import com.jero.modules.split.service.ISarFileSplitInfoService; @@ -23,6 +24,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; +import java.util.Map; /** @@ -39,6 +41,9 @@ public class SarFileSplitInfoController extends JeroController queryPageList(SarFileSplitInfoEOPage sarFileSplitInfoEOPage) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); if(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getSerialNumber())){ @@ -169,6 +175,36 @@ public class SarFileSplitInfoController extends JeroController splitFilePageInfo(@RequestBody Map parameter) { + IPage infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter); + return Result.OK(infoPage); + } + + /** + * ocr识别调取已入库文件 + * @param parameter + * @return + */ + @AutoLog(value = "导入拆分结果-分页查询") + @ApiOperation(value="导入拆分结果-分页查询", notes="导入拆分结果-分页查询") + @PostMapping(value = "/splitResultPageInfo") + @ResponseBody + @RequiresPermissions("split:sarFileSplitInfo:splitResult") + public Result splitResultPageInfo(@RequestBody Map parameter) { + IPage infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter); + return Result.OK(infoPage); + } + /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java index c894c4278..c38082c71 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java @@ -49,6 +49,7 @@ public class SarFileSplitMenuEOController extends JeroController> list(SarFileSplitMenuEOPage page) throws Exception { page.setValidFlag("0"); // page.setOrderBy("regexp_replace(replace('.'||NAME, '.', '.00000000'), '0+([^\\.]{8})', '\\1')"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 7767635b6..f57c51cf2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -801,7 +801,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl formFieldList = onlCgformFieldService.getFieldList(ModuleEnum.FILE_SPLIT_ITEMS.getValue()); if (formFieldList.size() != 0) { - //过滤出表单字段中 控件类型为树结构的 + //过滤出表单字段 formFieldList = formFieldList.stream() .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))) .collect(Collectors.toList()); @@ -1276,20 +1276,6 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl