自动处理，人工交互向redis中缓存谱数据增加分析员相关内容

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/Info.java

@@ -36,6 +36,9 @@ public class Info implements Serializable{
     // 谱类型 (Gamma|Beta)
     private String betaOrGamma;
 
+    // 分析员
+    private String analyst;
+
     // 核素名称-浓度值
     private Map<String,String> nuclides;
 

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.spectrum;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.StringConstant;
 import org.jeecg.common.properties.SpectrumPathProperties;
 import org.jeecg.common.util.DateUtils;
@@ -337,6 +338,7 @@ public class Sample_B_Analysis implements BlockConstant {
         nuclides.put(XE_133m,String.valueOf(analyseResult.Xe133m_con));
         nuclides.put(XE_135,String.valueOf(analyseResult.Xe135_con));
         info.setNuclides(nuclides);
+        info.setAnalyst(CommonConstant.REPORT_PREFIX_AUTO);
         spectrumServiceQuotes.getRedisStreamUtil().pushAnalysis(info);
     }
 

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

@@ -297,6 +297,7 @@ public class Sample_G_Analysis {
                 nuclides.put(middleData.nucl_ided_Nuclidename.get(i), middleData.nucl_ided_Concentration.get(i));
             }
             info.setNuclides(nuclides);
+            info.setAnalyst(middleData.analyses_analyst);
             serviceQuotes.getRedisStreamUtil().pushAnalysis(info);
         } catch (ParseException e) {
             throw new RuntimeException(e);

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

@@ -5116,6 +5116,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
                 nuclides.put(middleData.nucl_ided_Nuclidename.get(i), middleData.nucl_ided_Concentration.get(i));
             }
             info.setNuclides(nuclides);
+            info.setAnalyst(middleData.analyses_analyst);
             redisStreamUtil.pushAnalysis(info);
         } catch (ParseException e) {
             throw new RuntimeException(e);

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

@@ -4002,7 +4002,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
             map.put("qc", qcData);
         }
         //发送数据到redis
-        pushToRedis(betaDataFile);
+        pushToRedis(betaDataFile, userName);
         result.setSuccess(true);
         result.setResult(map);
         return result;
@@ -4011,7 +4011,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
     /**
      * 分析成功数据发送到Redis
      */
-    private void pushToRedis(BetaDataFile betaDataFile){
+    private void pushToRedis(BetaDataFile betaDataFile, String userName){
         try {
             Info info = new Info();
             info.setStationId(betaDataFile.getStationId());
@@ -4037,6 +4037,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                 }
             }
             info.setNuclides(nuclides);
+            info.setAnalyst(userName);
             redisStreamUtil.pushAnalysis(info);
         } catch (ParseException e) {
             throw new RuntimeException(e);