yangjunfeng il y a 1 mois
Parent
commit
e099795db6

+ 26 - 25
tofly-zhongming-gas/service/zmrq/src/main/java/com/tofly/zmrq/custom/service/impl/CustomEpmtSystemServiceImpl.java

@@ -28,6 +28,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 @AllArgsConstructor
@@ -36,14 +37,14 @@ public class CustomEpmtSystemServiceImpl implements CustomEpmtSystemService {
     private EpmtSystemService epmtSystemService;
 
     private String fileToPdf(String filename, MultipartFile f) {
-        String name = f.getOriginalFilename().substring(0, f.getOriginalFilename().lastIndexOf("."));
-        String wordFile = "c:/temp/" + f.getOriginalFilename();
-        String pdfFile = "c:/temp/" + name + ".pdf";
+        String name = Objects.requireNonNull(f.getOriginalFilename()).substring(0, f.getOriginalFilename().lastIndexOf("."));
+        String wordFile = "/data/jars/temp/" + f.getOriginalFilename();
+        String pdfFile = "/data/jars/temp/" + name + ".pdf";
         File file1 = new File(pdfFile);
         if (file1.exists()) {
             file1.delete();
         }
-        ActiveXComponent app = null;
+//        ActiveXComponent app = null;
 
         if (filename.toLowerCase().endsWith(".doc")
                 || filename.toLowerCase().endsWith(".docx")) {
@@ -56,45 +57,45 @@ public class CustomEpmtSystemServiceImpl implements CustomEpmtSystemService {
             /*Document document = new Document();
             document.loadFromFile("c:/temp/" + f.getOriginalFilename());
             document.saveToFile("c:/temp/" + name + ".pdf", FileFormat.PDF);*/
-            try {
-                //打开Word
-                app = new ActiveXComponent("Word.Application");
-                //获取Word中所有打开的文档
-                Dispatch documents = app.getProperty("Documents").toDispatch();
-                //打开文档
-                Dispatch document = Dispatch.call(documents, "Open", wordFile, false, true).toDispatch();
-                Dispatch.call(document, "SaveAs", pdfFile, 17);
-                //关闭文档
-                Dispatch.call(document, "Close", false);
-            } catch (Exception e) {
-                e.printStackTrace();
-            } finally {
-                //关闭软件
-                app.invoke("Quit", 0);
-                file.delete();
-            }
+//            try {
+//                //打开Word
+//                app = new ActiveXComponent("Word.Application");
+//                //获取Word中所有打开的文档
+//                Dispatch documents = app.getProperty("Documents").toDispatch();
+//                //打开文档
+//                Dispatch document = Dispatch.call(documents, "Open", wordFile, false, true).toDispatch();
+//                Dispatch.call(document, "SaveAs", pdfFile, 17);
+//                //关闭文档
+//                Dispatch.call(document, "Close", false);
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            } finally {
+//                //关闭软件
+//                app.invoke("Quit", 0);
+//                file.delete();
+//            }
         } else if (filename.toLowerCase().endsWith(".bmp")
                 || filename.toLowerCase().endsWith(".jpg")
                 || filename.toLowerCase().endsWith(".jpeg")
                 || filename.toLowerCase().endsWith(".gif")
                 || filename.toLowerCase().endsWith(".png")) {
-            File file = new File("c:/temp/images/" + f.getOriginalFilename());
+            File file = new File("/data/jars/temp/" + f.getOriginalFilename());
             try {
                 FileUtils.copyInputStreamToFile(f.getInputStream(), file);
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            file1 = PdfUtil.imagesToPdf2(file1, "c:/temp/images");
+            file1 = PdfUtil.imagesToPdf2(file1, "/data/jars/temp");
             file.delete();
         }
         FileInputStream input = null;
-        MultipartFile m = null;
+        MultipartFile m;
         try {
             input = new FileInputStream(file1);
             m = new MockMultipartFile(file1.getName(), file1.getName(),
                     ContentType.APPLICATION_OCTET_STREAM.toString(), input);
             String filename1 = filePathBean.getEpmtsystem() + IdWorker.getIdStr() + ".pdf";
-            boolean b1 = FtpUtil.uploadFile2Ftp(m, filename1);
+            FtpUtil.uploadFile2Ftp(m, filename1);
             filename = filename + "," + filename1;
         } catch (IOException e) {
             e.printStackTrace();