From 87fdfba63a6db5ae6956aa5cd5f181b3693f48a9 Mon Sep 17 00:00:00 2001 From: 252535409 <252535409@qq.com> Date: Wed, 6 Dec 2023 09:11:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IYsDirectoryMaterialService.java | 3 ++- .../impl/YsDirectoryMaterialServiceImpl.java | 18 +++++++++++++++--- .../api/controller/AiAPIController.java | 8 +++----- .../impl/SysAnnouncementServiceImpl.java | 4 +++- .../src/main/resources/application-dev.yml | 7 ++++--- .../src/main/resources/application-test.yml | 3 ++- 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/service/IYsDirectoryMaterialService.java b/service-management-system/src/main/java/org/jeecg/modules/ai/service/IYsDirectoryMaterialService.java index 6432e7c..cec20da 100644 --- a/service-management-system/src/main/java/org/jeecg/modules/ai/service/IYsDirectoryMaterialService.java +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/service/IYsDirectoryMaterialService.java @@ -2,6 +2,7 @@ package org.jeecg.modules.ai.service; import org.jeecg.modules.ai.entity.YsDirectoryMaterial; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -19,5 +20,5 @@ public interface IYsDirectoryMaterialService extends IService queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(YsDirectoryMaterial::getMaterialCode, materialCode); YsDirectoryMaterial ysDirectoryMaterial = ysDirectoryMaterialMapper.selectOne(queryWrapper); - - return "通过"; + String ocrResult = null; + if(ysDirectoryMaterial.getRulesExist().intValue()==1) { + //调用接口识别 + ocrResult = RecognizeGeneralTextSolution.recognizeGeneralTextSolution(savePath, templateId); + //根据规则校验数据 + + } + json.put("ocrResult", ocrResult); + json.put("reviewResult", "通过"); + return json; } } diff --git a/service-management-system/src/main/java/org/jeecg/modules/api/controller/AiAPIController.java b/service-management-system/src/main/java/org/jeecg/modules/api/controller/AiAPIController.java index 0fd32b2..6cefe61 100644 --- a/service-management-system/src/main/java/org/jeecg/modules/api/controller/AiAPIController.java +++ b/service-management-system/src/main/java/org/jeecg/modules/api/controller/AiAPIController.java @@ -174,13 +174,11 @@ public class AiAPIController { MultipartFile file = multipartRequest.getFile("file");// 获取上传文件对象 String savePath = preReviewRecordsDetailService.uploadLocal(file, "upload"); if(oConvertUtils.isNotEmpty(savePath)){ - //调用接口识别 - String ocrResult = RecognizeGeneralTextSolution.recognizeGeneralTextSolution(savePath, templateId); //根据规则判断预审结果 - String reviewResult = iYsDirectoryMaterialService.getReviewResult(materialCode, ocrResult); + JSONObject reviewResult = iYsDirectoryMaterialService.getReviewResult(materialCode, templateId, savePath); json.put("imagePath", savePath); - json.put("ocrResult", ocrResult); - json.put("reviewResult", reviewResult); + json.put("ocrResult", reviewResult.getString("ocrResult")); + json.put("reviewResult", reviewResult.getString("reviewResult")); return Result.OK(json.toString()); }else { return Result.error("上传失败"); diff --git a/service-management-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java b/service-management-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java index 74cb63e..3254d36 100644 --- a/service-management-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java +++ b/service-management-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java @@ -45,6 +45,8 @@ public class SysAnnouncementServiceImpl extends ServiceImpl