|
@@ -410,15 +410,17 @@ public class EmailParseService {
|
|
|
Integer fileId = emailFileInfo.getId();
|
|
|
String aiFileId = emailFileInfo.getAiFileId();
|
|
|
|
|
|
- // 首页和尾页转为png图片,首页用来识别基金名称和基金代码、尾页用来识别印章和联系人
|
|
|
- List<String> images = null;
|
|
|
- try {
|
|
|
- String parent = FileUtil.getParent(filepath, 1);
|
|
|
- String output = parent + File.separator + "image";
|
|
|
- images = PdfUtil.convertFirstAndLastPagesToPng(filepath, FileUtil.file(output), 300);
|
|
|
- } catch (Exception e) {
|
|
|
- log.warn("报告[{}] 生成图片失败:{}", fileName, ExceptionUtil.stacktraceToString(e));
|
|
|
- }
|
|
|
+// // 首页和尾页转为png图片,首页用来识别基金名称和基金代码、尾页用来识别印章和联系人 todo
|
|
|
+// List<String> images = null;
|
|
|
+// try {
|
|
|
+// String output = FileUtil.getParent(filepath, 1) + File.separator + "image";
|
|
|
+// images = PdfUtil.convertFirstAndLastPagesToPng(filepath, FileUtil.file(output), 300);
|
|
|
+// if (log.isInfoEnabled()) {
|
|
|
+// log.info("报告[{}] 生成的图片地址是:{}", fileName, images);
|
|
|
+// }
|
|
|
+// } catch (Exception e) {
|
|
|
+// log.warn("报告[{}] 生成图片失败:{}", fileName, ExceptionUtil.stacktraceToString(e));
|
|
|
+// }
|
|
|
|
|
|
// 不支持解析的格式文件
|
|
|
boolean notSupportFile = false;
|
|
@@ -542,11 +544,6 @@ public class EmailParseService {
|
|
|
emailParseInfoMapper.updateParseTime(emailParseInfoDO.getId(), emailParseInfoDO.getParseDate());
|
|
|
return emailParseInfoDO.getId();
|
|
|
}
|
|
|
-// // 根据邮件发送人、邮件地址、邮箱日期、主题找到是否已经存在的记录(不管是否成功),已存在就不解析了
|
|
|
-// EmailParseInfoDO temp = this.emailParseInfoMapper.searchEmail(emailParseInfoDO);
|
|
|
-// if (temp != null) {
|
|
|
-// return null;
|
|
|
-// }
|
|
|
emailParseInfoMapper.insert(emailParseInfoDO);
|
|
|
return emailParseInfoDO.getId();
|
|
|
}
|
|
@@ -648,7 +645,9 @@ public class EmailParseService {
|
|
|
|| (endDate != null && emailDate.compareTo(endDate) > 0)
|
|
|
|| (startDate != null && emailDate.compareTo(startDate) < 0);
|
|
|
if (isNotParseConditionSatisfied) {
|
|
|
- log.warn("{} 邮件{} 没有日期{} 或者 邮件日期不在区间内【{} ~ {}】", folderName, emailTitle, emailDate, startDate, endDate);
|
|
|
+ String st = DateUtil.formatDateTime(startDate);
|
|
|
+ String ed = DateUtil.formatDateTime(endDate);
|
|
|
+ log.warn("{} 邮件[{}]日期{}不在区间内【{} ~ {}】", folderName, emailTitle, emailDateStr, st, ed);
|
|
|
continue;
|
|
|
}
|
|
|
senderEmail = getSenderEmail(message);
|