From 32e0bf881db4dec61fc7a83a3631d5d9162ca507 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Wed, 30 Aug 2023 16:12:17 +0800
Subject: [PATCH] updates

---
 .../org/jeecg/modules/api/controller/ApiController.java   | 8 +++++++-
 .../modules/ocr/controller/OcrSimulatorController.java    | 2 --
 2 files changed, 7 insertions(+), 3 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 837005b..a2d8a23 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
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.util.*;
@@ -69,6 +70,7 @@ public class ApiController {
             return Result.error("请输入请求参数");
         }
         //1.获取请求参数
+        String taskName = requestBody.getString("taskName");
         String requestId = requestBody.getString("requestId");//请求唯一标识
         String scenes = requestBody.getString("scenes");//场景类型：door=门头照片，cases=病例，bill=票据
         String ruleId = requestBody.getString("ruleId");//规则标识
@@ -109,7 +111,11 @@ public class ApiController {
         OcrIdentify ocrIdentify = new OcrIdentify();
         //2.创建识别任务
         if (true) {
-            ocrIdentify.setTaskName(requestId);
+            if (StringUtils.isBlank(taskName)) {
+                ocrIdentify.setTaskName(requestId);
+            }else{
+                ocrIdentify.setTaskName(taskName);
+            }
             ocrIdentify.setRequestId(requestId);
             ocrIdentify.setStatus("0");//任务进行中
             ocrIdentify.setRuleCheck(ruleId);//配置规则检查id
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrSimulatorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrSimulatorController.java
index 44fdebf..c2da27e 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrSimulatorController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrSimulatorController.java
@@ -25,8 +25,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 /**
  * @Description: 模拟识别器