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

updates

Browse Source
master
周文涛 2 years ago
parent 2d40a3c2ee
commit fdc9480961
7 changed files with 75 additions and 8 deletions
Show Stats Download Patch File Download Diff File

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

@ -22,6 +22,7 @@ import org.jeecg.modules.ocr.model.OcrRuleCheckSaveModel;
import org.jeecg.modules.ocr.service.IOcrRuleCheckService;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.ocr.utils.DownloadTemplateUtil;
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;
@ -58,28 +59,26 @@ public class OcrRuleCheckController extends JeecgController<OcrRuleCheck, IOcrRu
//@AutoLog(value = "规则检查配置-分页列表查询")
@ApiOperation(value="规则检查配置-分页列表查询", notes="规则检查配置-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<OcrRuleCheck>> queryPageList(OcrRuleCheck ocrRuleCheck,
public Result<IPage<OcrRuleCheckVo>> queryPageList(OcrRuleCheck ocrRuleCheck,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
if (StringUtils.isNotBlank(ocrRuleCheck.getConfigName())){
ocrRuleCheck.setConfigName("*"+ocrRuleCheck.getConfigName()+"*");
}
if (StringUtils.isNotBlank(ocrRuleCheck.getResultName())){
/*if (StringUtils.isNotBlank(ocrRuleCheck.getResultName())){
ocrRuleCheck.setResultName("*"+ocrRuleCheck.getResultName()+"*");
}
}*/
if (StringUtils.isNotBlank(ocrRuleCheck.getConfigRule())){
ocrRuleCheck.setConfigRule("*"+ocrRuleCheck.getConfigRule()+"*");
}
QueryWrapper<OcrRuleCheck> queryWrapper = QueryGenerator.initQueryWrapper(ocrRuleCheck, req.getParameterMap());
Page<OcrRuleCheck> page = new Page<OcrRuleCheck>(pageNo, pageSize);
IPage<OcrRuleCheck> pageList = ocrRuleCheckService.page(page, queryWrapper);
IPage<OcrRuleCheckVo> pageList = ocrRuleCheckService.pageVo(page, ocrRuleCheck);
return Result.OK(pageList);
}
/**
* 添加
*
* @param ocrRuleCheckSaveModel
* @return
*/

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

@ -62,9 +62,9 @@ public class OcrRuleCheck implements Serializable {
@ApiModelProperty(value = "配置规则")
private String configRule;
/**结果名称*/
@Excel(name = "结果名称", width = 15)
/*@Excel(name = "结果名称", width = 15)
@ApiModelProperty(value = "结果名称")
private String resultName;
private String resultName;*/
@ApiModelProperty(value = "元数据配置id")
private String metadataConfigId;

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

@ -1,7 +1,13 @@
package org.jeecg.modules.ocr.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.ocr.entity.OcrRuleCheck;
import org.jeecg.modules.ocr.vo.OcrRuleCheckVo;
import java.util.Map;
/**
* @Description: 规则检查配置
@ -11,4 +17,5 @@ import org.jeecg.modules.ocr.entity.OcrRuleCheck;
*/
public interface OcrRuleCheckMapper extends BaseMapper<OcrRuleCheck> {
IPage<OcrRuleCheckVo> pageVo(@Param("page")Page<OcrRuleCheck> page,@Param("p") Map<String, Object> params);
}

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

@ -2,4 +2,18 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.ocr.mapper.OcrRuleCheckMapper">
<select id="pageVo" resultType="org.jeecg.modules.ocr.vo.OcrRuleCheckVo">
SELECT
orc.*,omc.config_name as metadataConfigName
FROM ocr_rule_check orc
LEFT JOIN ocr_metadata_config omc ON omc.id = orc.metadata_config_id
WHERE 1=1
<if test="p.configName!=null and p.configName!=''">
orc.config_name like concat('%',#{p.configName},'%')
</if>
<if test="p.configRule!=null and p.configRule!=''">
orc.config_rule like concat('%',#{configRule},'%')
</if>
order by orc.update_time desc
</select>
</mapper>

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

@ -1,8 +1,11 @@
package org.jeecg.modules.ocr.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.ocr.entity.OcrRuleCheck;
import org.jeecg.modules.ocr.model.OcrRuleCheckSaveModel;
import org.jeecg.modules.ocr.vo.OcrRuleCheckVo;
/**
* @Description: 规则检查配置
@ -19,4 +22,6 @@ public interface IOcrRuleCheckService extends IService<OcrRuleCheck> {
OcrRuleCheck updateModel(OcrRuleCheckSaveModel ocrRuleCheckSaveModel);
void removeById(String id);
IPage<OcrRuleCheckVo> pageVo(Page<OcrRuleCheck> page, OcrRuleCheck ocrRuleCheck);
}

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

@ -1,6 +1,8 @@
package org.jeecg.modules.ocr.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang.StringUtils;
import org.jeecg.modules.ocr.entity.OcrMetadataConfig;
import org.jeecg.modules.ocr.entity.OcrMetadataConfigDetail;
@ -11,12 +13,15 @@ import org.jeecg.modules.ocr.model.OcrMetadataConfigSaveModel;
import org.jeecg.modules.ocr.model.OcrRuleCheckSaveModel;
import org.jeecg.modules.ocr.service.IOcrRuleCheckDetailService;
import org.jeecg.modules.ocr.service.IOcrRuleCheckService;
import org.jeecg.modules.ocr.vo.OcrRuleCheckVo;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/**
* @Description: 规则检查配置
@ -100,4 +105,10 @@ public class OcrRuleCheckServiceImpl extends ServiceImpl<OcrRuleCheckMapper, Ocr
removeQueryWrapper.eq(OcrRuleCheckDetail::getRuleCheckId,id);
ocrRuleCheckDetailService.remove(removeQueryWrapper);*/
}
@Override
public IPage<OcrRuleCheckVo> pageVo(Page<OcrRuleCheck> page, OcrRuleCheck ocrRuleCheck) {
Map<String,Object> params=new LinkedHashMap<>();
return baseMapper.pageVo(page,params);
}
}

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

@ -0,0 +1,31 @@
package org.jeecg.modules.ocr.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.modules.ocr.entity.OcrRuleCheck;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 规则检查配置
* @Author: jeecg-boot
* @Date: 2023-07-14
* @Version: V1.0
*/
@Data
public class OcrRuleCheckVo extends OcrRuleCheck {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "元数据配置名称")
private String metadataConfigName;
}
Write Preview
Loading…
Cancel
Save