From 82f41e7256d26dc898bbc7dd25578021f12557af Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 24 Feb 2022 11:39:31 +0800 Subject: [PATCH] =?UTF-8?q?ocr=E8=AF=86=E5=88=AB-=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/enums/ModuleEnum.java | 3 +- .../jero/common/constant/enums/TableEnum.java | 3 +- .../impl/OnlCgformFieldServiceImpl.java | 2 + .../ocr/controller/OcrRecordEOController.java | 16 +++++++- .../ocr/service/IOcrRecordEOService.java | 9 +++++ .../service/impl/OcrRecordEOServiceImpl.java | 38 ++++++++++++++++++- 6 files changed, 66 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java index 6395949d2..05c0a08af 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java @@ -6,7 +6,8 @@ package com.jero.common.constant.enums; * @auth zhn */ public enum ModuleEnum { - DOCUMENT_LIBRARY("文档管理","1"); + DOCUMENT_LIBRARY("文档管理","1"), + OCR_RECORD("OCR识别转换记录表","2"); String name; diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java index d533526f5..5c7e30faf 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java @@ -6,7 +6,8 @@ package com.jero.common.constant.enums; * @auth zhn */ public enum TableEnum { - BUSS_DOCUMENT_LIBRARY("buss_document_library"); + BUSS_DOCUMENT_LIBRARY("buss_document_library"), + OCR_RECORD("ocr_record"); String table; diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java index bcf17dfbe..1efc26e34 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java @@ -816,6 +816,8 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl fieldList = new ArrayList<>(); if(ModuleEnum.DOCUMENT_LIBRARY.getValue().equals(flag)){ fieldList = onlCgformFieldMapper.getFieldList(TableEnum.BUSS_DOCUMENT_LIBRARY.getTable()); + }else if(ModuleEnum.OCR_RECORD.getValue().equals(flag)){ + fieldList = onlCgformFieldMapper.getFieldList(TableEnum.OCR_RECORD.getTable()); } return fieldList; } 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 568780889..aee8ec4a1 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 @@ -2,6 +2,7 @@ package com.jero.modules.ocr.controller; import java.util.Arrays; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -130,6 +131,20 @@ public class OcrRecordEOController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list = ocrRecordService.getHeader(flag, cut); + return Result.OK(list); + } + /** * 列表查询 * @@ -244,5 +259,4 @@ public class OcrRecordEOController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, OcrRecordEO.class); } - } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/IOcrRecordEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/IOcrRecordEOService.java index 62e754ae0..06d2f9f4c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/IOcrRecordEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/IOcrRecordEOService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.modules.ocr.entity.OcrRecordEO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; +import java.util.Map; /** * @Description: OCR识别转换记录表 @@ -61,4 +62,12 @@ public interface IOcrRecordEOService extends IService { * @return */ List queryList(); + + /** + * 列表表头中英文切换 + * @param flag + * @param cut + * @return + */ + public List> getHeader(String flag, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java index d043cea35..4a6e86ad4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java @@ -1,11 +1,17 @@ package com.jero.modules.ocr.service.impl; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.YesOrNoEnum; +import com.jero.generater.modules.online.cgform.entity.OnlCgformField; +import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; import com.jero.modules.ocr.entity.OcrRecordEO; import com.jero.modules.ocr.mapper.OcrRecordEOMapper; import com.jero.modules.ocr.service.IOcrRecordEOService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Date; + +import java.util.*; +import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -18,6 +24,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class OcrRecordEOServiceImpl extends ServiceImpl implements IOcrRecordEOService { + @Autowired + private OnlCgformFieldServiceImpl onlCgformFieldService; /** * 保存 * @@ -89,4 +97,30 @@ public class OcrRecordEOServiceImpl extends ServiceImpl queryList() { return list(); } + + /** + * 列表表头中英文切换 + * + * @return + */ + @Override + public List> getHeader(String flag, String cut) { + List fieldList = onlCgformFieldService.getFieldList(flag); + if (fieldList.size() != 0) { + //过滤列表字段(is_show_list-->列表是否显示0否 1是) + fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); + } + List> list = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + map.put("db_field_name", onlCgformField.getDbFieldName());//字段 + if(CutEnum.CN.getValue().equals(cut)){ + map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 + }else{ + map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名 + } + list.add(map); + } + return list; + } }