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 c2d1b71bd..5dd0cceba 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 @@ -1729,7 +1729,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.in(BussDocumentLibraryEO::getId,id); - List> mapList = this.listMaps(); + List> mapList = this.listMaps(wrapper); String title = ""; if(mapList.size() != 0){ if(CutEnum.CN.getValue().equals(cut)){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/utils/ReadPdfUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/utils/ReadPdfUtil.java index 26d68e895..d961900fe 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/utils/ReadPdfUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/utils/ReadPdfUtil.java @@ -1,13 +1,13 @@ package com.jero.modules.document.utils; import com.jero.common.exception.JeroBootException; +import com.jero.common.util.oss.CosBootUtil; import org.apache.pdfbox.pdmodel.PDDocument; -import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException; import org.apache.pdfbox.text.PDFTextStripper; import org.apache.pdfbox.text.PDFTextStripperByArea; -import java.io.File; import java.io.IOException; +import java.io.InputStream; /** * @description @@ -17,24 +17,48 @@ import java.io.IOException; public class ReadPdfUtil { public static String readPdf(String path) { -// path="E:\\DeskTop\\4444.pdf"; - try (PDDocument document = PDDocument.load(new File(path))) { - document.getClass(); + if(CosBootUtil.doesObjectExist(path)){ + InputStream in = CosBootUtil.download(path); + try (PDDocument document = PDDocument.load(in)) { + document.getClass(); // if(!document.isEncrypted()) { - PDFTextStripperByArea stripper = new PDFTextStripperByArea(); - stripper.setSortByPosition(true); - PDFTextStripper tStripper = new PDFTextStripper(); + PDFTextStripperByArea stripper = new PDFTextStripperByArea(); + stripper.setSortByPosition(true); + PDFTextStripper tStripper = new PDFTextStripper(); - String pdfFileInText = tStripper.getText(document); - return pdfFileInText; + String pdfFileInText = tStripper.getText(document); + return pdfFileInText; // String[] lines = pdfFileInText.split("\\r?\\n"); // for(String line : lines) { // System.out.println(line); // } // } - }catch (IOException e) { - throw new JeroBootException("文件内容读取失败"); + }catch (IOException e) { + throw new JeroBootException("文件内容读取失败"); + } } + return null; } +// public static String readPdf(String path) { +//// path="E:\\DeskTop\\4444.pdf"; +// try (PDDocument document = PDDocument.load(new File(path))) { +// document.getClass(); +//// if(!document.isEncrypted()) { +// PDFTextStripperByArea stripper = new PDFTextStripperByArea(); +// stripper.setSortByPosition(true); +// PDFTextStripper tStripper = new PDFTextStripper(); +// +// String pdfFileInText = tStripper.getText(document); +// return pdfFileInText; +// +//// String[] lines = pdfFileInText.split("\\r?\\n"); +//// for(String line : lines) { +//// System.out.println(line); +//// } +//// } +// }catch (IOException e) { +// throw new JeroBootException("文件内容读取失败"); +// } +// } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/utils/ReadWordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/utils/ReadWordUtil.java index 28a7daff3..172ac7d40 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/utils/ReadWordUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/utils/ReadWordUtil.java @@ -1,6 +1,7 @@ package com.jero.modules.document.utils; import com.jero.common.exception.JeroBootException; +import com.jero.common.util.oss.CosBootUtil; import org.apache.poi.POIXMLDocument; import org.apache.poi.POIXMLTextExtractor; import org.apache.poi.hwpf.extractor.WordExtractor; @@ -8,32 +9,50 @@ import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.xwpf.extractor.XWPFWordExtractor; import java.io.File; -import java.io.FileInputStream; import java.io.InputStream; +import static com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl.copyFile; + /** * @description * @date 2022/3/21 17:04 * @auth zhn */ public class ReadWordUtil { - - public static String readWord(String path) { + public static String readWord(String path,String uploadpath) { // String path = "E:\\DeskTop\\1111.doc"; // path = "E:\\DeskTop\\22222.docx"; // String path = "E:\\DeskTop\\标准所ISO-用户手册.doc"; String str = ""; try { if (path.endsWith(".doc")) { - InputStream is = new FileInputStream(new File(path)); - WordExtractor ex = new WordExtractor(is); - str = ex.getText(); - ex.close(); + if(CosBootUtil.doesObjectExist(path)){ + InputStream in = CosBootUtil.download(path); + WordExtractor ex = new WordExtractor(in); + str = ex.getText(); + ex.close(); + } } else if (path.endsWith("docx")) { - OPCPackage opcPackage = POIXMLDocument.openPackage(path); - POIXMLTextExtractor extractor = new XWPFWordExtractor(opcPackage); - str = extractor.getText(); - extractor.close(); + //先把文件存到本地, 用完后在删除 + if(CosBootUtil.doesObjectExist(path)){ + InputStream in = CosBootUtil.download(path); + String fileNowPath = uploadpath + "/tempZip/" ; + File file = new File(fileNowPath); + if (file.exists()) { + file.delete(); + } + file.mkdirs(); + File fileOld = new File(path); + long currentTime = System.currentTimeMillis(); + copyFile(in, fileNowPath + File.separator + currentTime + fileOld.getName()); + File fileTemp = new File(fileNowPath + File.separator + currentTime + fileOld.getName()); + String pathTemp = fileTemp.getPath(); + OPCPackage opcPackage = POIXMLDocument.openPackage(pathTemp); + POIXMLTextExtractor extractor = new XWPFWordExtractor(opcPackage); + str = extractor.getText().trim(); + extractor.close(); + fileTemp.delete(); + } } else { throw new JeroBootException("此文件不是word文件"); } @@ -44,4 +63,30 @@ public class ReadWordUtil { throw new JeroBootException("文件内容读取失败"); } } +// public static String readWord(String path) { +//// String path = "E:\\DeskTop\\1111.doc"; +//// path = "E:\\DeskTop\\22222.docx"; +//// String path = "E:\\DeskTop\\标准所ISO-用户手册.doc"; +// String str = ""; +// try { +// if (path.endsWith(".doc")) { +// InputStream is = new FileInputStream(new File(path)); +// WordExtractor ex = new WordExtractor(is); +// str = ex.getText(); +// ex.close(); +// } else if (path.endsWith("docx")) { +// OPCPackage opcPackage = POIXMLDocument.openPackage(path); +// POIXMLTextExtractor extractor = new XWPFWordExtractor(opcPackage); +// str = extractor.getText(); +// extractor.close(); +// } else { +// throw new JeroBootException("此文件不是word文件"); +// } +// return str; +// } catch (Exception e) { +// throw new JeroBootException("文件内容读取失败"); +// }catch (NoSuchFieldError e){ +// throw new JeroBootException("文件内容读取失败"); +// } +// } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java index 5f5eedf04..e873f2709 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java @@ -231,7 +231,6 @@ public class DummyInventoryInfoEOEn implements Serializable { private String verifyDeliverableType; /**验证符合性确认-交付物模板*/ - @ApiModelProperty(value = "验证符合性确认-交付物模板") private String verifyDeliverableTemplate; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 908efb6e9..66ec3dc3e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -5322,7 +5322,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params, HttpServletRequest req, HttpServletResponse resp) { - File templateFile = null; File exportFile = null; InputStream fin = null; ServletOutputStream out = null; @@ -5463,7 +5462,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpleot ttf svg + svg + doc + docx