From 2928270b3eece019b66a2f76a89cbd2a395a7af1 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 24 Feb 2022 10:07:04 +0800 Subject: [PATCH] =?UTF-8?q?ocr=E8=AF=86=E5=88=AB-=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=87=B3=E6=96=87=E6=A1=A3=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/controller/OcrRecordEOController.java | 40 +++++++++++++++++++ .../jero/modules/ocr/enums/FileTypeEnum.java | 7 ++-- .../modules/ocr/enums/ResultContentEnum.java | 36 +++++++++++++++++ 3 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/enums/ResultContentEnum.java 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 b6e0d1c20..9fff7475c 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 @@ -5,12 +5,19 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; +import com.jero.modules.document.entity.BussDocumentLibraryEO; +import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.ocr.entity.OcrRecordEO; +import com.jero.modules.ocr.enums.FileTypeEnum; +import com.jero.modules.ocr.enums.ResultContentEnum; import com.jero.modules.ocr.service.IOcrRecordEOService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; import org.apache.commons.lang.StringUtils; @@ -37,6 +44,10 @@ import com.jero.common.aspect.annotation.AutoLog; public class OcrRecordEOController extends JeroController { @Autowired private IOcrRecordEOService ocrRecordService; + @Autowired + private IBussDocumentLibraryEOService bussDocumentLibraryEOService; + @Autowired + private IOSSFileService ossFileService; @Value("${OCR.ocrDownPath}") private String ocrDownPath; @@ -76,6 +87,35 @@ public class OcrRecordEOController extends JeroController syncToDocument(@RequestBody OcrRecordEO ocrRecordEO) { + //通过编号和标题查询对应文档 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BussDocumentLibraryEO::getTitle, ocrRecordEO.getStandName()) + .eq(BussDocumentLibraryEO::getSerialNumber, ocrRecordEO.getStandNumber()); + List bussDocumentLibraryEOList = bussDocumentLibraryEOService.list(queryWrapper); + if(CollectionUtil.isNotEmpty(bussDocumentLibraryEOList)){ + OSSFile ossFile = new OSSFile(); + //设置doc文件的关联id + if (FileTypeEnum.RELEASE_DRAFT.getValue().equals(ocrRecordEO.getFileType())){ + ossFile.setConnectId(bussDocumentLibraryEOList.get(0).getReleaseDraft()); + }else if (FileTypeEnum.SUPPLEMENT.getValue().equals(ocrRecordEO.getFileType())){ + ossFile.setConnectId(bussDocumentLibraryEOList.get(0).getSupplement()); + }else if (FileTypeEnum.APPROVAL_DRAFT.getValue().equals(ocrRecordEO.getFileType())){ + ossFile.setConnectId(bussDocumentLibraryEOList.get(0).getApprovalDraft()); + }else if (FileTypeEnum.EXPOSURE_DRAFT.getValue().equals(ocrRecordEO.getFileType())){ + ossFile.setConnectId(bussDocumentLibraryEOList.get(0).getExposureDraft()); + } + ossFile.setId(ocrRecordEO.getAttId()); + ossFileService.updateById(ossFile); + return Result.OK(); + }else{ + return Result.error("没有可同步的文档"); + } + } + /** * 列表查询 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/enums/FileTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/enums/FileTypeEnum.java index cbfd89a5c..258689472 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/enums/FileTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/enums/FileTypeEnum.java @@ -6,9 +6,10 @@ package com.jero.modules.ocr.enums; * @Date: Created in 14:49 2022/2/16 */ public enum FileTypeEnum { - OCR_CONVERTING("转换中","转换中"), - OCR_CONVERT_SUCCESS("转换成功","转换成功"), - OCR_CONVERT_FAIL("转换失败","转换失败"); + RELEASE_DRAFT("发布稿","1"), + SUPPLEMENT("增补件","2"), + APPROVAL_DRAFT("报批稿","3"), + EXPOSURE_DRAFT("征求意见稿","4"); String name; String value; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/enums/ResultContentEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/enums/ResultContentEnum.java new file mode 100644 index 000000000..8823c7368 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/enums/ResultContentEnum.java @@ -0,0 +1,36 @@ +package com.jero.modules.ocr.enums; + +/** + * @Author: liyawei + * @Description: + * @Date: Created in 14:49 2022/2/16 + */ +public enum ResultContentEnum { + OCR_CONVERTING("转换中","转换中"), + OCR_CONVERT_SUCCESS("转换成功","转换成功"), + OCR_CONVERT_FAIL("转换失败","转换失败"); + + String name; + String value; + + private ResultContentEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +}