diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrRuleCheckController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrRuleCheckController.java index 96dba81..9b2b7f2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrRuleCheckController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrRuleCheckController.java @@ -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> queryPageList(OcrRuleCheck ocrRuleCheck, + public Result> 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 queryWrapper = QueryGenerator.initQueryWrapper(ocrRuleCheck, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - IPage pageList = ocrRuleCheckService.page(page, queryWrapper); + IPage pageList = ocrRuleCheckService.pageVo(page, ocrRuleCheck); return Result.OK(pageList); } /** * 添加 - * * @param ocrRuleCheckSaveModel * @return */ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrRuleCheck.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrRuleCheck.java index 5c5f283..3dd89d7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrRuleCheck.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrRuleCheck.java @@ -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; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/OcrRuleCheckMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/OcrRuleCheckMapper.java index 5a446bd..790d2df 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/OcrRuleCheckMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/OcrRuleCheckMapper.java @@ -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 { + IPage pageVo(@Param("page")Page page,@Param("p") Map params); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrRuleCheckMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrRuleCheckMapper.xml index b5bc107..a52c9ad 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrRuleCheckMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrRuleCheckMapper.xml @@ -2,4 +2,18 @@ + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrRuleCheckService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrRuleCheckService.java index 4b110ec..b6d520d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrRuleCheckService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrRuleCheckService.java @@ -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 updateModel(OcrRuleCheckSaveModel ocrRuleCheckSaveModel); void removeById(String id); + + IPage pageVo(Page page, OcrRuleCheck ocrRuleCheck); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrRuleCheckServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrRuleCheckServiceImpl.java index d9f261c..0494d63 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrRuleCheckServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrRuleCheckServiceImpl.java @@ -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 pageVo(Page page, OcrRuleCheck ocrRuleCheck) { + Map params=new LinkedHashMap<>(); + return baseMapper.pageVo(page,params); + } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/vo/OcrRuleCheckVo.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/vo/OcrRuleCheckVo.java new file mode 100644 index 0000000..09f22d0 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/vo/OcrRuleCheckVo.java @@ -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; +}