Jelajahi Sumber

fix: 调整html的文件名称,确保文件名称不要太长

chenjianhua 3 bulan lalu
induk
melakukan
f273cba520

+ 2 - 2
service-base/src/main/java/com/simuwang/base/common/util/EmailUtil.java

@@ -66,7 +66,7 @@ public class EmailUtil {
             // 1.邮件正文
             if ("String".equals(contentClass)) {
                 // 文件名 = 邮件主题 + 邮件日期
-                String fileName = emailTitle + "_" + emailDate + ".html";
+                String fileName = emailDate+"_邮件正文" + System.currentTimeMillis() + "_" + emailDate + ".html";
                 String content = partContent.toString();
                 emailContentInfoDTO = collectTextPart(part, content, filePath, fileName);
             } else if ("BASE64DecoderStream".equals(contentClass)) {
@@ -99,7 +99,7 @@ public class EmailUtil {
                     contentClass = partContent.getClass().getSimpleName();
                     if ("String".equals(contentClass)) {
                         // 文件名 = 邮件主题 + 邮件日期
-                        String fileName = emailTitle + "_" + emailDate + ".html";
+                        String fileName = emailDate+"_邮件正文" + System.currentTimeMillis() + "_" + emailDate + ".html";
                         String content = partContent.toString();
                         emailContentInfoDTO = collectTextPart(part, content, filePath, fileName);
                     }

+ 1 - 1
service-daq/src/main/java/com/simuwang/daq/service/EmailParseService.java

@@ -871,7 +871,7 @@ public class EmailParseService {
                     emailContentInfoDTO.setEmailContent(content.toString());
                     emailContentInfoDTO.setEmailDate(emailDateStr);
                     emailContentInfoDTO.setEmailTitle(message.getSubject());
-                    String fileName = message.getSubject() + DateUtil.format(emailDate, DateConst.YYYYMMDDHHMMSS24);
+                    String fileName = DateUtil.format(emailDate, DateConst.YYYYMMDDHHMMSS24)+"邮件正文" + System.currentTimeMillis();
                     String filePath = path + mailboxInfoDTO.getAccount() + "/" + DateUtil.format(emailDate, DateConst.YYYY_MM_DD) + "/" + fileName + ".html";
                     File saveFile = new File(filePath);
                     saveFile.setReadable(true);

+ 1 - 1
service-daq/src/main/java/com/simuwang/daq/service/NavEmailParser.java

@@ -48,7 +48,7 @@ public class NavEmailParser extends AbstractEmailParser {
 
     private static final int MAX_COLUMN = 20;
 
-    private static final List<String> NOT_CONVERT_FIELD_LIST = ListUtil.toList("TA代码");
+    private static final List<String> NOT_CONVERT_FIELD_LIST = ListUtil.toList("TA代码","TA产品代码","TA产品名称");
 
     public NavEmailParser(ValuationEmailParser valuationEmailParser, EmailTemplateService emailTemplateService) {
         this.valuationEmailParser = valuationEmailParser;