diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index 36deb7b4..e8d2cc34 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -154,17 +154,17 @@ public class FileSpiltService { ZipSecureFile.setMinInflateRatio(-1.0d); XWPFDocument doc = new XWPFDocument(is); // 获取文档中的图片 - List allPictures = doc.getAllPictures(); - // 遍历图片并处理数学公式 - for (XWPFPictureData pictureData : allPictures) { - String contentType = pictureData.getPackagePart().getContentType(); - System.out.println(contentType); - // 判断图片类型是否为数学公式 - if (contentType.equals(PictureType.EMF.getExtension())) { - // 处理数学公式,你可以在这里添加自己的逻辑 - System.out.println("Found a math equation!"); - } - } + //List allPictures = doc.getAllPictures(); + //// 遍历图片并处理数学公式 + //for (XWPFPictureData pictureData : allPictures) { + // String contentType = pictureData.getPackagePart().getContentType(); + // System.out.println(contentType); + // // 判断图片类型是否为数学公式 + // if (contentType.equals(PictureType.EMF.getExtension())) { + // // 处理数学公式,你可以在这里添加自己的逻辑 + // System.out.println("Found a math equation!"); + // } + //} //获得序号标题和无标题序号 TitleNumberVO titleNumberVO = AsposeUtil.getNumber(is1); //TitleNumberVO titleNumberVO = new TitleNumberVO(); @@ -427,7 +427,7 @@ public class FileSpiltService { } } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage(),e); return -1; } if (treeList.size() > 0 && messageList.size() > 0) { diff --git a/laws-modules/src/main/java/com/jero/modules/split/util/ReadWordTable.java b/laws-modules/src/main/java/com/jero/modules/split/util/ReadWordTable.java index 764cea68..c3e61b93 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/util/ReadWordTable.java +++ b/laws-modules/src/main/java/com/jero/modules/split/util/ReadWordTable.java @@ -144,6 +144,9 @@ public class ReadWordTable { if (tcPr.getVMerge() == null) { return false; } + if (tcPr.getVMerge().getVal() == null){ + return false; + } if (tcPr.getVMerge().getVal().toString().equalsIgnoreCase("continue")) { return true; }