From b0c292c3baa2c8df6cd5f6875a8fbe046a5f3a5c Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Tue, 25 Jul 2023 09:43:43 +0800 Subject: [PATCH] updates --- .../ocr/controller/OcrIdentifyController.java | 2 +- .../OcrMetadataConfigController.java | 40 +- .../controller/OcrRuleCheckController.java | 428 ++++++++++-------- .../modules/ocr/entity/OcrRuleCheck.java | 2 +- .../ocr/mapper/OcrRuleCheckMapper.java | 3 + .../ocr/mapper/xml/OcrRuleCheckMapper.xml | 15 + .../ocr/model/OcrRuleCheckSaveModel.java | 4 +- .../ocr/service/IOcrRuleCheckService.java | 42 +- .../service/impl/OcrRuleCheckServiceImpl.java | 5 + .../jeecg/modules/ocr/vo/OcrRuleCheckVo.java | 1 + 10 files changed, 316 insertions(+), 226 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyController.java index ecc1148..3410dea 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyController.java @@ -160,7 +160,7 @@ public class OcrIdentifyController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(ocrMetadataConfig, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = ocrMetadataConfigService.pageVo(page, ocrMetadataConfig); return Result.OK(pageList); @@ -235,7 +225,6 @@ public class OcrMetadataConfigController extends JeecgController 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 saveModelList=new ArrayList<>(); - OcrMetadataConfigSaveModel ocrMetadataConfigSaveModel=null; - List ocrMetadataConfigDetailList=null; - OcrMetadataConfigDetail ocrMetadataConfigDetail=null; + //元数据循环copy add的对象 + OcrMetadataConfigSaveModel ocrMetadataConfigSaveModel; + //元数据循环遍历用的对象 + List ocrMetadataConfigDetailList; + OcrMetadataConfigDetail ocrMetadataConfigDetail; + + String resultName;//字段 + String getField;//字段描述 + List resultList; + List 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 resultList=new ArrayList<>(); - List 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=0){ @@ -318,7 +309,6 @@ public class OcrMetadataConfigController extends JeecgController { - @Autowired - private IOcrRuleCheckService ocrRuleCheckService; - @Autowired - private DownloadTemplateUtil downloadTemplateUtil; - @Autowired - private IOcrMetadataConfigService ocrMetadataConfigService; - /** - * 分页列表查询 - * - * @param ocrRuleCheck - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "规则检查配置-分页列表查询") - @ApiOperation(value="规则检查配置-分页列表查询", notes="规则检查配置-分页列表查询") - @GetMapping(value = "/list") - 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()+"*"); - } + @Autowired + private IOcrRuleCheckService ocrRuleCheckService; + @Autowired + private DownloadTemplateUtil downloadTemplateUtil; + @Autowired + private IOcrMetadataConfigService ocrMetadataConfigService; + @Resource + private JeecgBaseConfig jeecgBaseConfig; + + /** + * 分页列表查询 + * + * @param ocrRuleCheck + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "规则检查配置-分页列表查询") + @ApiOperation(value = "规则检查配置-分页列表查询", notes = "规则检查配置-分页列表查询") + @GetMapping(value = "/list") + 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())){ ocrRuleCheck.setResultName("*"+ocrRuleCheck.getResultName()+"*"); }*/ - if (StringUtils.isNotBlank(ocrRuleCheck.getConfigRule())){ - ocrRuleCheck.setConfigRule("*"+ocrRuleCheck.getConfigRule()+"*"); - } - Page page = new Page(pageNo, pageSize); - IPage pageList = ocrRuleCheckService.pageVo(page, ocrRuleCheck); - return Result.OK(pageList); - } - - /** - * 添加 - * @param ocrRuleCheckSaveModel - * @return - */ - @AutoLog(value = "规则检查配置-添加") - @ApiOperation(value="规则检查配置-添加", notes="规则检查配置-添加") + if (StringUtils.isNotBlank(ocrRuleCheck.getConfigRule())) { + ocrRuleCheck.setConfigRule("*" + ocrRuleCheck.getConfigRule() + "*"); + } + Page page = new Page(pageNo, pageSize); + IPage pageList = ocrRuleCheckService.pageVo(page, ocrRuleCheck); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param ocrRuleCheckSaveModel + * @return + */ + @AutoLog(value = "规则检查配置-添加") + @ApiOperation(value = "规则检查配置-添加", notes = "规则检查配置-添加") // @RequiresPermissions("org.jeecg.modules.ocr:ocr_rule_check:add") - @PostMapping(value = "/add") - public Result add(@RequestBody OcrRuleCheckSaveModel ocrRuleCheckSaveModel) { - checkSaveModel(ocrRuleCheckSaveModel); - String configName = ocrRuleCheckSaveModel.getConfigName(); - boolean existsFlag=ocrRuleCheckService.existsByConfigName(configName,null);//true 已存在,false不存在 - AssertUtils.notTrue(existsFlag,String.format("[配置名称]-%s 已存在",configName)); - ocrRuleCheckService.saveModel(ocrRuleCheckSaveModel); - return Result.OK("添加成功！"); - } + @PostMapping(value = "/add") + public Result add(@RequestBody OcrRuleCheckSaveModel ocrRuleCheckSaveModel) { + checkSaveModel(ocrRuleCheckSaveModel); + String configName = ocrRuleCheckSaveModel.getConfigName(); + boolean existsFlag = ocrRuleCheckService.existsByConfigName(configName, null);//true 已存在,false不存在 + AssertUtils.notTrue(existsFlag, String.format("[配置名称]-%s 已存在", configName)); + ocrRuleCheckService.saveModel(ocrRuleCheckSaveModel); + return Result.OK("添加成功！"); + } - /** - * 校验保存时入参是否可通过 - * @param ocrRuleCheckSaveModel - */ - public void checkSaveModel(OcrRuleCheckSaveModel ocrRuleCheckSaveModel){ - AssertUtils.notEmpty(ocrRuleCheckSaveModel.getConfigName(),"[配置名称]不可为空"); - } + /** + * 校验保存时入参是否可通过 + * + * @param ocrRuleCheckSaveModel + */ + public void checkSaveModel(OcrRuleCheckSaveModel ocrRuleCheckSaveModel) { + AssertUtils.notEmpty(ocrRuleCheckSaveModel.getConfigName(), "[配置名称]不可为空"); + } - /** - * 编辑 - * - * @param ocrRuleCheckSaveModel - * @return - */ - @AutoLog(value = "规则检查配置-编辑") - @ApiOperation(value="规则检查配置-编辑", notes="规则检查配置-编辑") + /** + * 编辑 + * + * @param ocrRuleCheckSaveModel + * @return + */ + @AutoLog(value = "规则检查配置-编辑") + @ApiOperation(value = "规则检查配置-编辑", notes = "规则检查配置-编辑") // @RequiresPermissions("org.jeecg.modules.ocr:ocr_rule_check:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody OcrRuleCheckSaveModel ocrRuleCheckSaveModel) { - checkSaveModel(ocrRuleCheckSaveModel); - String configName = ocrRuleCheckSaveModel.getConfigName(); - AssertUtils.notEmpty(ocrRuleCheckSaveModel.getId(),"[id]不可为空"); - boolean existsFlag=ocrRuleCheckService.existsByConfigName(configName,ocrRuleCheckSaveModel.getId());//true 已存在,false不存在 - AssertUtils.notTrue(existsFlag,String.format("[配置名称]-%s 已存在",configName)); - ocrRuleCheckService.updateModel(ocrRuleCheckSaveModel); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "规则检查配置-通过id删除") - @ApiOperation(value="规则检查配置-通过id删除", notes="规则检查配置-通过id删除") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody OcrRuleCheckSaveModel ocrRuleCheckSaveModel) { + checkSaveModel(ocrRuleCheckSaveModel); + String configName = ocrRuleCheckSaveModel.getConfigName(); + AssertUtils.notEmpty(ocrRuleCheckSaveModel.getId(), "[id]不可为空"); + boolean existsFlag = ocrRuleCheckService.existsByConfigName(configName, ocrRuleCheckSaveModel.getId());//true 已存在,false不存在 + AssertUtils.notTrue(existsFlag, String.format("[配置名称]-%s 已存在", configName)); + ocrRuleCheckService.updateModel(ocrRuleCheckSaveModel); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "规则检查配置-通过id删除") + @ApiOperation(value = "规则检查配置-通过id删除", notes = "规则检查配置-通过id删除") // @RequiresPermissions("org.jeecg.modules.ocr:ocr_rule_check:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - ocrRuleCheckService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "规则检查配置-批量删除") - @ApiOperation(value="规则检查配置-批量删除", notes="规则检查配置-批量删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + ocrRuleCheckService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "规则检查配置-批量删除") + @ApiOperation(value = "规则检查配置-批量删除", notes = "规则检查配置-批量删除") // @RequiresPermissions("org.jeecg.modules.ocr:ocr_rule_check:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.ocrRuleCheckService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "规则检查配置-通过id查询") - @ApiOperation(value="规则检查配置-通过id查询", notes="规则检查配置-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - OcrRuleCheck ocrRuleCheck = ocrRuleCheckService.getById(id); - if(ocrRuleCheck==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(ocrRuleCheck); - } + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.ocrRuleCheckService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "规则检查配置-通过id查询") + @ApiOperation(value = "规则检查配置-通过id查询", notes = "规则检查配置-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + OcrRuleCheck ocrRuleCheck = ocrRuleCheckService.getById(id); + if (ocrRuleCheck == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(ocrRuleCheck); + } /** - * 导出excel - * - * @param request - * @param ocrRuleCheck - */ + * 导出excel + * + * @param request + * @param ocrRuleCheck + */ // @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 exportList = new ArrayList<>(); + if (oConvertUtils.isNotEmpty(selections)) { + List 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; } - /** - * 下载模板 - */ - @RequestMapping(value = "/downloadTemplate") - public ModelAndView downloadTemplate() { - return downloadTemplateUtil.downloadTemplate(OcrRuleCheck.class,"规则检查配置"); - } + /** + * 下载模板 + */ + @RequestMapping(value = "/downloadTemplate") + public ModelAndView downloadTemplate() { + return downloadTemplateUtil.downloadTemplate(OcrRuleCheck.class, "规则检查配置"); + } /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ // @RequiresPermissions("org.jeecg.modules.ocr:ocr_rule_check:importExcel") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - Map fileMap = multipartRequest.getFileMap(); - for (Map.Entry entity : fileMap.entrySet()) { - // 获取上传文件对象 - MultipartFile file = entity.getValue(); - ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(1); - params.setNeedSave(true); - try { - List list = ExcelImportUtil.importExcel(file.getInputStream(), OcrRuleCheckSaveModel.class, params); - AssertUtils.hasSize(list,"未获取到数据！"); - //判断重复字段名 - Map 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 saveModelList=new ArrayList<>(); - OcrRuleCheckSaveModel ocrRuleCheckSaveModel=new OcrRuleCheckSaveModel(); - for (OcrRuleCheckSaveModel configVo : list) { - ocrRuleCheckSaveModel.setConfigName(configVo.getConfigName()); - boolean 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)); - 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){ - return Result.error("文件导入失败:有重复数据！"); - }else{ - return Result.error("文件导入失败:" + e.getMessage()); - } - //update-end-author:taoyan date:20211124 for: 导入数据重复增加提示 - } finally { - try { - file.getInputStream().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return Result.error("文件导入失败！"); + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + // 获取上传文件对象 + MultipartFile file = entity.getValue(); + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List list = ExcelImportUtil.importExcel(file.getInputStream(), OcrRuleCheckSaveModel.class, params); + AssertUtils.hasSize(list, "未获取到数据！"); + //判断重复字段名 + Map 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 metadataConfigNameMap = ocrMetadataConfigService.list(new LambdaQueryWrapper<>()).stream().collect(Collectors.toMap(OcrMetadataConfig::getConfigName, OcrMetadataConfig::getId)); + List saveModelList = new ArrayList<>(); + OcrRuleCheckSaveModel ocrRuleCheckSaveModel; + boolean existsFlag = false; + String configRule;//规则配置 + String metadataConfigName;//元数据配置名称 + String metadataConfigId;//元数据配置id + for (OcrRuleCheckSaveModel configVo : list) { + 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())); + AssertUtils.notEmpty(metadataConfigId, String.format("[元数据配置]-%s 不存在", metadataConfigName)); + ocrRuleCheckSaveModel.setConfigName(configVo.getConfigName()); + ocrRuleCheckSaveModel.setConfigRule(configRule); + ocrRuleCheckSaveModel.setMetadataConfigId(metadataConfigId); + saveModelList.add(ocrRuleCheckSaveModel); + } + long start = System.currentTimeMillis(); + ocrRuleCheckService.saveModelBatch(saveModelList); + log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒"); + return Result.ok("文件导入成功！数据行数：" + list.size()); + } catch (Exception e) { + String msg = e.getMessage(); + log.error(msg, e); + if (msg != null && msg.indexOf("Duplicate entry") >= 0) { + return Result.error("文件导入失败:有重复数据！"); + }else { + return Result.error("文件导入失败:" + e.getMessage()); + } + } finally { + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return Result.error("文件导入失败！"); } } 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 6eb3821..d799ca6 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 @@ -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; } 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 c36bee4..c41c5f5 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 @@ -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 { IPage pageVo(@Param("page")Page page,@Param("p") Map params); OcrRuleCheckVo findById(String id); + + List allList(@Param("selectionList")List selectionList); } 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 e3152ab..70e6a26 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 @@ -21,4 +21,19 @@ SELECT * FROM ocr_rule_check ocr WHERE ocr.id = #{id} + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/model/OcrRuleCheckSaveModel.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/model/OcrRuleCheckSaveModel.java index 9e3a366..014428f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/model/OcrRuleCheckSaveModel.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/model/OcrRuleCheckSaveModel.java @@ -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 metadataConfigDetailIdList=new ArrayList<>(); 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 77111b0..b9fb14d 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 @@ -16,18 +16,58 @@ import java.util.List; * @Version: V1.0 */ public interface IOcrRuleCheckService extends IService { - + /** + * 判断配置名称是否已存在 + * @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 pageVo(Page page, OcrRuleCheck ocrRuleCheck); + /** + * 自定义根据id查询 + * @param ruleCheck + * @return + */ OcrRuleCheckVo findById(String ruleCheck); + /** + * 批量新增 + * @param saveModelList + */ void saveModelBatch(List saveModelList); + + /** + * 根据id获取列表 + * @param selectionList + * @return + */ + List allList(List selectionList); } 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 8de541a..9425349 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 @@ -62,6 +62,11 @@ public class OcrRuleCheckServiceImpl extends ServiceImpl allList(List selectionList) { + return baseMapper.allList(selectionList); + } + @Override public OcrRuleCheck updateModel(OcrRuleCheckSaveModel ocrRuleCheckSaveModel) { OcrRuleCheck ocrRuleCheck=this.getById(ocrRuleCheckSaveModel.getId()); 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 index 74e70d1..ed7a868 100644 --- 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 @@ -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 configRuleMap=new LinkedHashMap<>();