配置文件修改

dev
郭向斌 2 years ago
parent e51ca5d1e8
commit f75553baf2

@ -17,8 +17,13 @@ public class OcrConstant {
*/
public static String ruleCheckSplitChar="&";
public static String ruleCheckOrChar="||";
public static String ruleHz="||";
public static String ruleZkh="\\(";
public static String ruleYkh="\\)";
public static String ruleDyh=">";
public static String ruleXyh="<";
public static String ruleTh="!";
public static String ruleBq="&&";
public static String ruleCheckValueRightChar="=";
/**

@ -90,6 +90,7 @@ public class OcrRuleCheckController extends JeecgController<OcrRuleCheck, IOcrRu
String configName = saveOcrRuleCheckVO.getConfigName();
boolean existsFlag = ocrRuleCheckService.existsByConfigName(configName, null);//true 已存在,false不存在
AssertUtils.notTrue(existsFlag, String.format("[配置名称]-%s 已存在", configName));
AssertUtils.notTrue(saveOcrRuleCheckVO.getType()==null, String.format("[是否或者并且组合规则] 为空"));
ocrRuleCheckService.saveModel(saveOcrRuleCheckVO);
return Result.OK("添加成功!");
}

@ -23,9 +23,9 @@ public class OcrRuleCheckDTO extends OcrRuleCheck {
@Excel(name = "元数据配置名称", width = 15)
private String metadataConfigName;
private String configRuleAdapter;
private Map<String,String> configRuleMap=new LinkedHashMap<>();
private Map<String,Object> configRuleMap=new LinkedHashMap<>();
private Map<String,String> fieldMap=new LinkedHashMap<>();
Map<String,Map<String,String>> configRuleTypeMap=new LinkedHashMap<>();
Map<String,Map<String,Object>> configRuleTypeMap=new LinkedHashMap<>();
}

@ -64,4 +64,7 @@ public class OcrRuleCheck implements Serializable {
@ApiModelProperty(value = "元数据配置id")
/*@Excel(name = "元数据配置id", width = 15)*/
private String metadataConfigId;
@ApiModelProperty(value = "是否并且或者表达式1不是2是")
private Integer type;
}

@ -411,7 +411,7 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
OcrIdentifyDTO ocrIdentifyDTO = this.findById(id);
//=======规则检查配置
OcrRuleCheckDTO ocrRuleCheckVo = ocrIdentifyDTO.getOcrRuleCheckVo();
Map<String, Map<String, String>> configRuleTypeMap = ocrRuleCheckVo.getConfigRuleTypeMap();
Map<String, Map<String, Object>> configRuleTypeMap = ocrRuleCheckVo.getConfigRuleTypeMap();
//===================
}
@ -550,27 +550,11 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
* @param configRuleMap 1/0 map
* @param fieldMap map
*/
public Map<String, CheckSemanticModel> getCheckSemanticModelMap(Map<String, String> configRuleMap, Map<String, String> fieldMap, List<JSONObject> sourceJsonObjects) {
public Map<String, CheckSemanticModel> getCheckSemanticModelMap(Map<String, Object> configRuleMap, Map<String, String> fieldMap, List<JSONObject> sourceJsonObjects) {
if (configRuleMap!=null && CollectionUtils.isNotEmpty(configRuleMap.keySet())) {
//将 configRuleMap的 key 创建一个Set
Set<String> keySet = new HashSet<>(configRuleMap.keySet());
//循环keySet判断字段是否是缩写如果是缩写就把缩写的全称put一下
for (String s : keySet) {
String value = configRuleMap.get(s);
if ("hn".equals(s)) {
configRuleMap.put("hospitalName",value);
}else if("dn".equals(s)) {
configRuleMap.put("doctorName", value);
}else if("dmn".equals(s)) {
configRuleMap.put("departmentName", value);
}else if("tm".equals(s) || ("time".equals(s))) {
configRuleMap.put("time", value);
}else{
configRuleMap.put(s,value);
}
//缩写转全称
OcrJudgmentTools.abbreviationToFullName(configRuleMap);
}
}
Map<String, CheckSemanticModel> checkSemanticModelMap = new LinkedHashMap<>();
//校验正确的值
Map<String, String> inputMap = new LinkedHashMap<>();
@ -610,7 +594,7 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
copyEntity.setField(field);
//1/0
if (configRuleMap != null && configRuleMap.containsKey(field)) {
configRule = configRuleMap.get(field);
configRule =String.valueOf(configRuleMap.get(field));
copyEntity.setRuleInfo(configRule);
//端字段含义
fieldName = fieldMap.get(field);
@ -735,6 +719,7 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
List<OcrResultDTO> ocrResultDTOList = new ArrayList<>();
Date startDataCheckTime = new Date();
Map<String, Boolean> fieldRightMap = new LinkedHashMap<>();//存放 字段判断正确map
OcrRuleCheckDTO ocrRuleCheckVo = ocrRuleCheckService.findById(simulateChecksVO.getRuleCheckId());
for (OcrIdentifyDetail ocrIdentifyDetail : identifyDetailList) {
i1++;
String semanticResultJson = ocrIdentifyDetail.getSemanticResult();
@ -806,8 +791,6 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
}
//============================
}
OcrRuleCheckDTO ocrRuleCheckVo = ocrRuleCheckService.findById(simulateChecksVO.getRuleCheckId());
Map<String, CheckSemanticModel> checkSemanticModelMap = getCheckSemanticModelMap(ocrRuleCheckVo.getConfigRuleMap(), ocrRuleCheckVo.getFieldMap(), sourceJson);
String text = null;//ocr 识别的文本
Double probability = 0d;
@ -910,6 +893,7 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
}
}
if (ocrArray.size() > 0) {
if(ocrRuleCheckVo.getType()==null||ocrRuleCheckVo.getType()==1){
for (JSONObject ocrItem : ocrArray) {
text = null;
text = ocrItem.getString("text");//ocr 识别的文本
@ -970,6 +954,62 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
}
}
}
} else if (ocrRuleCheckVo.getType()!= null&&ocrRuleCheckVo.getType()==2) {
for (JSONObject ocrItem : ocrArray) {
text = null;
text = ocrItem.getString("text");//ocr 识别的文本
probability = ocrItem.getDouble("probability");//置信度
if ("101".equals(ruleInfo)) {
if (StringUtils.isBlank(text) || StringUtils.isBlank(inputText)) {
//没识别值
mapPutIfTrue(fieldRightMap, field, true);
ocrResultAdd(ocrResultDTOList, value.getFieldName(), field, inputText, null, probability, imgPath, value.getFieldName() + "参数不判断", true, ruleInfo);
} else {
double v = StrCharUtil.similarityRatio(inputText, text);
if (text.equals(inputText)) {
mapPutIfTrue(fieldRightMap, field, true);
ocrResultAdd(ocrResultDTOList, value.getFieldName(), field, inputText, text, probability, imgPath, "", true, v, "101");
} else {
rMessage.append(value.getFieldName()).append("参数不匹配<br>");
mapPutIfTrue(fieldRightMap, field, false);
ocrResultAdd(ocrResultDTOList, value.getFieldName(), field, inputText, text, probability, imgPath, value.getFieldName() + "参数不匹配", false, v, ruleInfo);
}
}
} else {
if (StringUtils.isBlank(text)) {
//ocr识别参数为空不通过
rMessage.append(value.getFieldName()).append("参数未获取到结果<br>");
mapPutIfTrue(fieldRightMap, field, false);
ocrResultAdd(ocrResultDTOList, value.getFieldName(), field, inputText, null, probability, imgPath, value.getFieldName() + "参数未获取到结果", false, ruleInfo);
} else if (StringUtils.isBlank(inputText)) {
//没有输入值.
fieldRightMap.put(field, false);
ocrResultAdd(ocrResultDTOList, value.getFieldName(), field, inputText, text, probability, imgPath, "没有输入值", false, ruleInfo);
} else if ("0".equals(ruleInfo)) {
//不必校验,有识别到就行,通过
fieldRightMap.put(field, true);
ocrResultAdd(ocrResultDTOList, value.getFieldName(), field, inputText, text, probability, imgPath, "", true, ruleInfo);
} else if (Double.parseDouble(ruleInfo) >= 1 && Double.parseDouble(ruleInfo) <= 99) {
//在1~99之间根据精准度匹配
double v = StrCharUtil.similarityRatio(inputText, text);
//准确度 可靠
fieldRightMap.put(field, true);
ocrResultAdd(ocrResultDTOList, value.getFieldName(), field, inputText, text, probability, imgPath, "", true, v, ruleInfo);
} else if ("100".equals(ruleInfo)) {
//必定验证参数,必须有值且匹配
double v = StrCharUtil.similarityRatio(inputText, text);
if (text.equals(inputText)) {
fieldRightMap.put(field, true);
ocrResultAdd(ocrResultDTOList, value.getFieldName(), field, inputText, text, probability, imgPath, "", true, v, ruleInfo);
} else {
rMessage.append(value.getFieldName()).append("参数不匹配<br>");
mapPutIfTrue(fieldRightMap, field, false);
ocrResultAdd(ocrResultDTOList, value.getFieldName(), field, inputText, text, probability, imgPath, value.getFieldName() + "参数不匹配", false, v, ruleInfo);
}
}
}
}
}
} else {
rMessage.append(value.getFieldName()).append("参数未获取到结果<br>");
mapPutIfTrue(fieldRightMap, field, false);
@ -1005,9 +1045,20 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
//没有匹配结果
responseBody.put("taskResult",1);
}else{
if(ocrRuleCheckVo.getType()==null||ocrRuleCheckVo.getType()==1){
long count = fieldRightMap.values().stream().filter(o->!o).count();
//long count = ocrResultDTOList.stream().filter(o -> !o.getRuleValidation()).count();
responseBody.put("taskResult",count>0?0:1);//匹配成功或失败
}else if(ocrRuleCheckVo.getType()!=null&&ocrRuleCheckVo.getType()==2){
log.info(ocrResultDTOList.toString());
String configRule = ocrRuleCheckVo.getConfigRule();
Map<String,Object> params=new HashMap<>();
for(OcrResultDTO ocrResultDTO:ocrResultDTOList){
params.put(ocrResultDTO.getTag(),ocrResultDTO.getTextRate());
}
Boolean rest=OcrJudgmentTools.judment(configRule,params);
responseBody.put("taskResult",rest?0:1);
}
Set<String> haveRateTagList = ocrResultDTOList.stream().filter(o -> o.getTextRate() > 0).map(OcrResultDTO::getTag).collect(Collectors.toSet());
List<OcrResultDTO> newResultDTOList=new ArrayList<>();
//过滤掉0的值

@ -18,6 +18,8 @@ import org.jeecg.modules.ocr.mapper.OcrMetadataConfigMapper;
import org.jeecg.modules.ocr.mapper.OcrRuleCheckMapper;
import org.jeecg.modules.ocr.service.IOcrRuleCheckDetailService;
import org.jeecg.modules.ocr.service.IOcrRuleCheckService;
import org.jeecg.modules.ocr.utils.OcrJudgmentTools;
import org.jeecg.modules.ocr.utils.StrCharUtil;
import org.jeecg.modules.ocr.vo.SaveOcrRuleCheckVO;
import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Service;
@ -39,10 +41,6 @@ import java.util.stream.Collectors;
*/
@Service
public class OcrRuleCheckServiceImpl extends ServiceImpl<OcrRuleCheckMapper, OcrRuleCheck> implements IOcrRuleCheckService {
@Resource
IOcrRuleCheckDetailService ocrRuleCheckDetailService;
@Resource
OcrMetadataConfigMapper ocrMetadataConfigMapper;
@Resource
OcrMetadataConfigDetailMapper ocrMetadataConfigDetailMapper;
@Override
@ -62,14 +60,31 @@ public class OcrRuleCheckServiceImpl extends ServiceImpl<OcrRuleCheckMapper, Ocr
public void saveModelBatch(List<SaveOcrRuleCheckVO> saveOcrRuleCheckVOS) {
for (SaveOcrRuleCheckVO saveOcrRuleCheckVO : saveOcrRuleCheckVOS) {
OcrRuleCheck ocrRuleCheck=new OcrRuleCheck();
if(saveOcrRuleCheckVO.getType()==null||saveOcrRuleCheckVO.getType()==1){
if (StringUtils.isNotBlank(saveOcrRuleCheckVO.getConfigRule())) {
if (saveOcrRuleCheckVO.getConfigRule().contains("isrule=1") && saveOcrRuleCheckVO.getConfigRule().replace("isrule=1","").length()>0) {
throw new JeecgBootException("isrule=1规则只可单独使用");
}
}
saveOcrRuleCheckVO.setType(1);
}else if(saveOcrRuleCheckVO.getType()==2){
String configRule = saveOcrRuleCheckVO.getConfigRule();
String metadataConfigId = saveOcrRuleCheckVO.getMetadataConfigId();
//获取规则配置元字段
List<OcrMetadataConfigDetail> ocrMetadataConfigDetails = ocrMetadataConfigDetailMapper.selectList(new LambdaQueryWrapper<OcrMetadataConfigDetail>().eq(OcrMetadataConfigDetail::getMetadataConfigId, metadataConfigId));
Map<String,Object> params=new HashMap<>();
for(OcrMetadataConfigDetail configDetail:ocrMetadataConfigDetails){
String fieldName = configDetail.getFieldName();
params.put(fieldName,1);
}
OcrJudgmentTools.fullNameToAbbreviation(params);
//做下表达式校验,看表达式是否正确,如果不正确这个方法里面会抛出异常如果正确就继续入库
OcrJudgmentTools.judment(configRule, params);
}
ocrRuleCheck.setConfigRule(saveOcrRuleCheckVO.getConfigRule());
ocrRuleCheck.setMetadataConfigId(saveOcrRuleCheckVO.getMetadataConfigId());
ocrRuleCheck.setConfigName(saveOcrRuleCheckVO.getConfigName());
ocrRuleCheck.setType(saveOcrRuleCheckVO.getType());
this.save(ocrRuleCheck);
}
}
@ -333,13 +348,14 @@ public class OcrRuleCheckServiceImpl extends ServiceImpl<OcrRuleCheckMapper, Ocr
OcrRuleCheckDTO ocrRuleCheckVo = baseMapper.findById(id);
AssertUtils.notNull(ocrRuleCheckVo,id+"-规则检查配置不存在");
if (StringUtils.isNotBlank(ocrRuleCheckVo.getConfigRule())) {
if(ocrRuleCheckVo.getType()==null||ocrRuleCheckVo.getType()==1){
String configRule = ocrRuleCheckVo.getConfigRule();
//TODO {key(&,||):{key(字段):value(1/0)}}
Map<String,Map<String,String>> configRuleTypeMap=new LinkedHashMap<>();
if (configRule.contains(OcrConstant.ruleCheckOrChar)) {
Map<String,Map<String,Object>> configRuleTypeMap=new LinkedHashMap<>();
if (configRule.contains(OcrConstant.ruleHz)) {
// ||
String[] orSplit = configRule.split(OcrConstant.ruleCheckOrChar);
Map<String,String> configRuleMap=new LinkedHashMap<>();
String[] orSplit = configRule.split(OcrConstant.ruleHz);
Map<String,Object> configRuleMap=new LinkedHashMap<>();
String field=null;String fieldValue=null;
for (String s : orSplit) {
configRuleMap=new LinkedHashMap<>();
@ -349,12 +365,12 @@ public class OcrRuleCheckServiceImpl extends ServiceImpl<OcrRuleCheckMapper, Ocr
}
configRuleMap.put(split1[0],split1[1]);
}
configRuleTypeMap.put(OcrConstant.ruleCheckOrChar,configRuleMap);
configRuleTypeMap.put(OcrConstant.ruleHz,configRuleMap);
}else {
//&
String[] split = configRule.split(OcrConstant.ruleCheckSplitChar);
//将 `配置规则` 转成 map
Map<String,String> configRuleMap=new LinkedHashMap<>();
Map<String,Object> configRuleMap=new LinkedHashMap<>();
for (String s : split) {
String[] split1 = s.split(OcrConstant.ruleCheckValueRightChar);
if (split1.length<=1) {
@ -366,6 +382,11 @@ public class OcrRuleCheckServiceImpl extends ServiceImpl<OcrRuleCheckMapper, Ocr
configRuleTypeMap.put(OcrConstant.ruleCheckSplitChar,configRuleMap);
}
ocrRuleCheckVo.setConfigRuleTypeMap(configRuleTypeMap);
}else if(ocrRuleCheckVo.getType()!=null||ocrRuleCheckVo.getType()==2){
String configRule = ocrRuleCheckVo.getConfigRule();
Map<String,Object> restMap= StrCharUtil.strSplits(configRule);
ocrRuleCheckVo.setConfigRuleMap(restMap);
}
}
if (StringUtils.isNotBlank(ocrRuleCheckVo.getMetadataConfigId())) {
String metadataConfigId = ocrRuleCheckVo.getMetadataConfigId();
@ -379,4 +400,5 @@ public class OcrRuleCheckServiceImpl extends ServiceImpl<OcrRuleCheckMapper, Ocr
return ocrRuleCheckVo;
}
}

@ -0,0 +1,93 @@
package org.jeecg.modules.ocr.utils;
import org.jeecg.common.exception.JeecgBootException;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
/**
* @Title:
* @Description:
* @Author
* @Date 2023-10-13 17:47
* @Version V1.0
*/
public class OcrJudgmentTools {
public static void main(String[] args) {
Map<String,Object> engine =new HashMap<>();
String str="value>5&&st==\"test\"&&(state==\"正常\"||state==\"不正常\")";
engine.put("value",6);
engine.put("state","正常");
engine.put("st","test");
Boolean judment = judment(str, engine);
System.out.println(judment);
}
public static ScriptEngine getEngine(){
ScriptEngineManager manager=new ScriptEngineManager();
return manager.getEngineByName("nashorn");
}
public static Boolean judment(String expression, Map<String,Object> params){
Boolean eval=false;
ScriptEngine engine = getEngine();
for(String key:params.keySet()){
engine.put(key,params.get(key));
}
try {
eval =(Boolean) engine.eval(expression);
} catch (ScriptException e) {
throw new JeecgBootException("条件表达式配置错误请检查");
}
return eval;
}
/***
*
* @return
*/
public static void abbreviationToFullName(Map<String, Object> configRuleMap){
Set<String> keySet = new HashSet<>(configRuleMap.keySet());
//循环keySet判断字段是否是缩写如果是缩写就把缩写的全称put一下
for (String s : keySet) {
Object value = configRuleMap.get(s);
if ("hn".equals(s)) {
configRuleMap.put("hospitalName",value);
}else if("dn".equals(s)) {
configRuleMap.put("doctorName", value);
}else if("dmn".equals(s)) {
configRuleMap.put("departmentName", value);
}else if("tm".equals(s) || ("time".equals(s))) {
configRuleMap.put("time", value);
}else{
configRuleMap.put(s,value);
}
}
}
/***
*
* @return
*/
public static void fullNameToAbbreviation(Map<String, Object> configRuleMap){
Set<String> keySet = new HashSet<>(configRuleMap.keySet());
//循环keySet判断字段是否是缩写如果是缩写就把缩写的全称put一下
for (String s : keySet) {
Object value = configRuleMap.get(s);
if ("hospitalName".equals(s)) {
configRuleMap.put("hn",value);
}else if("doctorName".equals(s)) {
configRuleMap.put("dn", value);
}else if("departmentName".equals(s)) {
configRuleMap.put("dmn", value);
}else if("tm".equals(s) || ("time".equals(s))) {
configRuleMap.put("time", value);
}else{
configRuleMap.put(s,value);
}
}
}
}

@ -1,8 +1,13 @@
package org.jeecg.modules.ocr.utils;
import org.jeecg.common.constant.OcrConstant;
import org.xm.Similarity;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Description
@ -10,6 +15,67 @@ import java.math.BigDecimal;
* @Date 2023/8/11 13:50
*/
public class StrCharUtil {
public static void main(String[] args) {
String configRule="hospitalName>=40&&(departmentName==0||doctorName==0)";
Map<String, Object> stringObjectMap = strSplits(configRule);
}
/**
*
*/
public static Map<String,Object> strSplits(String configRule){
//去除不需要的字符如 括号,叹号
configRule=configRule.replaceAll(" ","").replaceAll(OcrConstant.ruleZkh,"").replaceAll(OcrConstant.ruleYkh,"");
if(configRule.contains(OcrConstant.ruleTh+OcrConstant.ruleCheckValueRightChar)){
configRule=configRule.replaceAll(OcrConstant.ruleTh+OcrConstant.ruleCheckValueRightChar,"~"+OcrConstant.ruleCheckValueRightChar);//如果有!=那就替换为b=
}else{
configRule=configRule.replaceAll(OcrConstant.ruleTh,"");
}
if(configRule.contains(OcrConstant.ruleDyh+OcrConstant.ruleCheckValueRightChar)){
configRule=configRule.replaceAll(OcrConstant.ruleDyh+OcrConstant.ruleCheckValueRightChar,"dydy");
}
if(configRule.contains(OcrConstant.ruleDyh+OcrConstant.ruleCheckValueRightChar)){
configRule=configRule.replaceAll(OcrConstant.ruleXyh+OcrConstant.ruleCheckValueRightChar,"xydy");
}
//切割符组装 放入list中
List<String> splits=new ArrayList<>();
splits.add(OcrConstant.ruleDyh);
splits.add(OcrConstant.ruleXyh);
splits.add("xydy");
splits.add("dydy");
splits.add(OcrConstant.ruleCheckValueRightChar+OcrConstant.ruleCheckValueRightChar);
splits.add("~"+OcrConstant.ruleCheckValueRightChar);
if(configRule.contains(OcrConstant.ruleHz)){
configRule=configRule.replaceAll("\\|\\|",OcrConstant.ruleBq);
}
String[] strs = configRule.split(OcrConstant.ruleBq);
Map<String,Object> map=new HashMap<>();
for(String strss:strs){
strSplits(strss,splits,map);
}
return map;
}
public static void strSplits(String strs, List<String> splits,Map<String,Object> rest){
for(String split:splits){
if(strs.contains(split)){
String[] split1 = strs.split(split);
boolean sdf=false;
for(String s:split1){
for(String sf:splits){
if(!s.contains(sf)){
sdf=true;
}
}
}
if(sdf){
rest.put(split1[0],split1[1]);
}else{
for(String str22:split1){
strSplits(str22,splits,rest);
}
}
}
}
}
/**
* ()
@ -176,15 +242,4 @@ public class StrCharUtil {
return v;*/
}
public static void main(String[] args) {
String strA = "河北唐山市协和医院";
String strB = "河北省唐山协和医院";
System.out.println(similarityRatio(strA,strB));
//System.out.println(longestCommonSubstringNoOrder(strA, strB));
//System.out.println(SimilarDegree(strA, strB));
//System.out.println(compare(strA, strB));
//System.out.println(similarityRatio(strA, strB));
}
}

@ -37,6 +37,9 @@ public class SaveOcrRuleCheckVO implements Serializable {
@ApiModelProperty(value = "元数据配置名称")
@Excel(name = "元数据配置名称", width = 15)
private String metadataConfigName;
@ApiModelProperty(value = "并且或者组合规则,1不是2是")
@Excel(name = "是否为并且或者组合规则", width = 15)
private Integer type;
/**选择的元数据明细id*/
//@ApiModelProperty(value = "选择的元数据明细id")
//public List<String> metadataConfigDetailIdList=new ArrayList<>();

Loading…
Cancel
Save