|
@@ -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;
|
|
|
+
|
|
|
|
|
|
if (filename.toLowerCase().endsWith(".doc")
|
|
|
|| filename.toLowerCase().endsWith(".docx")) {
|
|
@@ -56,45 +57,45 @@ public class CustomEpmtSystemServiceImpl implements CustomEpmtSystemService {
|
|
|
|
|
|
document.loadFromFile("c:/temp/" + f.getOriginalFilename());
|
|
|
document.saveToFile("c:/temp/" + name + ".pdf", FileFormat.PDF);*/
|
|
|
- try {
|
|
|
-
|
|
|
- app = new ActiveXComponent("Word.Application");
|
|
|
-
|
|
|
- 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();
|