Merge remote-tracking branch 'origin/master'

优化执行任务逻辑

jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/OcrConstant.java

@@ -17,13 +17,8 @@ public class OcrConstant {
      */
     public static String ruleCheckSplitChar="&";
 
-    public static String ruleHz="||";
+    public static String ruleCheckOrChar="||";
-    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="=";
 
     /**

jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java

@@ -237,8 +237,8 @@ public class RestUtil {
         //回调接口
         if (url.contains("callback")) {
             SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
-            requestFactory.setConnectTimeout(300000);
+            requestFactory.setConnectTimeout(30000);
-            requestFactory.setReadTimeout(300000);
+            requestFactory.setReadTimeout(30000);
             RT = new RestTemplate(requestFactory);
         }else{
             SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java

@@ -28,7 +28,6 @@ import org.jeecg.modules.ocr.utils.ImageUtils;
 import org.jeecg.modules.ocr.dto.OcrIdentifyDTO;
 import org.jeecg.modules.ocr.dto.OcrRuleCheckDTO;
 import org.jeecg.modules.system.service.ISysDictService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -38,8 +37,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.awt.*;
 import java.io.File;
-import java.rmi.RemoteException;
-import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -69,7 +66,7 @@ public class ApiController {
     @Value("${system.project.wlyCallback}")
     private String wlyCallback;
     @ApiOperation(value = "通用识别")
-    @PostMapping("/identify")
+    @RequestMapping("/identify")
     @Transactional
     @ResponseBody
     @AutoLog(value = "api接口-通用识别",logType = CommonConstant.LOG_TYPE_2,operateType=CommonConstant.OPERATE_TYPE_1)
@@ -77,6 +74,7 @@ public class ApiController {
 //        if (!"test".equals(profiles)) {
 //            return Result.error("当前环境不支持该功能，请访问测试环境");
 //        }
+        log.info("api接口-通用识别请求开始,{}",requestBody);
         if (requestBody == null) {
             return Result.error("请输入请求参数");
         }
@@ -143,6 +141,7 @@ public class ApiController {
             ocrIdentify.setSourceJson(requestBody.getJSONArray("sourceJson").toJSONString());//校验数据源
             ocrIdentifyService.save(ocrIdentify);
         }
+        log.info("api接口-通用识别请求结束,{}",requestBody);
         Thread.sleep(1000L);
         //3.请求python ocr识别，异步执行
         //taskService.postSemantic(ocrIdentify,fileList);
@@ -274,4 +273,5 @@ public class ApiController {
         return Result.OK("");
     }
 
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/config/TesseractOcrConfiguration.java

@@ -1,32 +0,0 @@
-package org.jeecg.modules.ocr.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @Title:
- * @Description:
- * @Author 郭向斌
- * @Date 2023-10-27 10:21
- * @Version V1.0
- */
-//@Configuration
-public class TesseractOcrConfiguration {
-//    @Value("${tess4j.data-path}")
-//    private String dataPath;
-//
-//    @Value("${tess4j.language}")
-//    private String language;
-
-//    @Bean
-//    public Tesseract tesseract() {
-//
-//        Tesseract tesseract = new Tesseract();
-//        // 设置训练数据文件夹路径
-//        tesseract.setDatapath(dataPath);
-//        // 设置为中文简体
-//        tesseract.setLanguage(language);
-//        return tesseract;
-//    }
-}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrRuleCheckController.java

@@ -90,7 +90,6 @@ 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("添加成功！");
     }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrSimulatorController.java

@@ -24,7 +24,6 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -61,7 +60,6 @@ public class OcrSimulatorController{
         List<String> imageList = images.toJavaList(String.class);
         OcrIdentify ocrIdentify=new OcrIdentify();
         ocrIdentify.setTaskSource("模拟实验");//模拟实验-场景识别
-        ocrIdentify.setTaskType(requestBody.getString("taskType"));
         ocrIdentifyService.save(ocrIdentify);
         List<OcrIdentifyDetail> ocrIdentifyDetailList=new ArrayList<>();
         double nluTimeSum=0d;
@@ -79,15 +77,6 @@ public class OcrSimulatorController{
                 ocrIdentifyDetail.setImageUrl(uploadFilePath + "/" + image);//图片地址
                 semanticRequestBody.put("img_path", uploadFilePath + "/" + image);
             }
-            if(requestBody.getString("taskType")!=null&&requestBody.getString("taskType").equals("1699246961812586497")){
-                semanticRequestBody.put("scenes",1);
-                List<String> schema=new ArrayList<>();
-                schema.add("姓名");schema.add("年龄");schema.add("主要症状");schema.add("体征");schema.add("入院时主要症状和体征");
-                semanticRequestBody.put("schema",schema);
-            }else{
-                semanticRequestBody.put("scenes",0);
-            }
-            log.info("ocr识别模型请求参数：{}",semanticRequestBody.toJSONString());
             JSONObject semanticResponseJson = RestUtil.post(OcrConstant.api_test2_identify_url, semanticRequestBody);
             //执行时间 调整小数点
             Double nluTime = semanticResponseJson.getDouble("nlu_time");

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/dto/OcrRuleCheckDTO.java

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

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrRuleCheck.java

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

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/init/HandleTaskInit.java

@@ -88,6 +88,10 @@ public class HandleTaskInit implements ApplicationRunner {
                 String image;//图片
                 //执行获取到的任务
                 identifyFor: for (OcrIdentify ocrIdentify : list) {
+                    //过滤不需要的任务批次
+                    if(ocrIdentify.getRequestId().contains("c1b1f298e7ab4ba59103081e55f9cd01")){
+                        continue;
+                    }
                     image=null;
                     fileList=new ArrayList<>();
                     //识别的图片路径

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

@@ -355,6 +355,7 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
     @Override
     @Async
     public void updateOcrIdentifyStatus(String id, String status) {
+        log.info("id:{}",id);
         //4.更新主任务状态
         LambdaUpdateWrapper<OcrIdentify> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(OcrIdentify::getId, id);
@@ -411,7 +412,7 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
         OcrIdentifyDTO ocrIdentifyDTO = this.findById(id);
         //=======规则检查配置
         OcrRuleCheckDTO ocrRuleCheckVo = ocrIdentifyDTO.getOcrRuleCheckVo();
-        Map<String, Map<String, Object>> configRuleTypeMap = ocrRuleCheckVo.getConfigRuleTypeMap();
+        Map<String, Map<String, String>> configRuleTypeMap = ocrRuleCheckVo.getConfigRuleTypeMap();
         //===================
     }
 
@@ -550,11 +551,27 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
      * @param configRuleMap 1/0 map
      * @param fieldMap      字段含义 map
      */
-    public Map<String, CheckSemanticModel> getCheckSemanticModelMap(Map<String, Object> configRuleMap, Map<String, String> fieldMap, List<JSONObject> sourceJsonObjects) {
+    public Map<String, CheckSemanticModel> getCheckSemanticModelMap(Map<String, String> configRuleMap, Map<String, String> fieldMap, List<JSONObject> sourceJsonObjects) {
         if (configRuleMap!=null && CollectionUtils.isNotEmpty(configRuleMap.keySet())) {
-            //缩写转全称
+            //将 configRuleMap的 key 创建一个Set
-            OcrJudgmentTools.abbreviationToFullName(configRuleMap);
+            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);
+                }
             }
+        }
+
         Map<String, CheckSemanticModel> checkSemanticModelMap = new LinkedHashMap<>();
         //校验正确的值
         Map<String, String> inputMap = new LinkedHashMap<>();
@@ -594,7 +611,7 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
                     copyEntity.setField(field);
                     //1/0
                     if (configRuleMap != null && configRuleMap.containsKey(field)) {
-                        configRule =String.valueOf(configRuleMap.get(field));
+                        configRule = configRuleMap.get(field);
                         copyEntity.setRuleInfo(configRule);
                         //端字段含义
                         fieldName = fieldMap.get(field);
@@ -719,7 +736,6 @@ 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();
@@ -791,6 +807,8 @@ 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;
@@ -893,7 +911,6 @@ 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 识别的文本
@@ -954,62 +971,6 @@ 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);
@@ -1045,20 +1006,9 @@ 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的值
@@ -1530,9 +1480,13 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
         List<TaskModel> waitingTaskList = taskList.stream().filter(t -> t.getTaskStatus().equals("0")).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(waitingTaskList)) {
             while (waitingTaskList.size() > 0) {
+                for (int i = 0; i < 4; i++) {
+                    if (i>waitingTaskList.size()-1){
+                        continue;
+                    }
                     //取第一个任务
-                TaskModel taskModel = waitingTaskList.get(0);
+                    TaskModel taskModel = waitingTaskList.get(i);
-                waitingTaskList.get(0).setTaskStatus("1");
+                    waitingTaskList.get(i).setTaskStatus("1");
                     //刷新redis，执行中
                     flushTask(taskModel.getTaskId(), 1);
                     //执行
@@ -1543,6 +1497,7 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
                     waitingTaskList = taskList.stream().filter(t -> t.getTaskStatus().equals("0")).collect(Collectors.toList());
                 }
             }
+        }
         log.error("任务已全部执行");
     }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrRuleCheckServiceImpl.java

@@ -18,8 +18,6 @@ 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;
@@ -41,6 +39,10 @@ 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
@@ -60,31 +62,14 @@ 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);
         }
     }
@@ -348,14 +333,13 @@ 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,Object>> configRuleTypeMap=new LinkedHashMap<>();
+            Map<String,Map<String,String>> configRuleTypeMap=new LinkedHashMap<>();
-                if (configRule.contains(OcrConstant.ruleHz)) {
+            if (configRule.contains(OcrConstant.ruleCheckOrChar)) {
                 // ||
-                    String[] orSplit = configRule.split(OcrConstant.ruleHz);
+                String[] orSplit = configRule.split(OcrConstant.ruleCheckOrChar);
-                    Map<String,Object> configRuleMap=new LinkedHashMap<>();
+                Map<String,String> configRuleMap=new LinkedHashMap<>();
                 String field=null;String fieldValue=null;
                 for (String s : orSplit) {
                     configRuleMap=new LinkedHashMap<>();
@@ -365,12 +349,12 @@ public class OcrRuleCheckServiceImpl extends ServiceImpl<OcrRuleCheckMapper, Ocr
                     }
                     configRuleMap.put(split1[0],split1[1]);
                 }
-                    configRuleTypeMap.put(OcrConstant.ruleHz,configRuleMap);
+                configRuleTypeMap.put(OcrConstant.ruleCheckOrChar,configRuleMap);
             }else {
                 //&
                 String[] split = configRule.split(OcrConstant.ruleCheckSplitChar);
                 //将 `配置规则` 转成 map
-                    Map<String,Object> configRuleMap=new LinkedHashMap<>();
+                Map<String,String> configRuleMap=new LinkedHashMap<>();
                 for (String s : split) {
                     String[] split1 = s.split(OcrConstant.ruleCheckValueRightChar);
                     if (split1.length<=1) {
@@ -382,11 +366,6 @@ 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();
@@ -400,5 +379,4 @@ public class OcrRuleCheckServiceImpl extends ServiceImpl<OcrRuleCheckMapper, Ocr
         return ocrRuleCheckVo;
     }
 
-
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/CallBackWlyUtils.java

@@ -101,7 +101,7 @@ public class CallBackWlyUtils {
             log.error("请求无量云回调接口失败-拒绝连接 (Connection refused)");
             log.error(e.getMessage());
         } catch (Exception e) {
-            log.error("请求无量云回调接口失败:{}",e);
+            log.info("请求无量云回调接口失败");
             e.printStackTrace();
         } finally {
             log.info("回调返回------------------");
@@ -109,7 +109,7 @@ public class CallBackWlyUtils {
                 log.info(semanticResponseJson.toJSONString());
                 return true;
             } else {
-                log.error("回调返回-----:null");
+                log.info("回调返回-----:null");
                 return false;
             }
         }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/OcrJudgmentTools.java

@@ -1,93 +0,0 @@
-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);
-            }
-        }
-    }
-}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/OcrUtils.java

@@ -1,57 +0,0 @@
-package org.jeecg.modules.ocr.utils;
-
-//import org.opencv.core.Core;
-//import org.opencv.core.CvType;
-//import org.opencv.core.Mat;
-//import org.opencv.core.Point;
-//import org.opencv.imgproc.Imgproc;
-
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @Title:
- * @Description:
- * @Author 郭向斌
- * @Date 2023-10-27 10:43
- * @Version V1.0
- */
-public class OcrUtils {
-
-    public static void main(String[] args) {
-
-        // 此代码示例演示如何使用预处理过滤器应用自动歪斜校正并保存校正后的图像。
-        // 创建 AsposeOcr 的实例
-        // 添加纠偏过滤器
-//        PreprocessingFilter filters = new PreprocessingFilter();
-//        filters.add(PreprocessingFilter.AutoSkew());
-//
-//        // 将预处理后的图像保存到文件
-//        BufferedImage imageRes = api.PreprocessImage("C:\\Users\\郭向斌\\Desktop\\识别不出来2.jpg", filters);
-//        File outputSource = new File("D:\\workspace\\ocr\\data\\jiuzheng\\识别不出来2rest.jpg");
-//        try {
-//            ImageIO.write(imageRes, "png", outputSource);
-//        } catch (IOException e) {
-//            throw new RuntimeException(e);
-//        }
-
-//        String str="C:\\Users\\郭向斌\\Desktop\\识别不出来2.jpg";
-//        File file=new File(str);
-//
-//        String s = getBufferedImage().doOCR(file);
-//        System.out.println(s);
-    }
-//
-//    private static Tesseract getBufferedImage(){
-//        Tesseract tesseract = new Tesseract();
-//        // 设置训练数据文件夹路径
-//        tesseract.setDatapath("D:\\workspace\\ocr\\data\\tess4j\\tessdata");
-//        // 设置为中文简体
-//        tesseract.setLanguage("chi_sim+eng+osd");
-//        return tesseract;
-//    }
-}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/StrCharUtil.java

@@ -1,13 +1,8 @@
 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 对比俩个字符串的相似度
@@ -15,67 +10,6 @@ import java.util.Map;
  * @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);
-                    }
-                }
-            }
-        }
-    }
 
     /**
      * 获取最长子串 (参数顺序与字符串长短无关)
@@ -242,4 +176,15 @@ 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));
+    }
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/vo/SaveOcrRuleCheckVO.java

@@ -37,9 +37,6 @@ 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<>();

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -131,9 +131,9 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://localhost:3306/ocr?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://47.103.213.109:3306/ocr?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: root
+          password: Wang5322570..
           driver-class-name: com.mysql.cj.jdbc.Driver
 #          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
 #          username: root
@@ -148,7 +148,7 @@ spring:
   #redis 配置
   redis:
     database: 3
-    host: localhost
+    host: 47.103.213.109
     port: 6379
     password: ''
 #mybatis plus 设置

jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8020
   tomcat:
     max-swallow-size: -1
   error:
@@ -7,7 +7,7 @@ server:
     include-stacktrace: ALWAYS
     include-message: ALWAYS
   servlet:
-    context-path: /jeecg-boot
+    context-path: /ocr
   compression:
     enabled: true
     min-response-size: 1024
@@ -26,7 +26,7 @@ spring:
       max-request-size: 10MB
   mail:
     host: smtp.163.com
-    username: ??
+    username: jeecgos@163.com
     password: ??
     properties:
       mail:
@@ -111,14 +111,14 @@ spring:
         # 初始化大小，最小，最大
         initial-size: 5
         min-idle: 5
-        maxActive: 1000
+        maxActive: 20
         # 配置获取连接等待超时的时间
         maxWait: 60000
         # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
         timeBetweenEvictionRunsMillis: 60000
         # 配置一个连接在池中最小生存的时间，单位是毫秒
         minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
+        validationQuery: SELECT 1
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
@@ -131,10 +131,14 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:3306/ocr?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: root
+          password: stqpvqk/.6:H
           driver-class-name: com.mysql.cj.jdbc.Driver
+          #          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          #          username: root
+          #          password: root
+          #          driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
           #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
@@ -143,8 +147,9 @@ spring:
           #driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
   redis:
-    database: 0
+    database: 3
     host: 127.0.0.1
+    #    host: 47.103.213.109
     port: 6379
     password: ''
 #mybatis plus 设置
@@ -173,31 +178,30 @@ jeecg:
   signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
   # 签名拦截接口
   signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
-  #local\minio\alioss
+  #local、minio、alioss
-  uploadType: alioss
+  uploadType: local
   # 前端访问地址
   domainUrl:
     pc: http://localhost:3100
     app: http://localhost:8051
   path:
     #文件上传根目录 设置
-    upload: /data/ocr/upload
+    upload: /data/ocr/upFiles
     #webapp文件路径
-    webapp: /opt/jeecg-boot/webapp
+    webapp: /opt/webapp
   shiro:
-    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
     accessKey: ??
     secretKey: ??
     endpoint: oss-cn-beijing.aliyuncs.com
     bucketName: jeecgdev
-    staticDomain: https://static.jeecg.com
+  # ElasticSearch 6设置
-  # ElasticSearch 设置
   elasticsearch:
     cluster-name: jeecg-ES
     cluster-nodes: 127.0.0.1:9200
-    check-enabled: true
+    check-enabled: false
   # 在线预览文件服务器地址配置
   file-view-domain: http://fileview.jeecg.com
   # minio文件上传
@@ -208,17 +212,9 @@ jeecg:
     bucketName: otatest
   #大屏报表参数设置
   jmreport:
-    mode: prod
+    mode: dev
     #数据字典是否进行saas数据隔离，自己看自己的字典
     saas: false
-    #是否开启租户模式 Support By v1.5.5+
-    openTenant: false
-    #安全模式(敏感接口校验、saas模式下不允许使用平台数据源)
-    #safeMode: true
-    #是否需要校验token
-    is_verify_token: true
-    #必须校验方法
-    verify_methods: remove,delete,save,add,update
   #xxl-job配置
   xxljob:
     enabled: false
@@ -250,7 +246,7 @@ knife4j:
   #开启生产环境屏蔽
   production: false
   basic:
-    enable: true
+    enable: false
     username: jeecg
     password: jeecg1314
 #第三方登录
@@ -303,5 +299,7 @@ third-app:
       agent-id: ??
 system:
   project:
-    env: customer_prod
+    env: customer_test
-    fileReviewUrlPrefix: http://47.103.213.109:8072/files
+    enableHandleTask: true
+    fileReviewUrlPrefix: http://localhost:8071/files
+    wlyCallback: https://hyycsozs.prevailcloud.com/api/task/image/ocr/callback

jeecg-module-system/jeecg-system-start/src/main/resources/application.yml

@@ -3,4 +3,4 @@ spring:
     name: jeecg-system
   profiles:
 #    active: '@profile.name@'
-    active: dev
+    active: prod

pom.xml

@@ -165,6 +165,7 @@
 				<artifactId>jeecg-system-biz</artifactId>
 				<version>${jeecgboot.version}</version>
 			</dependency>
+
 			<!-- jeecg tools -->
 			<dependency>
 				<groupId>org.jeecgframework.boot</groupId>