fix：解决自动处理网络不好下载会中断问题

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

@@ -111,7 +111,7 @@ public class EmailServiceManager {
             log.info("{}邮件服务连接测试成功",email.getName());
             flag = true;
         } catch (IOException e) {
-            log.error("{}邮件服务连接测试失败，请检查邮件服务属性配置是否正确或邮件服务未开启，原因{}",email.getName(),e.getMessage());
+            log.error("{}邮件服务连接测试失败，请检查邮件服务属性配置是否正确或邮件服务未开启，原因: ",email.getName(),e);
         }finally {
             try {
                 if(null != socket){
@@ -127,7 +127,7 @@ public class EmailServiceManager {
     /**
      * 接收邮件
      */
-    public Message[] receiveMail() throws MessagingException {
+    public Message[] receiveMail() throws Exception {
         String status = EmailLogManager.STATUS_SUCCESS;
         try{
             //配置邮件服务属性
@@ -135,6 +135,8 @@ public class EmailServiceManager {
             properties.put("mail.store.protocol", "imap");
             properties.put("mail.imap.host", email.getEmailServerAddress());
             properties.put("mail.imap.port",email.getPort());
+            properties.put("mail.imap.connectiontimeout", "3000");
+            properties.put("mail.imap.timeout", "3000");
             if (email.getIsQiye() == 1) {
                 properties.put("mail.imap.ssl.enable", "true");
             } else {
@@ -177,6 +179,7 @@ public class EmailServiceManager {
                         return o1.getReceivedDate().compareTo(o2.getReceivedDate());
                     } catch (MessagingException e) {
                         e.printStackTrace();
+                        log.error(e.getMessage(), e);
                     }
                     return 0;
                 });
@@ -186,7 +189,7 @@ public class EmailServiceManager {
                     return Arrays.copyOfRange(messages,0,this.receiveNum-1);
                 }
             }
-        } catch (MessagingException e){
+        } catch (Exception e){
             status = EmailLogManager.STATUS_ERROR;
             log.error("Email connection is abnormal, account is {}, service is {},the reason is {}.",email.getName(),email.getEmailServerAddress(),e.getMessage());
             throw e;
@@ -590,6 +593,7 @@ public class EmailServiceManager {
                 throw new DownloadEmailException(errorMsg);
             }catch (Exception e) {
                 log.error("",e);
+                throw new RuntimeException(e);
             }finally {
                 EmailLogEvent event = new EmailLogEvent(batchesCounter,Thread.currentThread().getId(),EmailLogManager.GS_TYPE_GET,status,EmailLogManager.GETIDEML,subject,DateUtils.formatDate(receivedDate,"yyyy-MM-dd HH:mm:ss:SSS"),
                         (Objects.isNull(emlFile)?" ":emlFile.getAbsolutePath()));
@@ -725,9 +729,11 @@ public class EmailServiceManager {
             // log.info("EmailServiceManager: Remove Email:{},receiveTime:{}",message.getSubject(), DateUtils.formatDate(message.getReceivedDate(),"yyyy-MM-dd HH:mm:ss"));
         } catch (MessagingException | UnsupportedEncodingException e) {
             status = EmailLogManager.STATUS_ERROR;
-            log.error("Email deletion failed, the subject of the email is :{}, the reason is :{}.",subject,e.getMessage());
+            log.error("Email deletion failed, the subject of the email is :{}, the reason is :",subject, e);
             e.printStackTrace();
-        }finally {
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        } finally {
             EmailLogEvent removeEvent = new EmailLogEvent(batchesCounter,Thread.currentThread().getId(),EmailLogManager.GS_TYPE_GET,status,EmailLogManager.DELETEID,subject,DateUtils.formatDate(receivedDate,"yyyy-MM-dd HH:mm:ss:SSS"));
             EmailLogManager.getInstance().offer(Thread.currentThread().getId(),removeEvent);
             //这里删除和彻底删除一起写入日志，java和C++处理有差异，java是在连接关闭时彻底删除的
@@ -748,13 +754,13 @@ public class EmailServiceManager {
             if(null != store){
                 store.close();
             }
-            log.info("EmailServiceManage资源关闭完成.");
+            log.info("{}: EmailServiceManage资源关闭完成.", Thread.currentThread().getName());
 //            for(String messageId : messageIds){
 //                String key = RedisConstant.EMAIL_MSG_ID+StringConstant.COLON+messageId;
 //                redisUtil.del(key);
 //            }
         } catch (MessagingException e) {
-            log.error("Email closure failed, email address is: {}, reason is: {}",email.getUsername(),e.getMessage());
+            log.error("Email closure failed, email address is: {}, reason is: {}",email.getUsername(),e);
             e.printStackTrace();
         }
     }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GStoreMiddleProcessData.java

@@ -3,10 +3,7 @@ package org.jeecg.modules.entity.vo;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.HashMap;
+import java.util.*;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
 
 @Data
 public class GStoreMiddleProcessData implements Serializable {
@@ -421,6 +418,7 @@ public class GStoreMiddleProcessData implements Serializable {
         Collection_Station_Comments = "";
         NDC_Analysis_General_Comments = "";
         setting_specSetup = new SpecSetup();
+        mdcInfos = new ArrayList<>();
     }
 
 }

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

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -40,12 +41,12 @@ public class AutoProcessManager{
     /**
      * 以邮件Id为key，邮件信息为value
      */
-    private Map<String,EmailProperties> emailMap = new HashMap<>();
+    private Map<String,EmailProperties> emailMap = new ConcurrentHashMap<>();
 
     /**
      * 以邮件id为key，以邮件执行线程为value
      */
-    private Map<String,EmailParsingActuator> emailExecThreadMap = new HashMap<>();
+    private Map<String,EmailParsingActuator> emailExecThreadMap = new ConcurrentHashMap<>();
 
     /**
      * 启动自动处理
@@ -82,6 +83,7 @@ public class AutoProcessManager{
         public void run() {
             for(;;){
                 long start = System.currentTimeMillis();
+                try {
                     if(!CollectionUtils.isEmpty(emailMap)){
                         synchronized (lock){
                             Iterator<EmailProperties> iterator = emailMap.values().iterator();
@@ -111,6 +113,10 @@ public class AutoProcessManager{
                             }
                         }
                     }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.error(e.getMessage(), e);
+                }
                 long end = System.currentTimeMillis();
                 long sleepTime = taskProperties.getMonitoringMailDataCycle() - (end-start);
                 //如果sleepTime > 0 需要睡眠到指定时间，否则继续下次获取邮件
@@ -120,6 +126,7 @@ public class AutoProcessManager{
                         TimeUnit.MILLISECONDS.sleep(sleepTime);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
+                        log.error(e.getMessage(), e);
                     }
                 }
             }
@@ -169,6 +176,7 @@ public class AutoProcessManager{
                 //捕获异常不处理保障线程异常不退出
                 }catch (Exception e){
                     e.printStackTrace();
+                    log.error(e.getMessage(), e);
                 }
                 long end = System.currentTimeMillis();
                 long sleepTime = taskProperties.getMonitoringMailCommStatusCycle() - (end-start);
@@ -178,6 +186,7 @@ public class AutoProcessManager{
                         TimeUnit.MILLISECONDS.sleep(sleepTime);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
+                        log.error(e.getMessage(), e);
                     }
                 }
             }
@@ -251,6 +260,7 @@ public class AutoProcessManager{
                 //捕获异常不处理保障线程异常不退出
                 }catch (Exception e){
                     e.printStackTrace();
+                    log.error(e.getMessage(), e);
                 }
                 long end = System.currentTimeMillis();
                 long sleepTime = taskProperties.getMonitoringMailDataCycle() - (end-start);
@@ -260,6 +270,7 @@ public class AutoProcessManager{
                         TimeUnit.MILLISECONDS.sleep(sleepTime);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
+                        log.error(e.getMessage(), e);
                     }
                 }
             }
@@ -277,6 +288,7 @@ public class AutoProcessManager{
         public void run() {
             for(;;){
                 long start = System.currentTimeMillis();
+                try {
                     if(!CollectionUtils.isEmpty(emailExecThreadMap)){
                         //遍历邮箱执行线程，如果状态为已停止则删除
                         final Iterator<Map.Entry<String, EmailParsingActuator>> checkStopThreads = emailExecThreadMap.entrySet().iterator();
@@ -293,6 +305,7 @@ public class AutoProcessManager{
                         final Iterator<Map.Entry<String, EmailParsingActuator>> iterator = emailExecThreadMap.entrySet().iterator();
                         emailExecThreadMap.forEach((emailId,emailExecThread)->{
                             try{
+                                log.info("当前线程状态：{}", emailExecThread.getState());
                                 if(emailExecThread.getState() != State.TERMINATED && emailExecThread.isStop()){
                                     final long nowTime = System.currentTimeMillis();
                                     final long setStoptime = emailExecThread.getStopTime().getTime();
@@ -304,6 +317,7 @@ public class AutoProcessManager{
                                 }
                             }catch (Exception e){
                                 e.printStackTrace();
+                                log.error(e.getMessage(), e);
                             }finally {
                                 if(emailExecThread.getState() != State.TERMINATED && emailExecThread.isStop()){
                                     final long nowTime = System.currentTimeMillis();
@@ -317,6 +331,10 @@ public class AutoProcessManager{
                             }
                         });
                     }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.error(e.getMessage(), e);
+                }
                 long end = System.currentTimeMillis();
                 long sleepTime = taskProperties.getDeletedMailThreadExecCycle() - (end-start);
                 //如果sleepTime > 0 需要睡眠到指定时间，否则继续下次监测
@@ -325,6 +343,7 @@ public class AutoProcessManager{
                         TimeUnit.MILLISECONDS.sleep(sleepTime);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
+                        log.error(e.getMessage(), e);
                     }
                 }
             }

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

@@ -86,8 +86,8 @@ public class EmailParsingActuator extends Thread{
             List<String> messageIds = new ArrayList<>();
             try {
                 Message[] messages = emailServiceManager.receiveMail();
+                log.info("EmailParsingActuator本次{}获取邮件数量为：{}", Thread.currentThread().getName(), ArrayUtils.isEmpty(messages) ? 0 : messages.length);
                 if(ArrayUtils.isNotEmpty(messages)){
-                    log.info("EmailParsingActuator本次{}获取邮件数量为：{}", Thread.currentThread().getName(), messages.length);
                     //检验获取的邮件是否在之前删除失败列表中，若在直接调用邮件API删除，并且此次数组里元素也删除
                     for(int i=messages.length-1;i>=0;i--){
                         if (null == messages[i].getHeader("Message-ID")) {
@@ -119,7 +119,7 @@ public class EmailParsingActuator extends Thread{
                     }
                 }
             } catch (Exception e) {
-                log.error("EmailParsingActuator has exception: {}", e.getMessage());
+                log.error("EmailParsingActuator has exception: ", e);
                 log.info("Mail-Parsing线程池资源关闭...");
                 closeResource();
                 throw new RuntimeException(e);
@@ -142,6 +142,8 @@ public class EmailParsingActuator extends Thread{
                     TimeUnit.MILLISECONDS.sleep(sleepTime);
                 } catch (InterruptedException e) {
                     e.printStackTrace();
+                    log.error(e.getMessage(), e);
+                    throw new RuntimeException(e);
                 }
             }
         }

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

@@ -152,13 +152,15 @@ public class SpectrumParsingActuator implements Runnable{
                 }
             }
         } catch (Exception e) {
+            //输出异常信息
+            log.error("邮件处理异常{}，邮件主题:{}：", e, subject);
+            // todo  需要解决其他异常会进入if 删除邮件
             // 如果不是下载导致的失败 并且 下载成功，则删除下载的邮件对象
             if(!(e instanceof DownloadEmailException) && downloadFlag){
                 log.error("Catch Remove Email："+ subject + StringPool.UNDERSCORE + receiveDate + StringPool.UNDERSCORE);
                 emailServiceManager.removeMail(message,batchesCounter);
             }
-            //输出异常信息
+
-            log.error("邮件处理异常{}，邮件主题:{}：", e, subject);
         }finally {
             try {
                 EmailLogEvent expungeEvent = new EmailLogEvent(this.batchesCounter,Thread.currentThread().getId(),EmailLogManager.GS_TYPE_GET,EmailLogManager.DONE);

jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java

@@ -1,6 +1,6 @@
 package org.jeecg.common.util;
 
-import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
@@ -11,8 +11,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.net.ftp.FTP;
-import org.apache.commons.net.ftp.FTPClient;
 import org.ejml.simple.SimpleMatrix;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.properties.ParameterProperties;
@@ -1529,10 +1527,10 @@ public class GammaFileUtil extends AbstractLogOrReport {
             }
         } catch (JsonProcessingException e){
             e.printStackTrace();
-            log.error("AnalyseSpectrum(): {}", e.getMessage());
+            log.error("AnalyseSpectrum(): {}", e);
         } catch (RuntimeException e) {
             e.printStackTrace();
-            log.error("AnalyseSpectrum(): {}", e.getMessage());
+            log.error("AnalyseSpectrum(): {}", e);
         }
         return true;
     }
@@ -3125,9 +3123,10 @@ public class GammaFileUtil extends AbstractLogOrReport {
             }
             return strBuffer.toString();
         } catch (Exception e) {
-            log.error("错误文件名称："+ middleData.analyses_save_filePath+" 错误内容："+e.getMessage());
+            e.printStackTrace();
+            log.error("错误文件名称："+ middleData.analyses_save_filePath+" 错误内容：", e);
+            throw new RuntimeException(e);
         }
-        return "";
     }
 
     public List<String> DoubleLimit(List data) {
@@ -3208,6 +3207,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
     public boolean GetMiddleData(PHDFile fileAnlyse, String userName,Map<String, NuclideLines> nucline,GStoreMiddleProcessData middleData, String type, String flag) throws ParseException {
         boolean bRet=true;
         //标准名称规范化
+        middleData.mdcInfos = ListUtil.toList(fileAnlyse.getMdcInfoMap().values());
         String dataType = fileAnlyse.getMsgInfo().getData_type();
         String subDirSavePath = "";
         subDirSavePath+=nameStandUtil.GetSysTemSubdir(fileAnlyse.getHeader().getSystem_type());
@@ -4156,7 +4156,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
         return result;
     }
 
-    public void CalcNuclideMDA(PHDFile phd, NuclideLines lines, String nucName, List<Integer> vPeakIdx) {
+    public void CalcNuclideMDA(PHDFile phd, NuclideLines lines, String nucName, List<Integer> vPeakIdx, Double energyTolerance) {
         if(lines.halflife <= 0) {
             return;
         }
@@ -4168,7 +4168,9 @@ public class GammaFileUtil extends AbstractLogOrReport {
         List<String> vNuclides = new LinkedList<>();   // 只识别不计算活度/浓度的核素
         ReadSpecialNuclides(mapHalflife, vNuclides);
 
-        double energyWidth = phd.getUsedSetting().getEnergyTolerance();
+//        double energyWidth = phd.getUsedSetting().getEnergyTolerance();
+        // fix：改为使用页面传递的公差 20241114，结果用户插入修改公差之后的核素，mda无法计算到的问题
+        double energyWidth = energyTolerance;
         List<Double> vEnergy = lines.venergy; // 该核素的所有γ射线能量
         double maxYield = 0;
         int mainPeakIdx = -1; // 记录核素主γ峰的索引下标

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java

@@ -160,7 +160,8 @@ public class GammaController {
     @PostMapping("addNuclide")
     @ApiOperation(value = "InteractiveTool页面增加核素信息接口", notes = "InteractiveTool页面增加核素信息接口")
     public Result addNuclide(@RequestBody NuclideInfo nuclideInfo, HttpServletRequest request) {
-        return gammaService.addNuclide(nuclideInfo.getCurRow(), nuclideInfo.getNuclideName(), nuclideInfo.getFileName(), nuclideInfo.getList_identify(), request);
+        return gammaService.addNuclide(nuclideInfo.getCurRow(), nuclideInfo.getNuclideName(), nuclideInfo.getFileName(),
+                nuclideInfo.getList_identify(), nuclideInfo.getEnergyTolerance(), request);
     }
 
     @PostMapping("deleteNuclide")

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/NuclideInfo.java

@@ -16,4 +16,6 @@ public class NuclideInfo implements Serializable {
 
     private List<String> list_identify;
 
+    private Double energyTolerance;
+
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java

@@ -53,7 +53,8 @@ public interface IGammaService{
 
     Result getSelPosNuclide(Integer sampleId, String fileName, int channel, HttpServletRequest request);
 
-    Result addNuclide(Integer curRow, String nuclideName, String fileName, List<String> list_identify, HttpServletRequest request);
+    Result addNuclide(Integer curRow, String nuclideName, String fileName, List<String> list_identify, Double energyTolerance,
+                      HttpServletRequest request);
 
     Result deleteNuclide(Integer curRow, String nuclideName, String fileName, List<String> list_identify, HttpServletRequest request);
 

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java

@@ -1663,7 +1663,8 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
     }
 
     @Override
-    public Result addNuclide(Integer curRow, String nuclideName, String fileName, List<String> list_identify, HttpServletRequest request) {
+    public Result addNuclide(Integer curRow, String nuclideName, String fileName, List<String> list_identify,
+                             Double energyTolerance, HttpServletRequest request) {
         Result result = new Result();
         Map<String, Object> map = new HashMap<>();
         String userName = JwtUtil.getUserNameByToken(request);
@@ -1708,7 +1709,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
             t_idx++;
         }
         //重新计算核素的MDA值
-        gammaFileUtil.CalcNuclideMDA(phd, it_line, nuclideName, vPeakIdx);
+        gammaFileUtil.CalcNuclideMDA(phd, it_line, nuclideName, vPeakIdx, energyTolerance);
         map.put("identify", list_identify);
         //格式化核素表单内容
         List<PeakInfo> vPeak = gammaFileUtil.InitPeakTable(phd.getVPeak());