diff --git a/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql b/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql
index f30dacd83..bea2804cb 100644
--- a/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql
+++ b/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql
@@ -26,4 +26,13 @@ ALTER TABLE `laws_weilai`.`sys_depart`
ALTER TABLE `laws_weilai`.`sys_depart`
MODIFY COLUMN `parent_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '父机构ID' AFTER `id`;
ALTER TABLE `laws_weilai`.`sys_depart`
- MODIFY COLUMN `depart_order` varchar(100) NULL DEFAULT 0 COMMENT '排序' AFTER `depart_name_abbr`;
\ No newline at end of file
+ MODIFY COLUMN `depart_order` varchar(100) NULL DEFAULT 0 COMMENT '排序' AFTER `depart_name_abbr`;
+
+---2022-05-31
+---OCR识别表 添加字段
+ALTER TABLE `laws_weilai`.`ocr_record`
+ ADD COLUMN `stand_name_en` varchar(255) NULL COMMENT '英文标题' AFTER `stand_name`;
+
+---拆分记录表 添加字段
+ALTER TABLE `laws_weilai`.`sar_file_split_info`
+ ADD COLUMN `title_en` varchar(255) NULL COMMENT '英文标题' AFTER `connect_id`;
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
index 213bef0de..5489a0d02 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
@@ -25,6 +25,7 @@
+
@@ -74,7 +75,8 @@
pm.state as state,
pni.project_name as project_name,
pm.params_template_id as params_template_id,
- pt.params_template_name as params_template_name
+ pt.params_template_name as params_template_name,
+ pm.params_template_publish_version as params_template_publish_version
from params_manifest pm
left join params_template pt on pm.params_template_id = pt.id
left join project_library_base as plb on plb.id = pm.project_id
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java
index 41cef7162..6c7dd779f 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java
@@ -17,4 +17,5 @@ public class ParamsManifestVO {
private String state;
private String paramsTemplateName;
private String paramsTemplateId;
+ private Integer paramsTemplatePublishVersion;
}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index d9f37b415..41ea2a341 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -3183,8 +3183,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl parameter) {
//需要查询的字段
List fieldList = onlCgformFieldService.getFieldList("1");
- fieldList = fieldList.stream().filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
- List fileFieldList = fieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+ List fileFieldList = fieldList.stream()
+ .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType()))
+ .map(OnlCgformField::getDbFieldName)
+ .collect(Collectors.toList());
//查询字段
StringBuilder fieldSb = new StringBuilder();
@@ -3203,7 +3205,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl record1 = (Map) record;
String key = "";
for (Map.Entry entry : record1.entrySet()) {
+
//状态数据字典
if ("state".equals(entry.getKey())) {
List onlCgformFieldList = fieldList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList());
@@ -3283,7 +3290,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl onlCgformFieldList = fieldList.stream().filter(e -> e.getDbFieldName().equals(finalKey)).collect(Collectors.toList());
- record1.put("text_info", onlCgformFieldList.get(0).getDbFieldTxt());
+ record1.put("text_info_id", onlCgformFieldList.get(0).getId());
+ if (CutEnum.CN.getValue().equals((String) parameter.get("cut"))) {
+ record1.put("text_info", onlCgformFieldList.get(0).getDbFieldTxt());
+ } else {
+ record1.put("text_info", onlCgformFieldList.get(0).getDbFieldEnName());
+ }
}
return infoPage;
}
@@ -4294,23 +4306,23 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl
+
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/IOcrRecordEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/IOcrRecordEOService.java
index 598327cf8..122abcee5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/IOcrRecordEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/IOcrRecordEOService.java
@@ -92,4 +92,6 @@ public interface IOcrRecordEOService extends IService {
* @return
*/
void dataProcessing(String cut, List ocrRecordEOList);
+
+ boolean batchUpdateByDocumentSerialNumber(String serialNumber);
}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java
index c5d144f66..05e49972b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java
@@ -1,6 +1,8 @@
package com.jero.modules.ocr.service.impl;
import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.constant.enums.ModuleEnum;
@@ -143,6 +145,13 @@ public class OcrRecordEOServiceImpl extends ServiceImpl documentLibraryFieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
documentLibraryFieldList = documentLibraryFieldList.stream()
.filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
- List fieldFileList = documentLibraryFieldList.stream().map(OnlCgformField::getDbFieldTxt).collect(Collectors.toList());
+ List> fieldFileList = new ArrayList<>();
+ for (OnlCgformField field : documentLibraryFieldList) {
+ Map map1 = new HashMap<>();
+ if (CutEnum.CN.getValue().equals(cut)) {
+ map1.put("label",field.getDbFieldTxt());
+ map1.put("value",field.getId());
+
+ } else {
+ map1.put("label",field.getDbFieldEnName());
+ map1.put("value",field.getId());
+
+ }
+ fieldFileList.add(map1);
+ }
map.put("value_list",fieldFileList);
}
list.add(map);
@@ -243,12 +265,20 @@ public class OcrRecordEOServiceImpl extends ServiceImpl cnMap = dictItemListAll.stream()
.filter(e->e.getItemValue().equals(ocrRecordEO.getResultContent())
|| e.getItemValue().equals(ocrRecordEO.getSyncState()))
.collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText)); // 优化
-// ocrRecordEO.setFileType(cnMap.get(ocrRecordEO.getFileType()));
ocrRecordEO.setResultContent(cnMap.get(ocrRecordEO.getResultContent()));
ocrRecordEO.setSyncState(cnMap.get(ocrRecordEO.getSyncState()));
} else {
@@ -256,10 +286,11 @@ public class OcrRecordEOServiceImpl extends ServiceImple.getItemValue().equals(ocrRecordEO.getResultContent())
|| e.getItemValue().equals(ocrRecordEO.getSyncState()))
.collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName)); // 优化
-// ocrRecordEO.setFileType(enMap.get(ocrRecordEO.getFileType()));
+
ocrRecordEO.setResultContent(enMap.get(ocrRecordEO.getResultContent()));
ocrRecordEO.setSyncState(enMap.get(ocrRecordEO.getSyncState()));
}
+ ocrRecordEO.setFileType(fileType);
if(StringUtils.isNotEmpty(ocrRecordEO.getConnectId())) {
ocrRecordEO.setFileSource(FileSourceEnum.IMPORT.getValue());
}else{
@@ -273,4 +304,15 @@ public class OcrRecordEOServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(OcrRecordEO::getStandNumber, serialNumber);
+ List ocrRecordEOList = list(lambdaQueryWrapper);
+ if (CollectionUtil.isNotEmpty(ocrRecordEOList)) {
+
+ }
+ return false;
+ }
}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRestfulServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRestfulServiceImpl.java
index dcb5b4ad6..e230df951 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRestfulServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRestfulServiceImpl.java
@@ -2,6 +2,7 @@ package com.jero.modules.ocr.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.jero.common.api.vo.Result;
+import com.jero.common.constant.enums.CutEnum;
import com.jero.modules.FeignClient.LocalToolFeignClient;
import com.jero.modules.ocr.entity.OcrRecordEO;
import com.jero.modules.ocr.entity.OcrResultEO;
@@ -107,12 +108,20 @@ public class OcrRestfulServiceImpl implements IOcrRestfulService {
String authCode = RsaUtil.publicEncrypt(OcrAuthCode);
if(authCode == null){
log.error("客户认证RSA加密失败");
- return Result.error("客户认证RSA加密失败");
+ if (CutEnum.CN.getValue().equals(getOcrEO.getCut())) {
+ return Result.error("客户认证RSA加密失败！");
+ } else {
+ return Result.error("Customer authentication RSA encryption failure!");
+ }
}
String fileContent = Base64Util.PDFToBase64(file);
if(fileContent == null){
log.error("PDF转Base64失败");
- return Result.error("PDF转Base64失败");
+ if (CutEnum.CN.getValue().equals(getOcrEO.getCut())) {
+ return Result.error("PDF转Base64失败！");
+ } else {
+ return Result.error("Turn PDF base64 failure!");
+ }
}
MultiValueMap paramMap = new LinkedMultiValueMap();
@@ -146,7 +155,11 @@ public class OcrRestfulServiceImpl implements IOcrRestfulService {
HttpStatus statusCode = responseEntity.getStatusCode();
if(statusCode != HttpStatus.OK){
log.error("请求出现异常："+statusCode.value());
- return Result.error("请求出现异常");
+ if (CutEnum.CN.getValue().equals(getOcrEO.getCut())) {
+ return Result.error("请求出现异常！");
+ } else {
+ return Result.error("Request an exception!");
+ }
}else{
OcrResultEO ocrResultEO = JSONObject.parseObject(responseEntity.getBody(), OcrResultEO.class);
if(ocrResultEO.getResultCode().equals("0")){
@@ -158,14 +171,23 @@ public class OcrRestfulServiceImpl implements IOcrRestfulService {
ocrRecordEO.setSyncState(FileSyncStateEnum.SYNC_NO.getValue());
ocrRecordEO.setStandNumber(getOcrEO.getStandNumber());
ocrRecordEO.setStandName(getOcrEO.getStandName());
- ocrRecordEO.setFileType(getOcrEO.getFileType());
+ ocrRecordEO.setFileType(getOcrEO.getFileType()); // 存文档库文件类型标签的id
ocrRecordEO.setConnectId(getOcrEO.getConnectId());
ocrRecordEO.setAttId(getOcrEO.getAttId());
+ if (StringUtils.isEmpty(getOcrEO.getStandName())) {
+ ocrRecordEO.setStandNameEn(getOcrEO.getStandName());
+ } else {
+ ocrRecordEO.setStandNameEn(getOcrEO.getStandNameEn());
+ }
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// ocrRecordEO.setCreateBy(sysUser.getId());
// ocrRecordEO.setCreateTime(new Date());
ocrRecordEOService.add(ocrRecordEO);
- return Result.OK("加入转换成功", taskId);
+ if (CutEnum.CN.getValue().equals(getOcrEO.getCut())) {
+ return Result.OK("加入转换成功！", taskId);
+ } else {
+ return Result.OK("Join the conversion succeeded!", taskId);
+ }
} else {
OcrRecordEO ocrRecordEO = new OcrRecordEO();
ocrRecordEO.setId(taskId);
@@ -178,8 +200,12 @@ public class OcrRestfulServiceImpl implements IOcrRestfulService {
ocrRecordEO.setCreateTime(new Date());
ocrRecordEO.setConnectId(getOcrEO.getConnectId());
ocrRecordEO.setAttId(getOcrEO.getAttId());
- ocrRecordEOService.editById(ocrRecordEO); //TODO ??
- return Result.OK( "加入转换成功", taskId);
+ ocrRecordEOService.editById(ocrRecordEO);
+ if (CutEnum.CN.getValue().equals(getOcrEO.getCut())) {
+ return Result.OK("加入转换成功！", taskId);
+ } else {
+ return Result.OK("Join the conversion succeeded!", taskId);
+ }
}
}else{
return Result.error(ocrResultEO.getReturnMessage());
@@ -187,7 +213,11 @@ public class OcrRestfulServiceImpl implements IOcrRestfulService {
}
}catch (Exception e){
log.error(e.getMessage(),e);
- return Result.error("OCR接口请求出现异常，无法将文件传输到OCR引擎！");
+ if (CutEnum.CN.getValue().equals(getOcrEO.getCut())) {
+ return Result.error("OCR接口请求出现异常，无法将文件传输到OCR引擎！");
+ } else {
+ return Result.error("OCR Interface request an exception occurs, the files cannot be transferred to the OCR engine!");
+ }
}
}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java
index 34a4c5265..d7cb9f67e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.constant.enums.CutEnum;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.document.service.IBussDocumentLibraryEOService;
import com.jero.modules.lanswitch.service.ILanguageSwitchService;
@@ -66,7 +67,8 @@ public class SarFileSplitInfoController extends JeroController page = new Page(sarFileSplitInfoEOPage.getPageNo(), sarFileSplitInfoEOPage.getPageSize());
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java
index 6a323593d..fc92d651c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java
@@ -69,6 +69,11 @@ public class SarFileSplitInfoEO implements Serializable {
@ApiModelProperty(value = "标题")
private String title;
+ /**英文标题*/
+ @Excel(name = "英文标题", width = 15)
+ @ApiModelProperty(value = "英文标题")
+ private String titleEn;
+
/**文本状态*/
@Excel(name = "文本状态", width = 15, dicCode = "file_type")
// @Dict(dicCode = "file_type")
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitInfoMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitInfoMapper.xml
index c4adcbd3c..c88e06592 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitInfoMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitInfoMapper.xml
@@ -10,6 +10,7 @@
+
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
index dbc463e58..0809f75cc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
@@ -248,19 +248,28 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl cnMap = dictItemListAll.stream()
.filter(e-> e.getItemValue().equals(splitInfoEO.getSplitResult()))
.collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText)); // 优化
-// splitInfoEO.setFileType(cnMap.get(splitInfoEO.getFileType()));
splitInfoEO.setSplitResult(cnMap.get(splitInfoEO.getSplitResult()));
} else {
Map enMap = dictItemListAll.stream()
.filter(e-> e.getItemValue().equals(splitInfoEO.getSplitResult()))
.collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName)); // 优化
-// splitInfoEO.setFileType(enMap.get(splitInfoEO.getFileType()));
splitInfoEO.setSplitResult(enMap.get(splitInfoEO.getSplitResult()));
}
+ splitInfoEO.setFileType(fileType);
// 处理文档库id字段 根据编号和标题查询
List> bussDocumentLibraryEOList = bussDocumentLibraryEOService.getListBySerialNumber(splitInfoEO.getSerialNumber());
if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList)) {
@@ -306,6 +315,12 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl