xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 解决获取邮件主题时 如果出错导致邮件被删除问题

Browse Source
This commit is contained in:
orgin 2024-02-26 11:08:47 +08:00
parent 5cfa3e62d3
commit 720a9e47ce
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumParsingActuator.java
View File

@ -83,6 +83,7 @@ public class SpectrumParsingActuator implements Runnable{
@Override @Override
public void run() { public void run() {
String subject = null; String subject = null;
boolean downloadFlag = false;
try { try {
//获取邮件主题 //获取邮件主题
subject = emailServiceManager.getMailSubject(message,this.batchesCounter); subject = emailServiceManager.getMailSubject(message,this.batchesCounter);
@ -97,6 +98,8 @@ public class SpectrumParsingActuator implements Runnable{
//所有邮件都需以.eml格式存储到eml文件夹中 //所有邮件都需以.eml格式存储到eml文件夹中
final File emlFile = emailServiceManager.downloadEmailToEmlDir(message, emailCounter.getCurrValue(),this.batchesCounter); final File emlFile = emailServiceManager.downloadEmailToEmlDir(message, emailCounter.getCurrValue(),this.batchesCounter);
downloadFlag = true;
//保存邮件日志到PG数据库 //保存邮件日志到PG数据库
this.spectrumServiceQuotes.getMailLogService().create(message,emailProperties); this.spectrumServiceQuotes.getMailLogService().create(message,emailProperties);
@ -126,13 +129,14 @@ public class SpectrumParsingActuator implements Runnable{
final String emlErrorPath = spectrumServiceQuotes.getSpectrumPathProperties().getEmlErrorPath(); final String emlErrorPath = spectrumServiceQuotes.getSpectrumPathProperties().getEmlErrorPath();
final String finalPath = rootPath+emlErrorPath; final String finalPath = rootPath+emlErrorPath;
FileOperation.moveFile(emlFile,finalPath,true); FileOperation.moveFile(emlFile,finalPath,true);
// 删除 key，防止下次线程执行删除邮件
spectrumServiceQuotes.getRedisUtil().del(key); spectrumServiceQuotes.getRedisUtil().del(key);
throw new DownloadEmailException("邮件移走后手动抛出DownloadEmailException"); throw new DownloadEmailException("邮件移走后手动抛出DownloadEmailException");
} }
} }
} catch (Exception e) { } catch (Exception e) {
// 如果不是下载导致的失败，则删除下载的邮件对象 // 如果不是下载导致的失败 并且 下载成功，则删除下载的邮件对象
if(!(e instanceof DownloadEmailException)){ if(!(e instanceof DownloadEmailException) && downloadFlag){
try { try {
log.error("Remove Email："+ message.getSubject() + StringPool.UNDERSCORE + DateUtils.formatDate(message.getReceivedDate(), "yyyy-MM-dd HH:mm:ss") + StringPool.UNDERSCORE); log.error("Remove Email："+ message.getSubject() + StringPool.UNDERSCORE + DateUtils.formatDate(message.getReceivedDate(), "yyyy-MM-dd HH:mm:ss") + StringPool.UNDERSCORE);
} catch (MessagingException ex) { } catch (MessagingException ex) {
@ -141,7 +145,11 @@ public class SpectrumParsingActuator implements Runnable{
emailServiceManager.removeMail(message,batchesCounter); emailServiceManager.removeMail(message,batchesCounter);
} }
//输出异常信息 //输出异常信息
log.error("邮件处理异常：",e); try {
log.error("邮件处理异常{}，邮件主题:{}：", e, message.getSubject());
} catch (MessagingException ex) {
ex.printStackTrace();
}
}finally { }finally {
try { try {
EmailLogEvent expungeEvent = new EmailLogEvent(this.batchesCounter,Thread.currentThread().getId(),EmailLogManager.GS_TYPE_GET,EmailLogManager.DONE); EmailLogEvent expungeEvent = new EmailLogEvent(this.batchesCounter,Thread.currentThread().getId(),EmailLogManager.GS_TYPE_GET,EmailLogManager.DONE);