zhouwentao
/
ocr-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

Browse Source
master
周文涛 2 years ago
parent d76fbcc9a8
commit ffd6e0aadd
9 changed files with 230 additions and 157 deletions
Show Stats Download Patch File Download Diff File

29
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyController.java
Unescape View File

@ -3,8 +3,11 @@ package org.jeecg.modules.ocr.controller;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.OcrConstant;
import org.jeecg.common.constant.enums.OcrStatusEnum;
@ -19,8 +22,14 @@ import org.jeecg.modules.ocr.entity.OcrIdentify;
import org.jeecg.modules.ocr.entity.OcrMetadataConfig;
import org.jeecg.modules.ocr.service.IOcrIdentifyService;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.ocr.service.IOcrMetadataConfigService;
import org.jeecg.modules.ocr.service.IOcrRuleCheckService;
import org.jeecg.modules.ocr.service.IOcrTaskTypeService;
import org.jeecg.modules.ocr.utils.DownloadTemplateUtil;
import org.jeecg.modules.ocr.utils.FileOUtils;
import org.jeecg.modules.ocr.vo.OcrIdentifyVo;
import org.jeecg.modules.ocr.vo.OcrMetadataConfigVo;
import org.jeecg.modules.ocr.vo.OcrRuleCheckVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@ -44,6 +53,12 @@ public class OcrIdentifyController extends JeecgController<OcrIdentify, IOcrIden
private IOcrIdentifyService ocrIdentifyService;
@Autowired
private DownloadTemplateUtil downloadTemplateUtil;
@Autowired
private IOcrTaskTypeService ocrTaskTypeService;
@Autowired
private IOcrMetadataConfigService ocrMetadataConfigService;
@Autowired
private IOcrRuleCheckService ocrRuleCheckService;
/**
* 分页列表查询
@ -63,7 +78,19 @@ public class OcrIdentifyController extends JeecgController<OcrIdentify, IOcrIden
HttpServletRequest req) {
QueryWrapper<OcrIdentify> queryWrapper = QueryGenerator.initQueryWrapper(ocrIdentify, req.getParameterMap());
Page<OcrIdentify> page = new Page<OcrIdentify>(pageNo, pageSize);
Map<String, OcrRuleCheckVo> ocrRuleCheckMap = ocrRuleCheckService.listToMap(null);
Map<String, OcrMetadataConfigVo> metadataConfigMap = ocrMetadataConfigService.listToMap(null);
IPage<OcrIdentify> pageList = ocrIdentifyService.page(page, queryWrapper);
if (pageList != null && pageList.getRecords() != null) {
for (OcrIdentify record : pageList.getRecords()) {
OcrRuleCheckVo ocrRuleCheckVo = ocrRuleCheckMap.get(record.getRuleCheck());
if (ocrRuleCheckVo!=null && StringUtils.isNotBlank(ocrRuleCheckVo.getMetadataConfigId())) {
record.setMetadataConfigId(ocrRuleCheckVo.getMetadataConfigId());
OcrMetadataConfigVo ocrMetadataConfigVo = metadataConfigMap.get(ocrRuleCheckVo.getMetadataConfigId());
record.setTaskType_dictText(ocrMetadataConfigVo!=null?ocrMetadataConfigVo.getTaskType_dictText():null);
}
}
}
return Result.OK(pageList);
}
@ -93,6 +120,7 @@ public class OcrIdentifyController extends JeecgController<OcrIdentify, IOcrIden
}
}
AssertUtils.hasSize(fileList, "图片目录下未获取到可使用的图片格式文件");
ocrIdentify.setTaskSource("平台");
ocrIdentifyService.save(ocrIdentify);
//3.请求python ocr识别，异步执行
ocrIdentifyService.postSemantic(ocrIdentify, fileList);
@ -159,6 +187,7 @@ public class OcrIdentifyController extends JeecgController<OcrIdentify, IOcrIden
/**
* 通过id查询
*
* @param id
* @return
*/

11
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrIdentify.java
Unescape View File

@ -3,6 +3,7 @@ package org.jeecg.modules.ocr.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -82,7 +83,7 @@ public class OcrIdentify implements Serializable {
private String metadataConfigId;
/**任务类型*/
@Excel(name = "任务类型", width = 15, dictTable = "ocr_task_type", dicText = "type_name", dicCode = "id")
@Dict(dictTable = "ocr_task_type", dicText = "type_name", dicCode = "id")
/*@Dict(dictTable = "ocr_task_type", dicText = "type_name", dicCode = "id")*/
@ApiModelProperty(value = "任务类型")
private String taskType;
/**识别路径*/
@ -112,4 +113,12 @@ public class OcrIdentify implements Serializable {
@ApiModelProperty(value = "请求id")
public String requestId;
//======================非数据库映射
/**任务类型_字段中文*/
@ApiModelProperty(value = "任务类型名称")
@Excel(name = "任务类型", width = 15)
@TableField(exist = false)
private String taskType_dictText;
}

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrMetadataConfigService.java
Unescape View File

@ -8,6 +8,7 @@ import org.jeecg.modules.ocr.model.OcrMetadataConfigSaveModel;
import org.jeecg.modules.ocr.vo.OcrMetadataConfigVo;
import java.util.List;
import java.util.Map;
/**
* @Description: 元数据配置
@ -52,4 +53,6 @@ public interface IOcrMetadataConfigService extends IService<OcrMetadataConfig> {
OcrMetadataConfigVo findById(String id);
void saveModelBatch(List<OcrMetadataConfigSaveModel> saveModelList);
Map<String, OcrMetadataConfigVo> listToMap(List<String> idList);
}

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrRuleCheckService.java
Unescape View File

@ -8,6 +8,7 @@ import org.jeecg.modules.ocr.model.OcrRuleCheckSaveModel;
import org.jeecg.modules.ocr.vo.OcrRuleCheckVo;
import java.util.List;
import java.util.Map;
/**
* @Description: 规则检查配置
@ -70,4 +71,7 @@ public interface IOcrRuleCheckService extends IService<OcrRuleCheck> {
* @return
*/
List<OcrRuleCheckVo> allList(List<String> selectionList);
Map<String, OcrRuleCheckVo> listToMap(List<String> selectionList);
}

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrTaskTypeService.java
Unescape View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.ocr.entity.OcrTaskType;
import java.util.List;
import java.util.Map;
/**
* @Description: 任务类型
@ -27,4 +28,6 @@ public interface IOcrTaskTypeService extends IService<OcrTaskType> {
boolean checkMetadataConfigUse(List<String> taskTypeIdList);
OcrTaskType saveTaskType(String taskTypeName);
Map<String,String> listNameToMap(List<String> taskTypeIdList);
}

9
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
Unescape View File

@ -130,9 +130,6 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
String fieldName = value.getFieldName();//校验的字段名称
String ruleInfo = value.getRuleInfo();//是否绝对判断 0-绝对判断，1-不绝对判断
String inputText = value.getInputText();//校验文本 ，ocr识别的文本如果不包含该内容，则算作失败.
if (StringUtils.isBlank(inputText)) {
continue;
}
List<String> fieldNameList = Arrays.asList(fieldName.split(","));
boolean b = ArrayOUtils.containsStringList(fieldNameList, semanticResult.keySet().stream().collect(Collectors.toList()));
//查看ocr识别返回的字段名称中是否有当前这个字段名称
@ -150,9 +147,11 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
JSONObject ocrItem = ocrArray.get(i);
text = ocrItem.getString("text");//ocr 识别的文本
probability = ocrItem.getDouble("probability");//置信度
if(inputText==null){
ocrResultAdd(ocrResultList, field, inputText, text, probability, imgPath, "", true);
fieldRightMap.put(field, true);
}else if ("1".equals(ruleInfo) && StringUtils.isNotBlank(text)) {
// 1 不需要校验，只需要有返回ocr识别值
if ("1".equals(ruleInfo) && StringUtils.isNotBlank(text)) {
ocrResultAdd(ocrResultList, field, inputText, text, probability, imgPath, "", true);
fieldRightMap.put(field, true);
} else {

7
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrMetadataConfigServiceImpl.java
Unescape View File

@ -94,6 +94,13 @@ public class OcrMetadataConfigServiceImpl extends ServiceImpl<OcrMetadataConfigM
}
}
@Override
public Map<String, OcrMetadataConfigVo> listToMap(List<String> idList) {
List<OcrMetadataConfigVo> metadataConfigVoList =baseMapper.allList(idList!=null&&idList.size()>0?idList:null);
Map<String, OcrMetadataConfigVo> metadataConfigVoMap = metadataConfigVoList.stream().collect(Collectors.toMap(OcrMetadataConfigVo::getId, o -> o));
return metadataConfigVoMap;
}
@Override
public OcrMetadataConfig updateModel(OcrMetadataConfigSaveModel ocrMetadataConfigSaveModel) {

10
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrRuleCheckServiceImpl.java
Unescape View File

@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
/**
* @Description: 规则检查配置
@ -64,7 +65,14 @@ public class OcrRuleCheckServiceImpl extends ServiceImpl<OcrRuleCheckMapper, Ocr
@Override
public List<OcrRuleCheckVo> allList(List<String> selectionList) {
return baseMapper.allList(selectionList);
return baseMapper.allList(selectionList!=null && selectionList.size()>0?selectionList:null);
}
@Override
public Map<String, OcrRuleCheckVo> listToMap(List<String> selectionList) {
List<OcrRuleCheckVo> ocrRuleCheckVoList = allList(selectionList);
Map<String, OcrRuleCheckVo> collect = ocrRuleCheckVoList.stream().collect(Collectors.toMap(OcrRuleCheckVo::getId, o -> o));
return collect;
}
@Override

11
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrTaskTypeServiceImpl.java
Unescape View File

@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
@ -75,4 +76,14 @@ public class OcrTaskTypeServiceImpl extends ServiceImpl<OcrTaskTypeMapper, OcrTa
super.save(ocrTaskType);
return ocrTaskType;
}
@Override
public Map<String, String> listNameToMap(List<String> taskTypeIdList) {
List<OcrTaskType> list=taskTypeIdList!=null && taskTypeIdList.size()>0 ? super.listByIds(taskTypeIdList):super.list();
if (list==null || list.size()==0) {
return new HashMap<>();
}
Map<String, String> map = list.stream().collect(Collectors.toMap(OcrTaskType::getId, OcrTaskType::getTypeName));
return map;
}
}

Write Preview
Loading…
Cancel
Save