From 0a4fa5da08998b86e9e3bcfc00d1abfc0c28c6f5 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 19 Jul 2024 10:17:21 +0800
Subject: [PATCH] =?UTF-8?q?fix(ocr):=20=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/laws/ocr/entity/OcrRecordEO.java | 20 ++++++++++++
.../laws/ocr/mapper/xml/OcrRecordEOMapper.xml | 7 +++++
.../jero/modules/laws/ocr/page/BasePage.java | 31 +++++++++++++++++++
.../laws/ocr/page/OcrRecordEOPage.java | 30 ++++++++++++++++++
.../service/impl/OCRRestfulServiceImpl.java | 9 ++++--
.../service/impl/OcrRecordEOServiceImpl.java | 20 +++++++++++-
6 files changed, 113 insertions(+), 4 deletions(-)
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/ocr/entity/OcrRecordEO.java b/laws-modules/src/main/java/com/jero/modules/laws/ocr/entity/OcrRecordEO.java
index 9cfad1b6..7874cead 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/ocr/entity/OcrRecordEO.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/ocr/entity/OcrRecordEO.java
@@ -32,13 +32,33 @@ public class OcrRecordEO extends BaseEntity implements Serializable{
private String spendTime;
//转换结果
private String resultContent;
+
+ public String getResultContentDictText() {
+ return resultContentDictText;
+ }
+
+ public void setResultContentDictText(String resultContentDictText) {
+ this.resultContentDictText = resultContentDictText;
+ }
+
+ //转换结果 翻译
+ private String resultContentDictText;
//新增字段
private String fileType;
+ //文件类型 翻译
+ private String fileTypeDictText;
private String standNumber;
private String standName;
private String creationUser;
private String attId;
private String wordAttId;
+ public String getFileTypeDictText() {
+ return fileTypeDictText;
+ }
+
+ public void setFileTypeDictText(String fileTypeDictText) {
+ this.fileTypeDictText = fileTypeDictText;
+ }
public String getJsonAttId() {
return jsonAttId;
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/ocr/mapper/xml/OcrRecordEOMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/ocr/mapper/xml/OcrRecordEOMapper.xml
index f6765f0f..72fec172 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/ocr/mapper/xml/OcrRecordEOMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/ocr/mapper/xml/OcrRecordEOMapper.xml
@@ -71,6 +71,13 @@
and modify_time <= #{modifyTime2}
+
+ and result_content = #{resultContent}
+
+
+ and (stand_number like concat('%',#{standardNumberAndName},'%')
+ or stand_name like concat('%',#{standardNumberAndName},'%'))
+
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/ocr/page/BasePage.java b/laws-modules/src/main/java/com/jero/modules/laws/ocr/page/BasePage.java
index 757becb3..1fa5d0e4 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/ocr/page/BasePage.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/ocr/page/BasePage.java
@@ -20,6 +20,37 @@ public class BasePage {
private String q;
@TableField(exist = false)
private Pager pager = new Pager();
+ @TableField(exist = false)
+ private String standardNumberAndName;
+ @TableField(exist = false)
+ private String resultContent;
+ @TableField(exist = false)
+ private String orderCondition;
+
+
+ public String getOrderCondition() {
+ return orderCondition;
+ }
+
+ public void setOrderCondition(String orderCondition) {
+ this.orderCondition = orderCondition;
+ }
+
+ public String getStandardNumberAndName() {
+ return standardNumberAndName;
+ }
+
+ public void setStandardNumberAndName(String standardNumberAndName) {
+ this.standardNumberAndName = standardNumberAndName;
+ }
+
+ public String getResultContent() {
+ return resultContent;
+ }
+
+ public void setResultContent(String resultContent) {
+ this.resultContent = resultContent;
+ }
public BasePage() {
}
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/ocr/page/OcrRecordEOPage.java b/laws-modules/src/main/java/com/jero/modules/laws/ocr/page/OcrRecordEOPage.java
index 720fb575..5d945793 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/ocr/page/OcrRecordEOPage.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/ocr/page/OcrRecordEOPage.java
@@ -37,6 +37,36 @@ public class OcrRecordEOPage extends BasePage {
private String shunxu;
private String sql;
+ private String standardNumberAndName;
+ private String resultContent;
+ private String orderCondition;
+
+ @Override
+ public String getOrderCondition() {
+ return orderCondition;
+ }
+
+ @Override
+ public void setOrderCondition(String orderCondition) {
+ this.orderCondition = orderCondition;
+ }
+
+ public String getStandardNumberAndName() {
+ return standardNumberAndName;
+ }
+
+ public void setStandardNumberAndName(String standardNumberAndName) {
+ this.standardNumberAndName = standardNumberAndName;
+ }
+
+ public String getResultContent() {
+ return resultContent;
+ }
+
+ public void setResultContent(String resultContent) {
+ this.resultContent = resultContent;
+ }
+
public String getWordFileCode() {
return this.wordFileCode;
}
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 ab7b8a66..cbf8d046 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
@@ -115,7 +115,8 @@ public class OCRRestfulServiceImpl implements OCRRestfulService {
ocrRecordEO.setCreationUser(sysUser.getId());
ocrRecordEO.setFileName(fileName);
ocrRecordEO.setCreationTime(new Date());
- ocrRecordEO.setResultContent("转换中");
+// ocrRecordEO.setResultContent("转换中");
+ ocrRecordEO.setResultContent("1");
ocrRecordEO.setStandNumber(getOcrEO.getStandNumber());
ocrRecordEO.setStandName(getOcrEO.getStandName());
ocrRecordEO.setFileType(getOcrEO.getFileType());
@@ -126,7 +127,8 @@ public class OCRRestfulServiceImpl implements OCRRestfulService {
OcrRecordEO ocrRecordEO = new OcrRecordEO();
ocrRecordEO.setId(taskId);
ocrRecordEO.setFileName(fileName);
- ocrRecordEO.setResultContent("转换中");
+// ocrRecordEO.setResultContent("转换中");
+ ocrRecordEO.setResultContent("1");
ocrRecordEO.setStandNumber(getOcrEO.getStandNumber());
ocrRecordEO.setStandName(getOcrEO.getStandName());
ocrRecordEO.setFileType(getOcrEO.getFileType());
@@ -187,7 +189,8 @@ public class OCRRestfulServiceImpl implements OCRRestfulService {
ocrRecordEO.setJsonRealName(jsonFile.getOriginalFilename());
ocrRecordEO.setJsonFileCode(null);
ocrRecordEO.setModifyTime(new Date());
- ocrRecordEO.setResultContent("转换成功");
+// ocrRecordEO.setResultContent("转换成功");
+ ocrRecordEO.setResultContent("2");
ocrRecordEO.setWordAttId(wordId);
ocrRecordEO.setJsonAttId(jsonId);
ocrRecordEOMapper.updateByPrimaryKeySelective(ocrRecordEO);
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/ocr/service/impl/OcrRecordEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/ocr/service/impl/OcrRecordEOServiceImpl.java
index 233ada96..ee34f437 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/ocr/service/impl/OcrRecordEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/ocr/service/impl/OcrRecordEOServiceImpl.java
@@ -4,6 +4,8 @@ import com.jero.modules.laws.ocr.mapper.OcrRecordEOMapper;
import com.jero.modules.laws.ocr.entity.OcrRecordEO;
import com.jero.modules.laws.ocr.page.OcrRecordEOPage;
import com.jero.modules.laws.ocr.service.OcrRecordEOService;
+import com.jero.modules.system.service.ISysDictService;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,10 +22,26 @@ public class OcrRecordEOServiceImpl implements OcrRecordEOService {
@Autowired
private OcrRecordEOMapper ocrRecordEOMapper;
+ @Autowired
+ private ISysDictService sysDictService;
@Override
public List queryByPage(OcrRecordEOPage page) {
- return ocrRecordEOMapper.queryByPage(page);
+ List ocrRecordEOS = ocrRecordEOMapper.queryByPage(page);
+ // 翻译
+ for (OcrRecordEO ocrRecordEO : ocrRecordEOS) {
+ String transitionStatus =
+ sysDictService.queryDictTextByKey("transition_status", ocrRecordEO.getResultContent());
+ if (StringUtils.isNotBlank(transitionStatus)){
+ ocrRecordEO.setResultContentDictText(transitionStatus);
+ }
+ String processManuscript =
+ sysDictService.queryDictTextByKey("process_manuscript", ocrRecordEO.getFileType());
+ if (StringUtils.isNotBlank(processManuscript)){
+ ocrRecordEO.setFileTypeDictText(processManuscript);
+ }
+ }
+ return ocrRecordEOS;
}
@Override