diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java index 1fb82a3..2c10c18 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java @@ -223,7 +223,7 @@ public class OcrIdentifyServiceImpl extends ServiceImpl saveOcrRuleCheckVOS) { for (SaveOcrRuleCheckVO saveOcrRuleCheckVO : saveOcrRuleCheckVOS) { OcrRuleCheck ocrRuleCheck=new OcrRuleCheck(); + if (StringUtils.isNotBlank(saveOcrRuleCheckVO.getConfigRule())) { + if (saveOcrRuleCheckVO.getConfigRule().contains("isrule=1") && saveOcrRuleCheckVO.getConfigRule().replace("isrule=1","").length()>0) { + throw new JeecgBootException("isrule=1规则只可单独使用"); + } + } ocrRuleCheck.setConfigRule(saveOcrRuleCheckVO.getConfigRule()); ocrRuleCheck.setMetadataConfigId(saveOcrRuleCheckVO.getMetadataConfigId()); ocrRuleCheck.setConfigName(saveOcrRuleCheckVO.getConfigName()); @@ -78,20 +84,27 @@ public class OcrRuleCheckServiceImpl extends ServiceImpl queryWrapper=new LambdaQueryWrapper<>(); - queryWrapper.eq(OcrRuleCheck::getConfigName,ruleCheck.getConfigName()); - long count = this.count(queryWrapper); - ruleCheck.setId(null); - ruleCheck.setConfigName(ruleCheck.getConfigName()+"("+(count+1)+")"); - this.save(ruleCheck); + String ids = ocrRuleCheck.getId(); + for (String id : ids.split(",")) { + OcrRuleCheck ruleCheck = this.getById(id); + LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.eq(OcrRuleCheck::getConfigName,ruleCheck.getConfigName()); + long count = this.count(queryWrapper); + ruleCheck.setId(null); + ruleCheck.setConfigName(ruleCheck.getConfigName()+"("+(count+1)+")"); + this.save(ruleCheck); + } return true; } @Override public OcrRuleCheck updateModel(SaveOcrRuleCheckVO saveOcrRuleCheckVO) { OcrRuleCheck ocrRuleCheck=this.getById(saveOcrRuleCheckVO.getId()); + if (StringUtils.isNotBlank(saveOcrRuleCheckVO.getConfigRule())) { + if (saveOcrRuleCheckVO.getConfigRule().contains("isrule=1") && saveOcrRuleCheckVO.getConfigRule().replace("isrule=1","").length()>0) { + throw new JeecgBootException("isrule=1规则只可单独使用"); + } + } ocrRuleCheck.setConfigRule(saveOcrRuleCheckVO.getConfigRule()); ocrRuleCheck.setMetadataConfigId(saveOcrRuleCheckVO.getMetadataConfigId()); ocrRuleCheck.setConfigName(saveOcrRuleCheckVO.getConfigName());