WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ocr识别-文本状态修改来源为文档库

Browse Source
This commit is contained in:
liyawei
2022-04-06 09:41:29 +08:00
parent 0e425d8ebc
commit a4b9aa2a4d
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java
+16 -9
View File
@@ -7,6 +7,7 @@ import com.jero.common.constant.enums.ModuleEnum;
import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
import com.jero.modules.document.enums.FieldTypeEnum;
import com.jero.modules.ocr.entity.OcrRecordEO; import com.jero.modules.ocr.entity.OcrRecordEO;
import com.jero.modules.ocr.enums.FileSourceEnum; import com.jero.modules.ocr.enums.FileSourceEnum;
import com.jero.modules.ocr.mapper.OcrRecordEOMapper; import com.jero.modules.ocr.mapper.OcrRecordEOMapper;
@@ -190,7 +191,7 @@ public class OcrRecordEOServiceImpl extends ServiceImpl<OcrRecordEOMapper, OcrRe
public List<Map<String, Object>> getForm(String flag, String cut) { public List<Map<String, Object>> getForm(String flag, String cut) {
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag); List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag);
if (fieldList.size() != 0) { if (fieldList.size() != 0) {
//过滤出搜索条件() //过滤出表单字段
fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList()); fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList());
} }
List<Map<String, Object>> list = new ArrayList<>(); List<Map<String, Object>> list = new ArrayList<>();
@@ -206,6 +207,14 @@ public class OcrRecordEOServiceImpl extends ServiceImpl<OcrRecordEOMapper, OcrRe
} else { } else {
map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名 map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
} }
if("文本状态".equals(onlCgformField.getDbFieldTxt())){
// 查询文档库所有文件类型的字段名称
List<OnlCgformField> documentLibraryFieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
documentLibraryFieldList = fieldList.stream()
.filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
List<String> fieldFileList = documentLibraryFieldList.stream().map(OnlCgformField::getDbFieldTxt).collect(Collectors.toList());
map.put("value_list",fieldFileList);
}
list.add(map); list.add(map);
} }
return list; return list;
@@ -236,20 +245,18 @@ public class OcrRecordEOServiceImpl extends ServiceImpl<OcrRecordEOMapper, OcrRe
for (OcrRecordEO ocrRecordEO : ocrRecordEOList){ for (OcrRecordEO ocrRecordEO : ocrRecordEOList){
if (CutEnum.CN.getValue().equals(cut)) { if (CutEnum.CN.getValue().equals(cut)) {
Map<String, String> cnMap = dictItemListAll.stream() Map<String, String> cnMap = dictItemListAll.stream()
.filter(e->e.getItemValue().equals(ocrRecordEO.getFileType()) .filter(e->e.getItemValue().equals(ocrRecordEO.getResultContent())
|| e.getItemValue().equals(ocrRecordEO.getResultContent())
|| e.getItemValue().equals(ocrRecordEO.getSyncState())) || e.getItemValue().equals(ocrRecordEO.getSyncState()))
.collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText)); .collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText)); // 优化
ocrRecordEO.setFileType(cnMap.get(ocrRecordEO.getFileType())); // ocrRecordEO.setFileType(cnMap.get(ocrRecordEO.getFileType()));
ocrRecordEO.setResultContent(cnMap.get(ocrRecordEO.getResultContent())); ocrRecordEO.setResultContent(cnMap.get(ocrRecordEO.getResultContent()));
ocrRecordEO.setSyncState(cnMap.get(ocrRecordEO.getSyncState())); ocrRecordEO.setSyncState(cnMap.get(ocrRecordEO.getSyncState()));
} else { } else {
Map<String, String> enMap = dictItemListAll.stream() Map<String, String> enMap = dictItemListAll.stream()
.filter(e->e.getItemValue().equals(ocrRecordEO.getFileType()) .filter(e->e.getItemValue().equals(ocrRecordEO.getResultContent())
|| e.getItemValue().equals(ocrRecordEO.getResultContent())
|| e.getItemValue().equals(ocrRecordEO.getSyncState())) || e.getItemValue().equals(ocrRecordEO.getSyncState()))
.collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName)); .collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName)); // 优化
ocrRecordEO.setFileType(enMap.get(ocrRecordEO.getFileType())); // ocrRecordEO.setFileType(enMap.get(ocrRecordEO.getFileType()));
ocrRecordEO.setResultContent(enMap.get(ocrRecordEO.getResultContent())); ocrRecordEO.setResultContent(enMap.get(ocrRecordEO.getResultContent()));
ocrRecordEO.setSyncState(enMap.get(ocrRecordEO.getSyncState())); ocrRecordEO.setSyncState(enMap.get(ocrRecordEO.getSyncState()));
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
+4 -6
View File
@@ -178,17 +178,15 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
for (SarFileSplitInfoEO splitInfoEO : sarFileSplitInfoEOList){ for (SarFileSplitInfoEO splitInfoEO : sarFileSplitInfoEOList){
if (CutEnum.CN.getValue().equals(cut)) { if (CutEnum.CN.getValue().equals(cut)) {
Map<String, String> cnMap = dictItemListAll.stream() Map<String, String> cnMap = dictItemListAll.stream()
.filter(e->e.getItemValue().equals(splitInfoEO.getFileType()) .filter(e-> e.getItemValue().equals(splitInfoEO.getSplitResult()))
|| e.getItemValue().equals(splitInfoEO.getSplitResult()))
.collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText)); // 优化 .collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText)); // 优化
splitInfoEO.setFileType(cnMap.get(splitInfoEO.getFileType())); // splitInfoEO.setFileType(cnMap.get(splitInfoEO.getFileType()));
splitInfoEO.setSplitResult(cnMap.get(splitInfoEO.getSplitResult())); splitInfoEO.setSplitResult(cnMap.get(splitInfoEO.getSplitResult()));
} else { } else {
Map<String, String> enMap = dictItemListAll.stream() Map<String, String> enMap = dictItemListAll.stream()
.filter(e->e.getItemValue().equals(splitInfoEO.getFileType()) .filter(e-> e.getItemValue().equals(splitInfoEO.getSplitResult()))
|| e.getItemValue().equals(splitInfoEO.getSplitResult()))
.collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName)); // 优化 .collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName)); // 优化
splitInfoEO.setFileType(enMap.get(splitInfoEO.getFileType())); // splitInfoEO.setFileType(enMap.get(splitInfoEO.getFileType()));
splitInfoEO.setSplitResult(enMap.get(splitInfoEO.getSplitResult())); splitInfoEO.setSplitResult(enMap.get(splitInfoEO.getSplitResult()));
} }
if(StringUtils.isNotEmpty(splitInfoEO.getFileId())) { if(StringUtils.isNotEmpty(splitInfoEO.getFileId())) {