Merge remote-tracking branch 'origin/mdc' into mdc

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

@@ -233,11 +233,11 @@ public abstract class AbstractS_D_Q_G_SpectrumHandler extends AbstractSpectrumHa
             this.startIntoDatabaseTime = new Date();
             //如果数据已经存储，不在重复存储
             final GardsSampleData query = spectrumServiceQuotes.getSampleDataService().findByInputFileName(super.spectrumFileRelativePath);
-            //如果数据已经存储  并且状态是 P 则判断文件重复  如果数据已经存储并且状态是 F 不进行处理
+            //如果数据已经存储  并且状态是 P 或 R 则判断文件重复  如果数据已经存储并且状态是 F 不进行处理
             if(Objects.nonNull(query)){
                 this.sampleData = query;
                 this.endIntoDatabaseTime = new Date();
-                if (query.getStatus().equalsIgnoreCase(SampleStatus.COMPLETE.value)) {
+                if (query.getStatus().equalsIgnoreCase(SampleStatus.COMPLETE.value) || query.getStatus().equalsIgnoreCase(SampleStatus.INTERACTIVE.value)) {
                     //设置文件重复标记为true
                     this.parsingProcessLog.setFileRepeat(true);
                     //发送文件重复错误事件，后续统计报告使用

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

@@ -138,19 +138,9 @@ public class SpectrumParsingActuator implements Runnable{
                 }
             }
         } catch (Exception e) {
-            try {
-                if (StrUtil.isBlank(subject)) {
-                    subject = message.getSubject();
-                }
-                if (StrUtil.isBlank(receiveDate)) {
-                    receiveDate = DateUtils.formatDate(message.getReceivedDate(),"yyyy-MM-dd HH:mm:ss");
-                }
-            } catch (MessagingException ex) {
-                log.error("SpectrumParsingActuator中获取Message信息出现异常：", ex);
-            }
             // 如果不是下载导致的失败 并且 下载成功，则删除下载的邮件对象
             if(!(e instanceof DownloadEmailException) && downloadFlag){
-                log.error("Remove Email："+ subject + StringPool.UNDERSCORE + receiveDate + StringPool.UNDERSCORE);
+                log.error("Catch Remove Email："+ subject + StringPool.UNDERSCORE + receiveDate + StringPool.UNDERSCORE);
                 emailServiceManager.removeMail(message,batchesCounter);
             }
             //输出异常信息

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

@@ -1785,7 +1785,6 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
             phd.getVPeak().remove(curRow);
             //重新计算核素活度浓度
             gammaFileUtil.NuclidesIdent(phd, nuclideMap);
-            redisUtil.set(userName+StringPool.DASH+phd.getHeader().getSystem_type(), nuclideMap);
             //重新分析数据
             gammaFileUtil.PeaksChanged(phd);
             for (int i = 0; i < phd.getVPeak().size(); i++) {
@@ -2075,7 +2074,6 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
                 nuclideMap.remove(nuclideName);
                 //重新计算核素活度浓度
                 gammaFileUtil.NuclidesIdent(phd, nuclideMap);
-                redisUtil.set(userName+StringPool.DASH+phd.getHeader().getSystem_type(), nuclideMap);
                 //从核素的选中列表中移除对应下标的核素信息
                 list_identify.remove(index);
                 //重新初始化峰列表信息

jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java

@@ -68,13 +68,16 @@ public class JeecgAutoProcessApplication extends SpringBootServletInitializer im
 
     @Override
     public void run(String... args) throws Exception {
-        //调用dll
+        String os = System.getProperty("os.name").toLowerCase();
+        if (os.contains("win")) {
             //Windows加载dll工具库
             System.loadLibrary("ReadPHDFile");
             System.loadLibrary("GammaAnaly");
+        } else {
             //Linux版本加载dll工具库
-//        System.load("/usr/local/jdk/lib/libReadPHDFile.so");
+            System.load("/usr/local/jdk/lib/libReadPHDFile.so");
-//        System.load("/usr/local/jdk/lib/libGammaAnalyALG.so");
+            System.load("/usr/local/jdk/lib/libGammaAnalyALG.so");
+        }
         nuclLibService.getNuclideMap();
         //根据配置文件配置邮件获取策略定义时间条件，默认EmailReceivePolicy.HISTORY_ORDER_RECEIVE.getPolicy()
         Date systemStartupTime = null;

jeecg-server-cloud/armd-spectrum-analysis-start/src/main/java/org/jeecg/JeecgSpectrumAnalysisApplication.java

@@ -62,12 +62,16 @@ public class JeecgSpectrumAnalysisApplication extends SpringBootServletInitializ
 
     @Override
     public void run(String... args) throws Exception {
+        String os = System.getProperty("os.name").toLowerCase();
+        if (os.contains("win")) {
             //Windows加载dll工具库
             System.loadLibrary("ReadPHDFile");
             System.loadLibrary("GammaAnaly");
+        } else {
             //Linux版本加载dll工具库
-//        System.load("/usr/local/jdk/lib/libReadPHDFile.so");
+            System.load("/usr/local/jdk/lib/libReadPHDFile.so");
-//        System.load("/usr/local/jdk/lib/libGammaAnalyALG.so");
+            System.load("/usr/local/jdk/lib/libGammaAnalyALG.so");
+        }
         //创建缓存
         betaCache.initCache();
         localCache.initCache();

jeecg-server-cloud/armd-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java

@@ -41,8 +41,13 @@ public class JeecgWebStatisticsApplication extends SpringBootServletInitializer
 
     @Override
     public void run(String... args) throws Exception {
-        //windows环境调用dll
+        String os = System.getProperty("os.name").toLowerCase();
+        if (os.contains("win")) {
+            //Windows加载dll工具库
             System.loadLibrary("ReadPHDFile");
-        //System.load("/usr/local/jdk/lib/libReadPHDFile.so");
+        } else {
+            //Linux版本加载dll工具库
+            System.load("/usr/local/jdk/lib/libReadPHDFile.so");
+        }
     }
 }