From 12b0c26e23c76e4532cfe8462aa567993060dc12 Mon Sep 17 00:00:00 2001 From: ljw Date: Mon, 18 Nov 2024 15:21:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E5=90=88=E5=90=8C=E7=AD=BE=E7=AB=A0?= =?UTF-8?q?=E5=90=88=E5=90=8C=E7=9B=96=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salescontrac/op/SalesOrderAutoSignOp.java | 2 +- .../validator/SalescontracValidetor.java | 2 +- .../salesorder/op/SalesOrderAutoSignOp.java | 2 +- .../SalesOrderSignatureValidetor.java | 2 +- .../com/yem/wm/utils/ContactSignUtils.java | 31 +++++-------------- 5 files changed, 11 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/yem/wm/es/salescontrac/op/SalesOrderAutoSignOp.java b/src/main/java/com/yem/wm/es/salescontrac/op/SalesOrderAutoSignOp.java index 929890e7..0c810b5e 100644 --- a/src/main/java/com/yem/wm/es/salescontrac/op/SalesOrderAutoSignOp.java +++ b/src/main/java/com/yem/wm/es/salescontrac/op/SalesOrderAutoSignOp.java @@ -112,7 +112,7 @@ public class SalesOrderAutoSignOp extends AbstractOperationServicePlugIn { InputStream validatorStream = new ByteArrayInputStream(out.toByteArray()); // 获取书签 - List bookMarks = ContactSignUtils.getFileBookMarks(validatorStream, filename); + List bookMarks = ContactSignUtils.getFileBookMarks(validatorStream); validatorSignAble(bookMarks, BOOKMARK, filename); File file; diff --git a/src/main/java/com/yem/wm/es/salescontrac/validator/SalescontracValidetor.java b/src/main/java/com/yem/wm/es/salescontrac/validator/SalescontracValidetor.java index 2c4a0cb3..9a04e972 100644 --- a/src/main/java/com/yem/wm/es/salescontrac/validator/SalescontracValidetor.java +++ b/src/main/java/com/yem/wm/es/salescontrac/validator/SalescontracValidetor.java @@ -86,7 +86,7 @@ public class SalescontracValidetor extends AbstractValidator { InputStream validatorStream = new ByteArrayInputStream(out.toByteArray()); // 获取书签 - List bookMarks = ContactSignUtils.getFileBookMarks(validatorStream, filename); + List bookMarks = ContactSignUtils.getFileBookMarks(validatorStream); for (CTBookmark bookMark : bookMarks) { String bookMarkName = bookMark.getName(); if (bookMarkName.contains(BOOKMARK)) { diff --git a/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderAutoSignOp.java b/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderAutoSignOp.java index 3e0dc895..3d0ce178 100644 --- a/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderAutoSignOp.java +++ b/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderAutoSignOp.java @@ -116,7 +116,7 @@ public class SalesOrderAutoSignOp extends AbstractOperationServicePlugIn { InputStream validatorStream = new ByteArrayInputStream(out.toByteArray()); // 获取书签 - List bookMarks = ContactSignUtils.getFileBookMarks(validatorStream, filename); + List bookMarks = ContactSignUtils.getFileBookMarks(validatorStream); validatorSignAble(bookMarks, BOOKMARK, filename); File file; diff --git a/src/main/java/com/yem/wm/es/salesorder/validator/SalesOrderSignatureValidetor.java b/src/main/java/com/yem/wm/es/salesorder/validator/SalesOrderSignatureValidetor.java index f251e342..8577a9fa 100644 --- a/src/main/java/com/yem/wm/es/salesorder/validator/SalesOrderSignatureValidetor.java +++ b/src/main/java/com/yem/wm/es/salesorder/validator/SalesOrderSignatureValidetor.java @@ -83,7 +83,7 @@ public class SalesOrderSignatureValidetor extends AbstractValidator { InputStream validatorStream = new ByteArrayInputStream(out.toByteArray()); // 获取书签 - List bookMarks = ContactSignUtils.getFileBookMarks(validatorStream,filename); + List bookMarks = ContactSignUtils.getFileBookMarks(validatorStream); for (CTBookmark bookMark : bookMarks) { String bookMarkName = bookMark.getName(); if (bookMarkName.contains(BOOKMARK)) { diff --git a/src/main/java/com/yem/wm/utils/ContactSignUtils.java b/src/main/java/com/yem/wm/utils/ContactSignUtils.java index 1854564e..b70adf42 100644 --- a/src/main/java/com/yem/wm/utils/ContactSignUtils.java +++ b/src/main/java/com/yem/wm/utils/ContactSignUtils.java @@ -7,7 +7,6 @@ import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.message.BasicNameValuePair; import org.apache.http.util.EntityUtils; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; -import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.poi.util.Units; import org.apache.poi.xwpf.usermodel.*; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBookmark; @@ -28,31 +27,15 @@ import java.util.*; public class ContactSignUtils { private static final Logger logger = LoggerFactory.getLogger(ContactSignUtils.class); -// - public static List getFileBookMarks(InputStream in, String filename) { + + public static List getFileBookMarks(InputStream in) { List list = new ArrayList<>(); - int lastIndexOf = filename.lastIndexOf("."); - String extension = ""; - if (lastIndexOf>0) { - extension = filename.substring(lastIndexOf + 1); - } - if ("docx".equals(extension)) { - try (XWPFDocument doc = new XWPFDocument(in)) { - for (XWPFParagraph paragraph : doc.getParagraphs()) { - list.addAll(paragraph.getCTP().getBookmarkStartList()); - } - } catch (IOException e) { - throw new RuntimeException(e); - } - }else if ("doc".equals(extension)){ - try (POIFSFileSystem doc = new POIFSFileSystem(in)){//HWPFDocument - for (int i = 0; i < doc.getBigBlockSize(); i++) { - } - } catch (IOException e) { - throw new RuntimeException(e); + try (XWPFDocument doc = new XWPFDocument(in)) { + for (XWPFParagraph paragraph : doc.getParagraphs()) { + list.addAll(paragraph.getCTP().getBookmarkStartList()); } + } catch (IOException e) { + throw new RuntimeException(e); } return list; }