From 3b2a5b3c6a2aac0198a244f2efe8f076a0439a5c Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Wed, 19 Jul 2023 09:41:56 +0800
Subject: [PATCH] updates

---
 .../org/jeecg/modules/api/controller/ApiController.java    | 2 +-
 .../org/jeecg/modules/ocr/entity/OcrMetadataConfig.java    | 5 +++++
 .../modules/ocr/mapper/xml/OcrMetadataConfigMapper.xml     | 7 ++++++-
 .../java/org/jeecg/modules/ocr/vo/OcrMetadataConfigVo.java | 7 +++++++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java
index 19648bc..eaf49d9 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java
@@ -56,7 +56,7 @@ public class ApiController {
         String fileName = jsonObject.getString("fileName");
         AssertUtils.notEmpty(requestId,"请输入[请求唯一标识]");
         AssertUtils.notEmpty(fileName,"请输入[图片名称]");*/
-        return JSONObject.parseObject("{\"requestId\":\"10001\",\"result\":{\"tag\":\"hospitalName\",\"inputText\":\"仁和医院\",\"ocrText\":\"仁和医院\",\"ocrPrecisionRate\":0.8,\"ruleValidation\":true,\"sourceImage\":{\"fileName\":\"test1.png\",\"path\":\"/usr/local/ocr/test1.png\"}}}");
+        return JSONObject.parseObject("{\"requestId\":\"10001\",\"result\":{\"tag\":\"hospitalName\",\"inputText\":\"仁和医院\",\"ocrText\":\"仁和医院\",\"ocrPrecisionRate\":0.8,\"ruleValidation\":true,\"sourceImage\":{\"fileName\":\"test1.png\",\"path\":\"/usr/local/ocr/test1.png\"},\"failureReason\":\"图片不清晰\"}}");
     }
 
     @ApiOperation(value="任务完结通知", notes="任务完结通知")
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrMetadataConfig.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrMetadataConfig.java
index 80f0c4e..19f6131 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrMetadataConfig.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrMetadataConfig.java
@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
@@ -68,4 +69,8 @@ public class OcrMetadataConfig implements Serializable {
     @ApiModelProperty(value = "获取字段")
     @TableField(exist = false)
     private String getField;
+
+    /**任务类型*/
+    @ApiModelProperty(value = "任务类型")
+    private String taskType;
 }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrMetadataConfigMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrMetadataConfigMapper.xml
index b4c6938..7af7631 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrMetadataConfigMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrMetadataConfigMapper.xml
@@ -5,9 +5,11 @@
 <select id="pageVo" resultType="org.jeecg.modules.ocr.vo.OcrMetadataConfigVo">
     SELECT oc.*,
            GROUP_CONCAT(ocd.field_name)as resultName,
-           GROUP_CONCAT(ocd.get_field)as getField
+           GROUP_CONCAT(ocd.get_field)as getField,
+           tasktype.type_name as taskType_dictText
     FROM ocr_metadata_config oc
     LEFT JOIN ocr_metadata_config_detail ocd ON ocd.metadata_config_id = oc.id
+    LEFT JOIN ocr_task_type tasktype ON tasktype.id = oc.task_type
         WHERE 1=1
         <if test="o.configName !=null and o.configName!=''">
             AND oc.config_name like concat('%',#{o.configName},'%')
@@ -18,6 +20,9 @@
         <if test="o.getField !=null and o.getField!=''">
             AND ocd.get_field like concat('%',#{o.getField},'%')
         </if>
+        <if test="o.taskType !=null and o.taskType!=''">
+            AND oc.task_type = #{o.taskType}
+        </if>
     group by oc.id
     order by oc.update_time desc
     </select>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/vo/OcrMetadataConfigVo.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/vo/OcrMetadataConfigVo.java
index 8968770..de69923 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/vo/OcrMetadataConfigVo.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/vo/OcrMetadataConfigVo.java
@@ -1,5 +1,7 @@
 package org.jeecg.modules.ocr.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecg.modules.ocr.entity.OcrMetadataConfig;
 import org.jeecg.modules.ocr.entity.OcrMetadataConfigDetail;
@@ -14,6 +16,11 @@ import java.util.List;
  */
 @Data
 public class OcrMetadataConfigVo extends OcrMetadataConfig {
+    /**任务类型_字段中文*/
+    @ApiModelProperty(value = "任务类型名称")
+    @TableField(exist = false)
+    private String taskType_dictText;
+
     /**配置明细信息*/
     public List<OcrMetadataConfigDetail> ocrMetadataConfigDetailList=new ArrayList<>();
 }