lyhzzz 6 giorni fa
parent
commit
32f12a4520

+ 2 - 2
src/main/java/com/fdkankan/ucenter/common/OssPath.java

@@ -7,8 +7,8 @@ public class OssPath {
     public final static String v3_scenePath = "data/data%s/scene.json";
     public final static String v4_statusPath = "scene_view_data/%s/data/status.json";
     public final static String v4_scenePath = "scene_view_data/%s/data/scene.json";
-    public final static String localPath = "/mnt/ucenter/work";
-    public final static String localStatusPath = localPath +"/%s/status.json";   //获取临时文件目录
+    public final static String localStatusPath = System.getProperty("java.io.tmpdir") +"/%s/status.json";   //获取临时文件目录
 
+    public final static String localPath = System.getProperty("java.io.tmpdir") +"/ucenter/pdf";
 
 }

+ 5 - 2
src/main/java/com/fdkankan/ucenter/service/impl/InvoiceServiceImpl.java

@@ -10,6 +10,7 @@ import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.ucenter.common.FileUtil;
 import com.fdkankan.ucenter.common.OssPath;
 import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.common.RandomCodeUtil;
@@ -250,8 +251,10 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
         //国际服直接发送邮件
         if("aws".equals(NacosProperty.uploadType)  && dbEntity.getEmailAddress() != null){
             MailTemplate mailTemplate = mailTemplateService.getTemplate(14, "en");
-            MyExcelUtil.excelTemplteToPdf(OssPath.localPath,"invoiceTemplate",dbEntity);
-            mailTemplateService.sendMail(dbEntity.getEmailAddress(),mailTemplate,"");
+            String filePath = MyExcelUtil.excelTemplteToPdf(OssPath.localPath, "invoiceTemplate", dbEntity);
+            mailTemplateService.sendMail(dbEntity.getEmailAddress(),mailTemplate,filePath);
+//            FileUtil.delFile(filePath);
+//            FileUtil.delFile(filePath.replace(".pdf",".xlsx"));
         }
     }
 

+ 6 - 3
src/main/java/com/fdkankan/ucenter/util/MyExcelUtil.java

@@ -27,8 +27,8 @@ import java.util.*;
 public class MyExcelUtil {
 
     //根据模板导出excel
-    public static void excelTemplteToPdf(String localPath, String templateName, Object obj) {
-        String fileName = templateName + UUID.randomUUID().toString() + ".xlsx";
+    public static String excelTemplteToPdf(String localPath, String templateName, Object obj) {
+        String fileName = templateName + UUID.randomUUID().toString().replace("-","") + ".xlsx";
 
         // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替
         // 填充list 的时候还要注意 模板中{.} 多了个点 表示list
@@ -38,6 +38,9 @@ public class MyExcelUtil {
         ExcelWriter excelWriter = null;
 
         String filePath = localPath+File.separator + fileName;
+        if(!new File(filePath).getParentFile().exists()){
+            new File(filePath).mkdirs();
+        }
         excelWriter = EasyExcel.write(filePath)
                 .withTemplate(inputStream)
                 //调用合并策略
@@ -56,7 +59,7 @@ public class MyExcelUtil {
         assert excelWriter != null;
         excelWriter.finish();
         TestForExcel2PDF.excelToPdf(filePath,filePath.replace(".xlsx",".pdf"));
-
+        return filePath.replace(".xlsx",".pdf");
     }
 
     public static void main(String[] args) {