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

updates

Browse Source
master
周文涛 2 years ago
parent 91ecb9ea18
commit b0c292c3ba
10 changed files with 316 additions and 226 deletions
Show Stats Download Patch File Download Diff File

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

@ -81,16 +81,6 @@ public class OcrMetadataConfigController extends JeecgController<OcrMetadataConf
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
/*if (StringUtils.isNotBlank(ocrMetadataConfig.getConfigName())){
ocrMetadataConfig.setConfigName("*"+ocrMetadataConfig.getConfigName()+"*");
}
if (StringUtils.isNotBlank(ocrMetadataConfig.getResultName())){
ocrMetadataConfig.setResultName("*"+ocrMetadataConfig.getResultName()+"*");
}
if (StringUtils.isNotBlank(ocrMetadataConfig.getGetField())){
ocrMetadataConfig.setGetField("*"+ocrMetadataConfig.getGetField()+"*");
}*/
//QueryWrapper<OcrMetadataConfig> queryWrapper = QueryGenerator.initQueryWrapper(ocrMetadataConfig, req.getParameterMap());
Page<OcrMetadataConfig> page = new Page<OcrMetadataConfig>(pageNo, pageSize);
IPage<OcrMetadataConfigVo> pageList = ocrMetadataConfigService.pageVo(page, ocrMetadataConfig);
return Result.OK(pageList);
@ -235,7 +225,6 @@ public class OcrMetadataConfigController extends JeecgController<OcrMetadataConf
mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
}
return mv;
}
/**
@ -271,19 +260,26 @@ public class OcrMetadataConfigController extends JeecgController<OcrMetadataConf
//判断重复字段名
Map<String, Long> countMap = list.stream().map(o->o.getConfigName()).collect(Collectors.groupingBy(Function.identity(), Collectors.counting()));
AssertUtils.notTrue(countMap.values().stream().filter(f->f>1).count()>0,"不可有重复的配置名称！");
//入库保存的元数据对象
List<OcrMetadataConfigSaveModel> saveModelList=new ArrayList<>();
OcrMetadataConfigSaveModel ocrMetadataConfigSaveModel=null;
List<OcrMetadataConfigDetail> ocrMetadataConfigDetailList=null;
OcrMetadataConfigDetail ocrMetadataConfigDetail=null;
//元数据循环copy add的对象
OcrMetadataConfigSaveModel ocrMetadataConfigSaveModel;
//元数据循环遍历用的对象
List<OcrMetadataConfigDetail> ocrMetadataConfigDetailList;
OcrMetadataConfigDetail ocrMetadataConfigDetail;
String resultName;//字段
String getField;//字段描述
List<String> resultList;
List<String> getFieldList;
for (OcrMetadataConfigVo configVo : list) {
ocrMetadataConfigSaveModel=new OcrMetadataConfigSaveModel();
ocrMetadataConfigSaveModel.setConfigName(configVo.getConfigName());
String resultName = configVo.getResultName();
String getField = configVo.getGetField();
resultName = configVo.getResultName();
getField = configVo.getGetField();
ocrMetadataConfigSaveModel.setTaskTypeName(configVo.getTaskType_dictText());
List<String> resultList=new ArrayList<>();
List<String> getFieldList=new ArrayList<>();
resultList=new ArrayList<>();
getFieldList=new ArrayList<>();
if (StringUtils.isNotBlank(resultName)) {
resultList=Arrays.asList(resultName.split(","));
}
@ -301,16 +297,11 @@ public class OcrMetadataConfigController extends JeecgController<OcrMetadataConf
ocrMetadataConfigSaveModel.setOcrMetadataConfigDetailList(ocrMetadataConfigDetailList);
saveModelList.add(ocrMetadataConfigSaveModel);
}
//update-begin-author:taoyan date:20190528 for:批量插入数据
long start = System.currentTimeMillis();
ocrMetadataConfigService.saveModelBatch(saveModelList);
//400条 saveBatch消耗时间1592毫秒 循环插入消耗时间1947毫秒
//1200条 saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
//update-end-author:taoyan date:20190528 for:批量插入数据
return Result.ok("文件导入成功！数据行数：" + list.size());
} catch (Exception e) {
//update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示
String msg = e.getMessage();
log.error(msg, e);
if(msg!=null && msg.indexOf("Duplicate entry")>=0){
@ -318,7 +309,6 @@ public class OcrMetadataConfigController extends JeecgController<OcrMetadataConf
}else{
return Result.error("文件导入失败:" + e.getMessage());
}
//update-end-author:taoyan date:20211124 for: 导入数据重复增加提示
} finally {
try {
file.getInputStream().close();

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

@ -11,15 +11,20 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.AssertUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.config.JeecgBaseConfig;
import org.jeecg.modules.ocr.entity.OcrMetadataConfig;
import org.jeecg.modules.ocr.entity.OcrMetadataConfigDetail;
import org.jeecg.modules.ocr.entity.OcrRuleCheck;
import org.jeecg.modules.ocr.entity.OcrTaskType;
@ -32,7 +37,10 @@ import org.jeecg.modules.ocr.utils.DownloadTemplateUtil;
import org.jeecg.modules.ocr.vo.OcrMetadataConfigVo;
import org.jeecg.modules.ocr.vo.OcrRuleCheckVo;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@ -60,6 +68,9 @@ public class OcrRuleCheckController extends JeecgController<OcrRuleCheck, IOcrRu
private DownloadTemplateUtil downloadTemplateUtil;
@Autowired
private IOcrMetadataConfigService ocrMetadataConfigService;
@Resource
private JeecgBaseConfig jeecgBaseConfig;
/**
* 分页列表查询
*
@ -92,6 +103,7 @@ public class OcrRuleCheckController extends JeecgController<OcrRuleCheck, IOcrRu
/**
* 添加
*
* @param ocrRuleCheckSaveModel
* @return
*/
@ -110,6 +122,7 @@ public class OcrRuleCheckController extends JeecgController<OcrRuleCheck, IOcrRu
/**
* 校验保存时入参是否可通过
*
* @param ocrRuleCheckSaveModel
*/
public void checkSaveModel(OcrRuleCheckSaveModel ocrRuleCheckSaveModel) {
@ -192,7 +205,27 @@ public class OcrRuleCheckController extends JeecgController<OcrRuleCheck, IOcrRu
// @RequiresPermissions("org.jeecg.modules.ocr:ocr_rule_check:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, OcrRuleCheck ocrRuleCheck) {
return super.exportXls(request, ocrRuleCheck, OcrRuleCheck.class, "规则检查配置");
// 过滤选中数据
String selections = request.getParameter("selections");
String title = "规则检查配置";
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<OcrRuleCheckVo> exportList = new ArrayList<>();
if (oConvertUtils.isNotEmpty(selections)) {
List<String> selectionList = Arrays.asList(selections.split(","));
exportList = ocrRuleCheckService.allList(selectionList);
}
if (true) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
mv.addObject(NormalExcelConstants.FILE_NAME, title);
mv.addObject(NormalExcelConstants.CLASS, OcrRuleCheckVo.class);
ExportParams exportParams = new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
exportParams.setImageBasePath(jeecgBaseConfig.getPath().getUpload());
mv.addObject(NormalExcelConstants.PARAMS, exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
}
return mv;
}
/**
@ -228,30 +261,32 @@ public class OcrRuleCheckController extends JeecgController<OcrRuleCheck, IOcrRu
//判断重复字段名
Map<String, Long> countMap = list.stream().map(o -> o.getConfigName()).collect(Collectors.groupingBy(Function.identity(), Collectors.counting()));
AssertUtils.notTrue(countMap.values().stream().filter(f -> f > 1).count() > 0, "不可有重复的配置名称！");
Map<String, String> metadataConfigNameMap = ocrMetadataConfigService.list(new LambdaQueryWrapper<>()).stream().collect(Collectors.toMap(OcrMetadataConfig::getConfigName, OcrMetadataConfig::getId));
List<OcrRuleCheckSaveModel> saveModelList = new ArrayList<>();
OcrRuleCheckSaveModel ocrRuleCheckSaveModel=new OcrRuleCheckSaveModel();
OcrRuleCheckSaveModel ocrRuleCheckSaveModel;
boolean existsFlag = false;
String configRule;//规则配置
String metadataConfigName;//元数据配置名称
String metadataConfigId;//元数据配置id
for (OcrRuleCheckSaveModel configVo : list) {
ocrRuleCheckSaveModel.setConfigName(configVo.getConfigName());
boolean existsFlag=ocrRuleCheckService.existsByConfigName(configVo.getConfigName(),null);//true 已存在,false不存在
ocrRuleCheckSaveModel = new OcrRuleCheckSaveModel();
metadataConfigName = configVo.getMetadataConfigName();
configRule = configVo.getConfigRule();
metadataConfigId = metadataConfigNameMap.get(metadataConfigName);
existsFlag = ocrRuleCheckService.existsByConfigName(configVo.getConfigName(), null);//true 已存在,false不存在
AssertUtils.notTrue(existsFlag, String.format("[配置名称]-%s 已存在", configVo.getConfigName()));
String configRule = configVo.getConfigRule();
String metadataConfigId = configVo.getMetadataConfigId();
OcrMetadataConfigVo ocrMetadataConfigVo = ocrMetadataConfigService.findById(metadataConfigId);
AssertUtils.notNull(ocrMetadataConfigVo,String.format("[元数据配置]-%s 不存在",metadataConfigId));
AssertUtils.notEmpty(metadataConfigId, String.format("[元数据配置]-%s 不存在", metadataConfigName));
ocrRuleCheckSaveModel.setConfigName(configVo.getConfigName());
ocrRuleCheckSaveModel.setConfigRule(configRule);
ocrRuleCheckSaveModel.setMetadataConfigId(metadataConfigId);
saveModelList.add(ocrRuleCheckSaveModel);
}
//update-begin-author:taoyan date:20190528 for:批量插入数据
long start = System.currentTimeMillis();
ocrRuleCheckService.saveModelBatch(saveModelList);
//400条 saveBatch消耗时间1592毫秒 循环插入消耗时间1947毫秒
//1200条 saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
//update-end-author:taoyan date:20190528 for:批量插入数据
return Result.ok("文件导入成功！数据行数：" + list.size());
} catch (Exception e) {
//update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示
String msg = e.getMessage();
log.error(msg, e);
if (msg != null && msg.indexOf("Duplicate entry") >= 0) {
@ -259,7 +294,6 @@ public class OcrRuleCheckController extends JeecgController<OcrRuleCheck, IOcrRu
}else {
return Result.error("文件导入失败:" + e.getMessage());
}
//update-end-author:taoyan date:20211124 for: 导入数据重复增加提示
} finally {
try {
file.getInputStream().close();

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

@ -67,6 +67,6 @@ public class OcrRuleCheck implements Serializable {
private String resultName;*/
@ApiModelProperty(value = "元数据配置id")
@Excel(name = "元数据配置id", width = 15)
/*@Excel(name = "元数据配置id", width = 15)*/
private String metadataConfigId;
}

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

@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.ocr.entity.OcrRuleCheck;
import org.jeecg.modules.ocr.vo.OcrRuleCheckVo;
import java.util.List;
import java.util.Map;
/**
@ -20,4 +21,6 @@ public interface OcrRuleCheckMapper extends BaseMapper<OcrRuleCheck> {
IPage<OcrRuleCheckVo> pageVo(@Param("page")Page<OcrRuleCheck> page,@Param("p") Map<String, Object> params);
OcrRuleCheckVo findById(String id);
List<OcrRuleCheckVo> allList(@Param("selectionList")List<String> selectionList);
}

15
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrRuleCheckMapper.xml
Unescape View File

@ -21,4 +21,19 @@
SELECT * FROM ocr_rule_check ocr
WHERE ocr.id = #{id}
</select>
<select id="allList" resultType="org.jeecg.modules.ocr.vo.OcrRuleCheckVo">
SELECT
ocr.*,omc.config_name as metadataConfigName
FROM ocr_rule_check ocr
LEFT JOIN ocr_metadata_config omc ON omc.id = ocr.metadata_config_id
WHERE 1=1
<if test="selectionList!=null">
AND ocr.id in
<foreach item="id" collection="selectionList" open="(" separator="," close=")">
#{id}
</foreach>
</if>
order by ocr.update_time desc
</select>
</mapper>

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

@ -36,8 +36,10 @@ public class OcrRuleCheckSaveModel implements Serializable {
private String configRule;
/**选择的元数据明细id*/
@ApiModelProperty(value = "选择的元数据id")
@Excel(name = "元数据配置id", width = 15)
public String metadataConfigId;
@ApiModelProperty(value = "元数据配置名称")
@Excel(name = "元数据配置名称", width = 15,fixedIndex = 9)
private String metadataConfigName;
/**选择的元数据明细id*/
//@ApiModelProperty(value = "选择的元数据明细id")
//public List<String> metadataConfigDetailIdList=new ArrayList<>();

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

@ -16,18 +16,58 @@ import java.util.List;
* @Version: V1.0
*/
public interface IOcrRuleCheckService extends IService<OcrRuleCheck> {
/**
* 判断配置名称是否已存在
* @param configName
* @param id
* @return
*/
boolean existsByConfigName(String configName, String id);
/**
* 新增
* @param ocrRuleCheckSaveModel
*/
void saveModel(OcrRuleCheckSaveModel ocrRuleCheckSaveModel);
/**
* 更新
* @param ocrRuleCheckSaveModel
* @return
*/
OcrRuleCheck updateModel(OcrRuleCheckSaveModel ocrRuleCheckSaveModel);
/**
* 删除
* @param id
*/
void removeById(String id);
/**
* 分页列表
* @param page
* @param ocrRuleCheck
* @return
*/
IPage<OcrRuleCheckVo> pageVo(Page<OcrRuleCheck> page, OcrRuleCheck ocrRuleCheck);
/**
* 自定义根据id查询
* @param ruleCheck
* @return
*/
OcrRuleCheckVo findById(String ruleCheck);
/**
* 批量新增
* @param saveModelList
*/
void saveModelBatch(List<OcrRuleCheckSaveModel> saveModelList);
/**
* 根据id获取列表
* @param selectionList
* @return
*/
List<OcrRuleCheckVo> allList(List<String> selectionList);
}

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

@ -62,6 +62,11 @@ public class OcrRuleCheckServiceImpl extends ServiceImpl<OcrRuleCheckMapper, Ocr
}
}
@Override
public List<OcrRuleCheckVo> allList(List<String> selectionList) {
return baseMapper.allList(selectionList);
}
@Override
public OcrRuleCheck updateModel(OcrRuleCheckSaveModel ocrRuleCheckSaveModel) {
OcrRuleCheck ocrRuleCheck=this.getById(ocrRuleCheckSaveModel.getId());

1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/vo/OcrRuleCheckVo.java
Unescape View File

@ -29,6 +29,7 @@ public class OcrRuleCheckVo extends OcrRuleCheck {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "元数据配置名称")
@Excel(name = "元数据配置名称", width = 15,fixedIndex = 9)
private String metadataConfigName;
private Map<String,String> configRuleMap=new LinkedHashMap<>();

Write Preview
Loading…
Cancel
Save