From 77fefb399769a893a8b440b656a7238d106b0606 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 11 Aug 2022 17:51:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93,OCR=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB,=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86,=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=AE=A1=E7=90=86-=E7=BF=BB=E8=AF=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql | 38 +++++++++++++++++++
 .../BussDocumentLibraryEOServiceImpl.java     | 20 +++++-----
 .../service/impl/OcrRecordEOServiceImpl.java  |  6 ++-
 .../split/service/impl/FileSpiltService.java  | 36 ++++++++----------
 4 files changed, 69 insertions(+), 31 deletions(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 0db7ddb5f..c51c09d04 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -866,3 +866,41 @@ INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_ti
 INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('7', NULL, NULL, NULL, NULL, NULL, '马来西亚', 'Malaysia', NULL, '/jero-boot/nationalFlag/Malaysia.png');
 INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('8', NULL, NULL, NULL, NULL, NULL, '海湾地区', 'GCC', NULL, '海湾地区.jpg');
 INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('9', NULL, NULL, NULL, NULL, NULL, '阿联酋', 'UAE', NULL, '/jero-boot/nationalFlag/UAE.png');
+
+
+-- 展示区域 英文修改 2022-08-11
+UPDATE `laws_weilai`.`onl_cgform_area` SET `en_name` = 'Relevant Information' WHERE `id` = '1492408622838222850';
+UPDATE `laws_weilai`.`onl_cgform_area` SET `en_name` = 'General Information' WHERE `id` = '1499657602378825729';
+UPDATE `laws_weilai`.`onl_cgform_area` SET `en_name` = 'Document Files' WHERE `id` = '1499658880093847553';
+
+-- 数据字典 英文修改 2022-08-11
+-- 同步情况 sync_state
+UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'No' WHERE `id` = '1507311752583352322';
+UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Yes' WHERE `id` = '1507311835571851265';
+-- 转换结果 result_content
+UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'In progress' WHERE `id` = '1496785163561398273';
+UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Success' WHERE `id` = '1496785251536924674';
+UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Fail' WHERE `id` = '1496785330251427841';
+-- 机构类型 org_category
+UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Depart' WHERE `id` = '1174511244036587521';
+UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Company' WHERE `id` = '1174511197735665665';
+UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Position' WHERE `id` = '1174509082208395266';
+
+-- 表字段 英文修改 2022-08-11
+-- OCR识别转换记录表
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Conversion Result' WHERE `id` = '6b29f1c0e03533bb380c5ead03195785';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Conversion Time' WHERE `id` = '85894f5ad04de66ccf45ebd96c97b534';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Text Status' WHERE `id` = '0240325189062ca96d262e44ccb5811b';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'File Name' WHERE `id` = 'a049f9915ab5f6be06d4b56f609b75ca';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Sync State' WHERE `id` = 'e560314880e6097deb64594262e09dab';
+-- 文档拆分表
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Split Time' WHERE `id` = '29c73fd0b2eeacb9870ab32f2f82eb3d';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Text Status' WHERE `id` = '804ff1fcbca3f47bdc9009b34069a9c5';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'File Name' WHERE `id` = 'c975087db4023e6e4a5b3732f0835e2e';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Split Result' WHERE `id` = 'e071def461ccb368dd9ae0ad4f982bc7';
+-- 文档拆分条款信息表
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Info Type' WHERE `id` = '09fa6530229280174071eae0514e0f63';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item No.' WHERE `id` = '0a455895498552bc709dff250b3364b1';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item Name' WHERE `id` = '9e91b704de198ccf2f5fb7297e675404';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item Content' WHERE `id` = '120a92b6d595c2fd68d2b90278357ce4';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Technical Field' WHERE `id` = 'ccf68e6578a0a446a6ac34018f0a477d';
\ No newline at end of file
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 3288a7854..bef304927 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
@@ -4575,7 +4575,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             } else {
                 //编号
                 map1.put("db_field_name", "serial_number");//字段
-                map1.put("db_field_txt", "Serial number");//字段中文名
+                map1.put("db_field_txt", "Number");//字段中文名
                 list.add(map1);
                 //标题
                 map2.put("db_field_name", "title_en");//字段
@@ -4583,15 +4583,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 list.add(map2);
                 //状态
                 map3.put("db_field_name", "state");//字段
-                map3.put("db_field_txt", "State");//字段中文名
+                map3.put("db_field_txt", "Status");//字段中文名
                 list.add(map3);
                 //文件名称
                 map4.put("db_field_name", "file_name");//字段
-                map4.put("db_field_txt", "File name");//字段中文名
+                map4.put("db_field_txt", "File Name");//字段中文名
                 list.add(map4);
                 //文件信息
                 map5.put("db_field_name", "text_info");//字段
-                map5.put("db_field_txt", "Text info");//字段中文名
+                map5.put("db_field_txt", "Text Info");//字段中文名
                 list.add(map5);
             }
         } else if ("condition".equals(flag)) {
@@ -4611,7 +4611,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             } else {
                 //编号
                 map1.put("db_field_name", "serial_number");//字段
-                map1.put("db_field_txt", "Serial number");//字段中文名
+                map1.put("db_field_txt", "Number");//字段中文名
                 map1.put("dict_field", "");//数据字典
                 map1.put("field_show_type", "1");
                 list.add(map1);
@@ -4662,7 +4662,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             } else {
                 //编号
                 map1.put("db_field_name", "serial_number");//字段
-                map1.put("db_field_txt", "Serial number");//字段中文名
+                map1.put("db_field_txt", "Number");//字段中文名
                 list.add(map1);
                 //标题
                 map2.put("db_field_name", "title_en");//字段
@@ -4670,11 +4670,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 list.add(map2);
                 //文件名称
                 map3.put("db_field_name", "file_name");//字段
-                map3.put("db_field_txt", "File name");//字段中文名
+                map3.put("db_field_txt", "File Name");//字段中文名
                 list.add(map3);
                 //文件信息
                 map4.put("db_field_name", "text_info");//字段
-                map4.put("db_field_txt", "Text info");//字段中文名
+                map4.put("db_field_txt", "Text Info");//字段中文名
                 list.add(map4);
             }
         } else if ("condition".equals(flag)) {
@@ -4694,13 +4694,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             } else {
                 //编号
                 map1.put("db_field_name", "serial_number");//字段
-                map1.put("db_field_txt", "serial number");//字段中文名
+                map1.put("db_field_txt", "Number");//字段中文名
                 map1.put("dict_field", "");//数据字典
                 map1.put("field_show_type", "1");
                 list.add(map1);
                 //标题
                 map2.put("db_field_name", "title");//字段
-                map2.put("db_field_txt", "title");//字段中文名
+                map2.put("db_field_txt", "Title");//字段中文名
                 map2.put("dict_field", "");//数据字典
                 map2.put("field_show_type", "1");
                 list.add(map2);
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 0ccda417a..29757efa8 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
@@ -214,7 +214,11 @@ public class OcrRecordEOServiceImpl extends ServiceImpl<OcrRecordEOMapper, OcrRe
 			if (CutEnum.CN.getValue().equals(cut)) {
 				map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
 			} else {
-				map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
+				if("stand_name_en".equals(onlCgformField.getDbFieldName())) { // 英文标题字段特殊处理
+					map.put("db_field_txt", "English Title");
+				} else {
+					map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
+				}
 			}
 			if("文本状态".equals(onlCgformField.getDbFieldTxt())){
 				// 查询文档库所有文件类型的字段名称
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
index be5acd7fe..64e066ab9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
@@ -16,10 +16,8 @@ import com.jero.modules.split.service.IFileSplitItemsEOService;
 import com.jero.modules.split.service.ISarFileSplitItemsValEOService;
 import com.jero.modules.split.util.FileSplitUtils;
 import com.jero.modules.split.util.ReadWordTable;
-import com.qcloud.cos.utils.IOUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.pdfbox.cos.COSBase;
 import org.apache.poi.xwpf.usermodel.*;
 import org.apache.shiro.SecurityUtils;
 import org.apache.xmlbeans.XmlCursor;
@@ -36,11 +34,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import sun.misc.BASE64Encoder;
 
-import java.io.*;
-import java.net.InetAddress;
-import java.nio.charset.StandardCharsets;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -411,9 +407,9 @@ public class FileSpiltService {
 
         String generalCatalogueId = UUIDUtils.randomUUID20();
         SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO();
-//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
+//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General Catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
         documentTreeEO.setId(generalCatalogueId);
-        documentTreeEO.setName("General catalogue");
+        documentTreeEO.setName("General Catalogue");
         documentTreeEO.setInfoId(sarFileSplitInfoEO.getId());
         documentTreeEO.setDisplaySeq(1L);
         documentTreeEO.setDisplaySeq(treeListDisplay++);
@@ -627,9 +623,9 @@ public class FileSpiltService {
 
         String generalCatalogueId = UUIDUtils.randomUUID20();
         SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO();
-//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
+//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General Catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
         documentTreeEO.setId(generalCatalogueId);
-        documentTreeEO.setName("General catalogue");
+        documentTreeEO.setName("General Catalogue");
         documentTreeEO.setInfoId(sarFileSplitInfoEO.getId());
         documentTreeEO.setDisplaySeq(1L);
         documentTreeEO.setDisplaySeq(treeListDisplay++);
@@ -809,9 +805,9 @@ public class FileSpiltService {
 
         String generalCatalogueId = UUIDUtils.randomUUID20();
         SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO();
-//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
+//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General Catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
         documentTreeEO.setId(generalCatalogueId);
-        documentTreeEO.setName("General catalogue");
+        documentTreeEO.setName("General Catalogue");
         documentTreeEO.setInfoId(sarFileSplitInfoEO.getId());
         documentTreeEO.setDisplaySeq(1L);
         documentTreeEO.setDisplaySeq(treeListDisplay++);
@@ -998,9 +994,9 @@ public class FileSpiltService {
 
         String generalCatalogueId = UUIDUtils.randomUUID20();
         SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO();
-//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
+//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General Catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
         documentTreeEO.setId(generalCatalogueId);
-        documentTreeEO.setName("General catalogue");
+        documentTreeEO.setName("General Catalogue");
         documentTreeEO.setInfoId(sarFileSplitInfoEO.getId());
         documentTreeEO.setDisplaySeq(1L);
         documentTreeEO.setDisplaySeq(treeListDisplay++);
@@ -1185,9 +1181,9 @@ public class FileSpiltService {
 
         String generalCatalogueId = UUIDUtils.randomUUID20();
         SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO();
-//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
+//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General Catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
         documentTreeEO.setId(generalCatalogueId);
-        documentTreeEO.setName("General catalogue");
+        documentTreeEO.setName("General Catalogue");
         documentTreeEO.setInfoId(sarFileSplitInfoEO.getId());
         documentTreeEO.setDisplaySeq(1L);
         documentTreeEO.setDisplaySeq(treeListDisplay++);
@@ -1362,9 +1358,9 @@ public class FileSpiltService {
 
         String generalCatalogueId = UUIDUtils.randomUUID20();
         SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO();
-//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
+//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General Catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
         documentTreeEO.setId(generalCatalogueId);
-        documentTreeEO.setName("General catalogue");
+        documentTreeEO.setName("General Catalogue");
         documentTreeEO.setInfoId(sarFileSplitInfoEO.getId());
         documentTreeEO.setDisplaySeq(1L);
         documentTreeEO.setDisplaySeq(treeListDisplay++);
@@ -1546,9 +1542,9 @@ public class FileSpiltService {
 
         String generalCatalogueId = UUIDUtils.randomUUID20();
         SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO();
-//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
+//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General Catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
         documentTreeEO.setId(generalCatalogueId);
-        documentTreeEO.setName("General catalogue");
+        documentTreeEO.setName("General Catalogue");
         documentTreeEO.setInfoId(sarFileSplitInfoEO.getId());
         documentTreeEO.setDisplaySeq(1L);
         documentTreeEO.setDisplaySeq(treeListDisplay++);