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

updates

Browse Source
master
周文涛 2 years ago
parent 5158b489a2
commit ee81400249
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File

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

@ -275,7 +275,7 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
//TODO 后续考虑需要修正复杂程度. 支持 & + || 一起 //TODO 后续考虑需要修正复杂程度. 支持 & + || 一起
String errorMsg = errorResults.stream().map(e -> e.getFailureReason()).collect(Collectors.joining(";")); String errorMsg = errorResults.stream().map(e -> e.getFailureReason()).collect(Collectors.joining(";"));
if (configRuleTypeMap.containsKey(OcrConstant.ruleCheckSplitChar)) { // if (configRuleTypeMap.containsKey(OcrConstant.ruleCheckSplitChar)) {
if (errorResults.size() > 0) { if (errorResults.size() > 0) {
//匹配失败. //匹配失败.
updateWrapper.set(OcrIdentify::getErrorMsg, errorMsg); updateWrapper.set(OcrIdentify::getErrorMsg, errorMsg);
@ -284,11 +284,10 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
//匹配成功. //匹配成功.
updateWrapper.set(OcrIdentify::getTaskResult, 1); updateWrapper.set(OcrIdentify::getTaskResult, 1);
} }
}else if (configRuleTypeMap.containsKey(OcrConstant.ruleCheckOrChar)){ /*}else if (configRuleTypeMap.containsKey(OcrConstant.ruleCheckOrChar)){
Map<String, String> fieldMap = configRuleTypeMap.get(OcrConstant.ruleCheckSplitChar); Map<String, String> fieldMap = configRuleTypeMap.get(OcrConstant.ruleCheckSplitChar);
//获取成功的字段. //获取成功的字段.
List<String> successFields = ocrResults.stream().filter(o -> o.getRuleValidation()).map(c->c.getTag()).collect(Collectors.toList()); List<String> successFields = ocrResults.stream().filter(o -> o.getRuleValidation()).map(c->c.getTag()).collect(Collectors.toList());
updateWrapper.set(OcrIdentify::getErrorMsg, errorMsg); updateWrapper.set(OcrIdentify::getErrorMsg, errorMsg);
updateWrapper.set(OcrIdentify::getTaskResult, 0); updateWrapper.set(OcrIdentify::getTaskResult, 0);
fieldMapFor: for (String s : fieldMap.keySet()) { fieldMapFor: for (String s : fieldMap.keySet()) {
@ -297,8 +296,7 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
break fieldMapFor; break fieldMapFor;
} }
} }
}*/
}
String taskResultInfo = JSONArray.toJSONString(ocrResults); String taskResultInfo = JSONArray.toJSONString(ocrResults);
updateWrapper.set(OcrIdentify::getStatus,"1"); updateWrapper.set(OcrIdentify::getStatus,"1");
updateWrapper.set(OcrIdentify::getEndTime,new Date()); updateWrapper.set(OcrIdentify::getEndTime,new Date());
@ -446,32 +444,33 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
//TODO 后续考虑需要修正复杂程度. 支持 & + || 一起 //TODO 后续考虑需要修正复杂程度. 支持 & + || 一起
String errorMsg = errorResults.stream().map(e -> e.getFailureReason()).collect(Collectors.joining(";")); String errorMsg = errorResults.stream().map(e -> e.getFailureReason()).collect(Collectors.joining(";"));
if (configRuleTypeMap.containsKey(OcrConstant.ruleCheckSplitChar)) { // if (configRuleTypeMap.containsKey(OcrConstant.ruleCheckSplitChar)) {
if (errorResults.size() > 0) { if (errorResults.size() > 0) {
//匹配失败. //匹配失败.
updateWrapper.set(OcrIdentify::getErrorMsg, errorMsg);
updateWrapper.set(OcrIdentify::getTaskResult, 0);
} else {
//匹配成功.
updateWrapper.set(OcrIdentify::getTaskResult, 1);
}
}else if (configRuleTypeMap.containsKey(OcrConstant.ruleCheckOrChar)){
Map<String, String> fieldMap = configRuleTypeMap.get(OcrConstant.ruleCheckSplitChar);
//获取成功的字段.
List<String> successFields = ocrResults.stream().filter(o -> o.getRuleValidation()).map(c->c.getTag()).collect(Collectors.toList());
updateWrapper.set(OcrIdentify::getErrorMsg, errorMsg); updateWrapper.set(OcrIdentify::getErrorMsg, errorMsg);
updateWrapper.set(OcrIdentify::getTaskResult, 0); updateWrapper.set(OcrIdentify::getTaskResult, 0);
} else {
fieldMapFor: for (String s : fieldMap.keySet()) { //匹配成功.
if (successFields.contains(s)) { updateWrapper.set(OcrIdentify::getTaskResult, 1);
updateWrapper.set(OcrIdentify::getTaskResult, 1);
break fieldMapFor;
}
}
} }
// }else if (configRuleTypeMap.containsKey(OcrConstant.ruleCheckOrChar)){
// Map<String, String> fieldMap = configRuleTypeMap.get(OcrConstant.ruleCheckSplitChar);
// //获取成功的字段.
// List<String> successFields = ocrResults.stream().filter(o -> o.getRuleValidation()).map(c->c.getTag()).collect(Collectors.toList());
//
// updateWrapper.set(OcrIdentify::getErrorMsg, errorMsg);
// updateWrapper.set(OcrIdentify::getTaskResult, 0);
//
// fieldMapFor: for (String s : fieldMap.keySet()) {
// if (successFields.contains(s)) {
// updateWrapper.set(OcrIdentify::getTaskResult, 1);
// break fieldMapFor;
// }
// }
// }
String taskResultInfo = JSONArray.toJSONString(ocrResults); String taskResultInfo = JSONArray.toJSONString(ocrResults);
updateWrapper.set(OcrIdentify::getStatus,"1");
updateWrapper.set(OcrIdentify::getEndTime,new Date());
updateWrapper.set(OcrIdentify::getTaskResultInfo,taskResultInfo); updateWrapper.set(OcrIdentify::getTaskResultInfo,taskResultInfo);
} }
} }

Write Preview
Loading…
Cancel
Save