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

mdc-merge

Browse Source
This commit is contained in:
xiaoguangbin 2024-06-25 16:49:20 +08:00
parent 9bafcef57b
commit a2980c0289
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java
View File

@ -6,8 +6,6 @@ import com.google.common.collect.Lists;
import com.sun.mail.imap.IMAPStore; import com.sun.mail.imap.IMAPStore;
import com.sun.mail.smtp.SMTPAddressFailedException; import com.sun.mail.smtp.SMTPAddressFailedException;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.Charsets;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.dto.message.MessageDTO; import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.constant.RedisConstant; import org.jeecg.common.constant.RedisConstant;

2
jeecg-module-auto-process/src/main/java/org/jeecg/modules/AutoProcessManager.java
View File

@ -237,7 +237,7 @@ public class AutoProcessManager{
if(testFlag){ if(testFlag){
if (emailExecThreadMap.containsKey(databaseEmail.getId())) { if (emailExecThreadMap.containsKey(databaseEmail.getId())) {
EmailParsingActuator actuator = emailExecThreadMap.get(databaseEmail.getId()); EmailParsingActuator actuator = emailExecThreadMap.get(databaseEmail.getId());
actuator.setStop(false); actuator.setThreadSleep(false);
log.info("{}邮箱重新加入监测队列",databaseEmail.getUsername()); log.info("{}邮箱重新加入监测队列",databaseEmail.getUsername());
} else { } else {
databaseEmail.setNewEmailFlag(true); databaseEmail.setNewEmailFlag(true);

2
jeecg-module-auto-process/src/main/java/org/jeecg/modules/EmailParsingActuator.java
View File

@ -91,13 +91,11 @@ public class EmailParsingActuator extends Thread{
//检验获取的邮件是否在之前删除失败列表中，若在直接调用邮件API删除，并且此次数组里元素也删除 //检验获取的邮件是否在之前删除失败列表中，若在直接调用邮件API删除，并且此次数组里元素也删除
for(int i=messages.length-1;i>=0;i--){ for(int i=messages.length-1;i>=0;i--){
if (null == messages[i].getHeader("Message-ID")) { if (null == messages[i].getHeader("Message-ID")) {
System.out.println("Message ID是空值信息！！！！！！！");
messages = ArrayUtils.remove(messages, i); messages = ArrayUtils.remove(messages, i);
continue; continue;
} }
if (!messages[i].isExpunged()){ if (!messages[i].isExpunged()){
String messageId = ((MimeMessage) messages[i]).getMessageID(); String messageId = ((MimeMessage) messages[i]).getMessageID();
System.out.println("正常获取到的Message ID是："+messageId);
final boolean exist = emailServiceManager.check(messages[i],messageId); final boolean exist = emailServiceManager.check(messages[i],messageId);
messageIds.add(messageId); messageIds.add(messageId);
if(exist){ if(exist){

3
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
View File

@ -4319,13 +4319,12 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
String logFileName = betaDataFile.getSampleFileName().replace("PHD", "log"); String logFileName = betaDataFile.getSampleFileName().replace("PHD", "log");
//获取日志的文件存放路径 //获取日志的文件存放路径
String logFilePath = parameterProperties.getLogFilePath() + File.separator + DateUtils.formatDate(new Date(), "yyyy-MM-dd"); String logFilePath = parameterProperties.getLogFilePath() + File.separator + DateUtils.formatDate(new Date(), "yyyy-MM-dd");
String localLogName = betaDataFile.getSampleFileName().replace("PHD", "log");
//判断文件路径是否存在 //判断文件路径是否存在
File logPath = new File(logFilePath); File logPath = new File(logFilePath);
if (!logPath.exists()) { if (!logPath.exists()) {
logPath.mkdirs(); logPath.mkdirs();
} }
File logFile = new File(logFilePath + File.separator +localLogName); File logFile = new File(logFilePath + File.separator +logFileName);
try { try {
//判断日志文件是否存在 如果不存在创建一个空的文件 上传到ftp //判断日志文件是否存在 如果不存在创建一个空的文件 上传到ftp
if (!logFile.exists()) { if (!logFile.exists()) {