From 83724c5bd759d9c16ca7461258f589c71d8958dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Wed, 28 Aug 2024 15:45:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ocr=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/controller/OCRRestfulController.java | 23 ++++++++-------- .../service/impl/OCRRestfulServiceImpl.java | 27 ++++++++++--------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/ocr/controller/OCRRestfulController.java b/laws-modules/src/main/java/com/jero/modules/laws/ocr/controller/OCRRestfulController.java index 864286e7..5f1d7425 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/ocr/controller/OCRRestfulController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/ocr/controller/OCRRestfulController.java @@ -19,10 +19,9 @@ import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.apache.http.entity.ContentType; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.mock.web.MockMultipartFile; @@ -51,8 +50,8 @@ import java.util.Objects; @RestController @RequestMapping("/laws/ocr/OCRRestful") @Api(tags = "OCR识别") +@Slf4j public class OCRRestfulController extends BaseController { - private static final Logger logger = LoggerFactory.getLogger(OCRRestfulController.class); @Autowired private OCRRestfulService ocrRestfulService; @@ -74,7 +73,7 @@ public class OCRRestfulController extends BaseController { @PostMapping(value="/upload",consumes="multipart/*",headers="content-type=multipart/form-data" ) public ResponseMessage handleFile(@RequestParam("file") MultipartFile file) throws Exception { SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); - logger.info("收到文件上传请求，开始处理文件:【"+sdf.format(new Date())+"】"); + log.info("收到文件上传请求，开始处理文件:【"+sdf.format(new Date())+"】"); return ocrRestfulService.handleFile(file,file.getOriginalFilename(),null,"add"); } @@ -82,11 +81,11 @@ public class OCRRestfulController extends BaseController { @PostMapping("/OcrHandleResult") public String OcrHandleResult(@RequestParam("wordFile") MultipartFile wordFile,@RequestParam("jsonFile") MultipartFile jsonFile, OcrCallBackResultEo ocrCallBackResultEo) { try{ - logger.info("调取到我了"); - logger.info("接口回调结果："+ JSON.toJSONString(ocrCallBackResultEo)); - logger.info("接口回调时所传文件---wordFile:"+ wordFile.toString() +"; jsonFile:"+jsonFile.toString()); + log.info("调取到我了"); + log.info("接口回调结果："+ JSON.toJSONString(ocrCallBackResultEo)); + log.info("接口回调时所传文件---wordFile:"+ wordFile.toString() +"; jsonFile:"+jsonFile.toString()); if("error".equals(ocrCallBackResultEo.getResult())){ - logger.info("客户接口处理文件失败"); + log.info("客户接口处理文件失败"); ocrRestfulService.updateDb(ocrCallBackResultEo.getTaskID(),"客户接口处理文件失败"); return "{\"result\":\"error\"}"; } @@ -97,13 +96,13 @@ public class OCRRestfulController extends BaseController { String signMD5 = MD5Util.string2MD5(sign); if(!signMD5.equals(key)){ //不同，则认证失败 - logger.info("认证失败"); + log.info("认证失败"); ocrRestfulService.updateDb(ocrCallBackResultEo.getTaskID(),"回调接口认证失败"); return "{\"result\":\"Authentication failed\"}"; } return ocrRestfulService.OcrHandleResult(wordFile,jsonFile,ocrCallBackResultEo.getTaskID()); }catch (Exception e){ - logger.error(e.getMessage(),e); + log.error(e.getMessage(),e); return "{\"result\":\"runTimeException\"}"; } } @@ -133,7 +132,7 @@ public class OCRRestfulController extends BaseController { @PostMapping("/addOcrRecord") public ResponseMessage addOcrRecord(@RequestBody OcrRecordEO ocrRecordEO) throws Exception { SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); - logger.info("收到文件上传请求，开始处理文件:【"+sdf.format(new Date())+"】"); + log.info("收到文件上传请求，开始处理文件:【"+sdf.format(new Date())+"】"); // 根据attID查找文件 String fileId = ocrRecordEO.getAttId(); OSSFile ossFile = ossFileService.getById(fileId); @@ -156,7 +155,7 @@ public class OCRRestfulController extends BaseController { return Result.success("0","保存成功",ocrRecordEO); } else { SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); - logger.info("收到文件上传请求，开始处理文件:【"+sdf.format(new Date())+"】"); + log.info("收到文件上传请求，开始处理文件:【"+sdf.format(new Date())+"】"); // 根据attID查找文件 String fileId = ocrRecordEO.getAttId(); OSSFile ossFile = ossFileService.getById(fileId); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/ocr/service/impl/OCRRestfulServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/ocr/service/impl/OCRRestfulServiceImpl.java index fd22d1d6..6f0f8857 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/ocr/service/impl/OCRRestfulServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/ocr/service/impl/OCRRestfulServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.ocr.service.impl; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.SnowflakeUtils; @@ -16,10 +17,9 @@ import com.jero.modules.laws.ocr.mapper.OcrRecordEOMapper; import com.jero.modules.laws.ocr.service.OCRRestfulService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -35,9 +35,9 @@ import java.util.HashMap; import java.util.Map; @Service +@Slf4j @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class OCRRestfulServiceImpl implements OCRRestfulService { - private static final Logger logger = LoggerFactory.getLogger(OCRRestfulServiceImpl.class); //请求处理客户认证码 @Value("${OCR.authCode}") @@ -78,12 +78,12 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { String authCode = RsaUtil.publicEncrypt(OcrAuthCode); if(authCode == null){ - logger.error("客户认证RSA加密失败"); + log.error("客户认证RSA加密失败"); return Result.error("客户认证RSA加密失败"); } String fileContent = Base64Util.PDFToBase64(file); if(fileContent == null || "".equals(fileContent)){ - logger.error("PDF转Base64失败"); + log.error("PDF转Base64失败"); return Result.error("PDF转Base64失败"); } SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); @@ -98,12 +98,13 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { map.put("taskId",taskId); map.put("callBackUrl",RestCallBackUrl); map.put("callBackMethod",""); - logger.info("处理完文件数据，开始请求OCR接口数据：【"+sdf.format(new Date())+"】"); + log.info("处理完文件数据，开始请求OCR接口数据：【"+sdf.format(new Date())+"】"); + log.info("提交参数：" + JSON.toJSONString(map)); String result = okHttpUtil.post(RestHandleFileUrl,map,new HashMap<>()); - logger.info("okHttp结果："+result); - logger.info("请求OCR接口完毕，返回响应状态：【"+sdf.format(new Date())+"】"); + log.info("okHttp结果："+result); + log.info("请求OCR接口完毕，返回响应状态：【"+sdf.format(new Date())+"】"); if(!result.contains("请求成功")){ - logger.error("请求出现异常："+result); + log.error("请求出现异常："+result); return Result.error("请求出现异常"); }else{ OcrResultEo ocrResultEo = JSONObject.parseObject(result, OcrResultEo.class); @@ -142,7 +143,7 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { } } }catch (Exception e){ - logger.error(e.getMessage(),e); + log.error(e.getMessage(),e); return Result.error("OCR接口请求出现异常，无法将文件传输到OCR引擎！"); } } @@ -159,7 +160,7 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { //首先将文件保存至本地 String wordId=null; String jsonId=null; - logger.info("保存文件"); + log.info("保存文件"); if(wordFile!=null && !wordFile.isEmpty()){ // String wordUrl = MinioUtil.upload(wordFile, "/temp"); String wordUrl = ObsBootUtil.upload(wordFile, "temp"); @@ -169,7 +170,7 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { ossFile.setUrl(wordUrl); ossFileService.save(ossFile); wordId = ossFile.getId(); - logger.info("word存储完成"); + log.info("word存储完成"); } if(jsonFile!=null && !jsonFile.isEmpty()){ // String jsonUrl = MinioUtil.upload(jsonFile, "/temp"); @@ -180,7 +181,7 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { ossFile.setUrl(jsonUrl); ossFileService.save(ossFile); jsonId = ossFile.getId(); - logger.info("Json存储完成"); + log.info("Json存储完成"); } //开始将文件保存至数据库中 if(StringUtils.isNotBlank(wordId) && StringUtils.isNotBlank(jsonId)){