From 8ff051e8698efc3a8f43bfd1457ae362946a4d86 Mon Sep 17 00:00:00 2001 From: wangchengjun Date: Thu, 12 May 2022 23:40:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86GSO=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E9=80=89=E6=8B=A9=E6=A1=86=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 3 + .../split/enums/SplitFileTypeTypeEnum.java | 11 +-- .../split/service/impl/FileSpiltService.java | 69 +++++++++++++------ .../impl/SarFileSplitInfoServiceImpl.java | 7 +- jero-web/src/common/lang/en-us.js | 12 ++-- jero-web/src/common/lang/zh-cn.js | 12 ++-- .../splitting/modules/SplitText.vue | 31 +++++---- 7 files changed, 91 insertions(+), 54 deletions(-) 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 73953ca9e..7439987fc 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 @@ -2796,6 +2796,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl elements = doc.getBodyElements(); + //修改为读取PDF +// List elements = doc.getBodyElements(); // 记录word自动生成的编号数据 Map numberMap = new HashMap(); boolean menuCanAdd = false; // 判断当前目录下是否可以正常填写数据 - for (IBodyElement element : elements) { + //修改为读取PDF +// for (IBodyElement element : elements) { + //定义初始化数据 + boolean firstFlag = true; + for (String paragraphString : pdfArrays) { + if(paragraphString.contains("SCOPE")){ + firstFlag = false; + } + if(firstFlag){ + continue; + } + // 段落 - if (element instanceof XWPFParagraph) { - XWPFParagraph p = (XWPFParagraph)element; + //修改为读取PDF +// if (element instanceof XWPFParagraph) { +// XWPFParagraph p = (XWPFParagraph)element; // 处理段落生成编号不识别问题 - String paragraphString = p.getText(); +// String paragraphString = p.getText(); if (StringUtils.isNotBlank(paragraphString)) { paragraphString = paragraphString.replace((char) 12288, ' '); paragraphString = paragraphString.trim(); @@ -475,13 +496,13 @@ public class FileSpiltService { } if(!hasGoIf && menuCanAdd) { - if (!p.getText().equals("") ){ - addItermsConditionsText(messageList.get(messageList.size()-1),itemValList,p.getText()); - } - List imageBundleList = readImageInParagraph((XWPFParagraph)p); - if(CollectionUtils.isNotEmpty(imageBundleList)) { - addItermsConditionsImage(messageList.get(messageList.size()-1),itemValList, p,imageBundleList); + if (!paragraphString.equals("") ){ + addItermsConditionsText(messageList.get(messageList.size()-1),itemValList,paragraphString); } +// List imageBundleList = readImageInParagraph((XWPFParagraph)p); +// if(CollectionUtils.isNotEmpty(imageBundleList)) { +// addItermsConditionsImage(messageList.get(messageList.size()-1),itemValList, p,imageBundleList); +// } // } hasGoIf = true; } @@ -490,14 +511,17 @@ public class FileSpiltService { break; } - } else if (element instanceof XWPFTable){ - if(messageList != null && !messageList.isEmpty()){ - addItermsConditionsOfTable(messageList.get(messageList.size()-1),itemValList,(XWPFTable)element); - } - } + //修改为读取PDF +// } else if (element instanceof XWPFTable){ +// if(messageList != null && !messageList.isEmpty()){ +// addItermsConditionsOfTable(messageList.get(messageList.size()-1),itemValList,(XWPFTable)element); +// } +// } } - } catch (Exception e) { + }catch (JeroBootException e){ + throw new JeroBootException(e.getMessage()); + }catch (Exception e) { e.printStackTrace(); return -1; } @@ -1845,7 +1869,8 @@ public class FileSpiltService { a: for (SarFileSplitMenuEO forDocumentTree : treeList) { switch (enumByValue) { - case CN: + case GB: + case GBT: case US: case GSO: if (name.indexOf(".") >= 0) { @@ -1869,7 +1894,7 @@ public class FileSpiltService { documentTreeEO.setPId(generalCatalogueId); } break; - case JAPAN_ONE: + case JPN_ATTACHMENT: if (name.contains(".")) { if (name.indexOf(".") >= 0) { if (name.substring(0, name.lastIndexOf(".")).equals(forDocumentTree.getName())) { @@ -1891,7 +1916,7 @@ public class FileSpiltService { } } break; - case JAPAN_TWO: + case JPN_ARTICLE: if (name.indexOf("=") >= 0) { String[] nameSplit = name.split("="); 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 f16f11e92..39b43fea8 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 @@ -78,7 +78,8 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl *{{$t('fileType')}} - - GSO + + {{$t('GSO')}} {{$t('KMVSS_Table')}} @@ -31,20 +31,23 @@ {{$t('KMVSS_Article')}} - - {{$t('America')}} + + {{$t('CFR')}} - - {{$t('Europe')}} + + {{$t('UNECE')}} - - {{$t('Japan_one')}} + + {{$t('JPN_Attachment')}} - - {{$t('Japan_two')}} + + {{$t('JPN_Article')}} - - {{$t('China')}} + + {{$t('GB')}} + + + {{$t('GBT')}} @@ -133,7 +136,7 @@ seachList: 'document/bussDocumentLibraryEO/getHeaderOrConditionForSplitResult', //搜索字段 tableList: 'split/sarFileSplitInfo/splitFilePageInfo', //表格数据 }, - type:'doc', + type:'pdfdoc', OperationList:[], token:Vue.ls.get(ACCESS_TOKEN), cut:'', @@ -217,7 +220,7 @@ if (file.file_name) { let name = file.file_name.split('.') let nameSuffix = name[name.length - 1] - if (nameSuffix.toLowerCase() === 'doc'||nameSuffix.toLowerCase() === 'docx') { + if (nameSuffix.toLowerCase() === 'doc'||nameSuffix.toLowerCase() === 'docx'||nameSuffix.toLowerCase() === 'pdf') { let params = { attId: file.id, title: file.title,