人工交互分析beta部分查看gammaEnergyCalibration逻辑修改，如果gamma的计算标识是false，清除beta，gamma的临时缓存数据

人工交互分析beta部分查看betaEnergyCalibration逻辑修改，如果beta的计算标识是false，清除beta的临时缓存数据
人工交互分析resetButton按钮接口逻辑修改，gamma的tab进行重置时，将beta，gamma的临时缓存数据清空，beta的tab进行重置时，将beta的临时缓存数据清空
人工交互分析重新分析接口修改，当进行重新分析时将beta，gamma的临时数据根据各自的标识选择是否将临时缓存数据赋值给到最终应用数组
人工交互分析beta部分fitting接口，gamma的tab页执行分析方法时清空beta的临时缓存数据
人工交互分析gamma部分compare，strip从数据库加载文件接口，中文提示修改为英文提示并改变提示语句判断逻辑位置
人工交互分析gamma部分算法得到的peak的significance结果处理，如果是-9999则将significance赋值为inf
人工交互分析gamma部分peak的significance进行判断是否是合法数字，如果是正常处理，否则处理为对应的空内容
人工交互分析gamma部分页面回显蓝色框内fwhm对应数据内容修改

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

@@ -2440,7 +2440,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
             String fwhm = String.format("%.3f", Double.valueOf(middleData.peaks_Fwhm.get(i)));
             String area = String.format("%.3f", Double.valueOf(middleData.peaks_Area.get(i)));
             String areaErr = String.format("%.3f", Double.valueOf(middleData.peaks_areaErr.get(i)) / Double.valueOf(middleData.peaks_Area.get(i)) * 100);
-            String signif = String.format("%.3f", Double.valueOf(middleData.peaks_Significance.get(i)));
+            String signif = Objects.isNull(middleData.peaks_Significance.get(i))?"":String.format("%.3f", Double.valueOf(middleData.peaks_Significance.get(i)));
             String sensit = String.format("%.3f", Double.valueOf(middleData.peaks_Sensitivity.get(i)));
             String nuclide = middleData.peaks_Nuclide_name.get(i).length()>0?StringUtils.join(middleData.peaks_Nuclide_name.get(i), StringPool.SEMICOLON):"";
             strBuffer.append(rowFormat(data14, idPeak, energy, peakCentroid, fwhm, area, areaErr, signif, sensit, nuclide));
@@ -3420,7 +3420,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
                 dvctEFFICIENCY.add(fileAnlyse.getVPeak().get(m).efficiency);
                 dvctFWHM.add(fileAnlyse.getVPeak().get(m).fwhm);
                 dvctFWTM.add(fileAnlyse.getVPeak().get(m).fwhmc);
-                dvctSIGNIFICANCE.add(fileAnlyse.getVPeak().get(m).significance);
+                dvctSIGNIFICANCE.add(Double.isFinite(fileAnlyse.getVPeak().get(m).significance)?fileAnlyse.getVPeak().get(m).significance:null);
                 dvctSENSITIVITY.add(fileAnlyse.getVPeak().get(m).sensitivity);
                 dvctMULTIINDEX.add(Double.valueOf(fileAnlyse.getVPeak().get(m).multiIndex));
                 dvctROISTART.add(Double.valueOf(fileAnlyse.getVPeak().get(m).left));
@@ -3962,9 +3962,15 @@ public class GammaFileUtil extends AbstractLogOrReport {
             BigDecimal area = new BigDecimal(vPeak.get(i).area);
             area = area.setScale(3, RoundingMode.HALF_UP);
             peakInfo.area = area.doubleValue();
-            BigDecimal significance = new BigDecimal(vPeak.get(i).significance);
+            if (Double.isInfinite(vPeak.get(i).significance)) {
-            significance = significance.setScale(3, RoundingMode.HALF_UP);
+                peakInfo.significance = Double.POSITIVE_INFINITY;
-            peakInfo.significance = significance.doubleValue();
+            } else if (Double.isNaN(vPeak.get(i).significance)) {
+                peakInfo.significance = Double.NaN;
+            } else {
+                BigDecimal significance = new BigDecimal(vPeak.get(i).significance);
+                significance = significance.setScale(3, RoundingMode.HALF_UP);
+                peakInfo.significance = significance.doubleValue();
+            }
             peakInfo.comments = vPeak.get(i).comments;
             peakInfo.nuclides = vPeak.get(i).nuclides;
             result.add(peakInfo);

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

@@ -134,14 +134,14 @@ public class SpectrumAnalysesController {
 
     @GetMapping("viewGammaDetectorCalibration")
     @ApiOperation(value = "查询GammaDetectorCalibration数据", notes = "查询GammaDetectorCalibration数据")
-    public Result viewGammaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, HttpServletRequest request) {
+    public Result viewGammaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, boolean fittingBtn, HttpServletRequest request) {
-        return spectrumAnalysisService.viewGammaDetectorCalibration(sampleId, sampleFileName, qcFileName, request);
+        return spectrumAnalysisService.viewGammaDetectorCalibration(sampleId, sampleFileName, qcFileName, fittingBtn, request);
     }
 
     @GetMapping("viewBetaDetectorCalibration")
     @ApiOperation(value = "查询BetaDetectorCalibration数据", notes = "查询BetaDetectorCalibration数据")
-    public Result viewBetaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, HttpServletRequest request) {
+    public Result viewBetaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, boolean fittingBtn, HttpServletRequest request) {
-        return spectrumAnalysisService.viewBetaDetectorCalibration(sampleId, sampleFileName, qcFileName, request);
+        return spectrumAnalysisService.viewBetaDetectorCalibration(sampleId, sampleFileName, qcFileName, fittingBtn, request);
     }
 
     @GetMapping("viewExtrapolation")

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

@@ -69,6 +69,18 @@ public class BetaDataFile implements Serializable {
 
     private List<String> gammaFittingParaToUi;
 
+    private List<SeriseData> betaListNow;
+
+    private List<String> betaFittingParaNow;
+
+    private List<String> betaFittingParaToUiNow;
+
+    private List<SeriseData> gammaListNow;
+
+    private List<String> gammaFittingParaNow;
+
+    private List<String> gammaFittingParaToUiNow;
+
     /**
      *  是否点击过Energy Calibration页面下Gamma Detector Calibration的fitting按钮
      */
@@ -147,6 +159,10 @@ public class BetaDataFile implements Serializable {
 
     private List<List<Double>> betaNewEnergyList;
 
+    private List<List<Double>> gammaNewEnergyListNow;
+
+    private List<List<Double>> betaNewEnergyListNow;
+
     private List<SeriseData> sampleGammaOriginalSeriseData;
 
     private List<SeriseData> sampleGammaProjectedSeriseData;
@@ -237,6 +253,14 @@ public class BetaDataFile implements Serializable {
         gammaList = new LinkedList<>();
         gammaFittingPara = new LinkedList<>();
         gammaFittingParaToUi = new LinkedList<>();
+
+        betaListNow = new LinkedList<>();
+        betaFittingParaNow = new LinkedList<>();
+        betaFittingParaToUiNow = new LinkedList<>();
+        gammaListNow = new LinkedList<>();
+        gammaFittingParaNow = new LinkedList<>();
+        gammaFittingParaToUiNow = new LinkedList<>();
+
         bGammaEnergyValidSample = false;
         bBetaEnergyValidSample = false;
         bGammaEnergyValidGas = false;
@@ -246,6 +270,9 @@ public class BetaDataFile implements Serializable {
         gammaNewEnergyList = new LinkedList<>();
         betaNewEnergyList = new LinkedList<>();
 
+        gammaNewEnergyListNow = new LinkedList<>();
+        betaNewEnergyListNow = new LinkedList<>();
+
         xeResultsSpectrumList = new LinkedList<>();
         sampleBoundary = new LinkedList<>();
         gasBoundary = new LinkedList<>();

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

@@ -50,9 +50,9 @@ public interface ISpectrumAnalysisService {
 
     void exportRLR(BetaRLR betaRLR, HttpServletResponse response);
 
-    Result viewGammaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, HttpServletRequest request);
+    Result viewGammaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, boolean fittingBtn, HttpServletRequest request);
 
-    Result viewBetaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, HttpServletRequest request);
+    Result viewBetaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, boolean fittingBtn, HttpServletRequest request);
 
     Result viewExtrapolation(Integer sampleId, String sampleFileName, HttpServletRequest request);
 

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

@@ -968,19 +968,18 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
         }
         compareFilePath = StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + compareFilePath;
         File compareFile = ftpUtil.downloadFile(compareFilePath, "betaGamma");
-        if (Objects.nonNull(compareFile)) {
+        if (Objects.isNull(compareFile)) {
-            // 获取Compare数据
+            result.error500("The comparison file path does not exist");
-            List<Long> m_vecCompare = gammaFileUtil.loadCompareData(compareFile, userName, m_nCount, result);
-            if (CollectionUtils.isNotEmpty(m_vecCompare)) {
-                List<ChartData> chartDataList = gammaFileUtil.CompareData(m_vecCompare, m_nCount, colorMap, vEnergy);
-                result.setSuccess(true);
-                result.setResult(chartDataList);
-            }
-            compareFile.delete();
-        } else {
-            result.error500("比较文件不存在！");
             return result;
         }
+        // 获取Compare数据
+        List<Long> m_vecCompare = gammaFileUtil.loadCompareData(compareFile, userName, m_nCount, result);
+        if (CollectionUtils.isNotEmpty(m_vecCompare)) {
+            List<ChartData> chartDataList = gammaFileUtil.CompareData(m_vecCompare, m_nCount, colorMap, vEnergy);
+            result.setSuccess(true);
+            result.setResult(chartDataList);
+        }
+        compareFile.delete();
         return result;
     }
 
@@ -1053,22 +1052,21 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
         }
         stripFilePath = StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + stripFilePath;
         File stripFile = ftpUtil.downloadFile(stripFilePath, "betaGamma");
-        if (Objects.nonNull(stripFile)) {
+        if (Objects.isNull(stripFile)) {
-            // 获取Compare数据
+            result.error500("The comparison file path does not exist");
-            List<Long> m_vecCompare = gammaFileUtil.loadCompareData(stripFile, userName, m_nCount, result);
-            if (CollectionUtils.isNotEmpty(m_vecCompare)) {
-                List<ChartData> referenceDataList = gammaFileUtil.ReferenceData(m_vecCompare, m_nCount, colorMap, vEnergy);
-                List<ChartData> chartDataList = gammaFileUtil.StripData(m_vecCompare, m_vCount, m_nCount, colorMap, vEnergy, ratioRate);
-                stripMap.put("reference", referenceDataList);
-                stripMap.put("result", chartDataList);
-                result.setSuccess(true);
-                result.setResult(stripMap);
-            }
-            stripFile.delete();
-        } else {
-            result.error500("比较文件不存在！");
             return result;
         }
+        // 获取Compare数据
+        List<Long> m_vecCompare = gammaFileUtil.loadCompareData(stripFile, userName, m_nCount, result);
+        if (CollectionUtils.isNotEmpty(m_vecCompare)) {
+            List<ChartData> referenceDataList = gammaFileUtil.ReferenceData(m_vecCompare, m_nCount, colorMap, vEnergy);
+            List<ChartData> chartDataList = gammaFileUtil.StripData(m_vecCompare, m_vCount, m_nCount, colorMap, vEnergy, ratioRate);
+            stripMap.put("reference", referenceDataList);
+            stripMap.put("result", chartDataList);
+            result.setSuccess(true);
+            result.setResult(stripMap);
+        }
+        stripFile.delete();
         return result;
     }
 
@@ -1650,11 +1648,15 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
                 ObjectMapper mapper = new ObjectMapper();
                 String phdStr = mapper.writeValueAsString(phd);
                 String strValue = CalValuesHandler.fitPeakFull(phdStr, Af, Cf, Ff);
-//                String strValue = HttpClient.fitPeakFull(phdStr, Af, Cf, Ff);
                 Map<String, Object> parseMap = JSON.parseObject(strValue, Map.class);
                 for (Map.Entry<String, Object> entry : parseMap.entrySet()) {
                     if (entry.getKey().equalsIgnoreCase("vPeak")) {
                         List<PeakInfo> value = JSON.parseArray(JSON.toJSONString(entry.getValue()), PeakInfo.class);
+                        for (PeakInfo info:value) {
+                            if (info.significance == -9999) {
+                                info.significance = Double.POSITIVE_INFINITY;
+                            }
+                        }
                         phd.setVPeak(value);
                     }
                     if (entry.getKey().equalsIgnoreCase("vBase")) {
@@ -4361,7 +4363,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
             tablePeak.setNetCountRate(rate);
             tablePeak.setNcRateErr(area_err);
             tablePeak.setLc(NumberFormatUtil.numberFormat(String.valueOf(peak.lc)));
-            tablePeak.setSignificance(NumberFormatUtil.numberFormat(String.valueOf(peak.significance)));
+            tablePeak.setSignificance(Double.isFinite(peak.significance)?NumberFormatUtil.numberFormat(String.valueOf(peak.significance)):(Double.isInfinite(peak.significance)?"inf":"nan"));
             peakFitList.add(tablePeak);
         }
         map.put("peakFit", peakFitList);
@@ -4595,7 +4597,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
         if (size > 0 && index < size && index >= 0) {
             PeakInfo peak = phd.getVPeak().get(index);
             String message = "Peak：" + String.format("%.2f", peak.peakCentroid) + " = " + String.format("%.2f", peak.energy) + " keV\n" +
-                    "FWHM：" + String.format("%.2f", peak.fwhmc) + " keV\n" +
+                    "FWHM：" + String.format("%.2f", peak.fwhm) + " keV\n" +
                     "Net Area：" + String.format("%.2f", peak.area) + "\n" +
                     "BaseLine：" + String.format("%.2f", phd.getVBase().get((int) Math.round(peak.peakCentroid))) + "\n" +
                     "NID：" + StringUtils.join(peak.nuclides, ";");
@@ -4871,7 +4873,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
                 String fwhm = NumberFormatUtil.numberFormat(String.valueOf(peakInfo.fwhm));
                 String area = NumberFormatUtil.numberFormat(String.valueOf(peakInfo.area));
                 String areaErr = NumberFormatUtil.numberFormat(String.valueOf(peakInfo.areaErr));
-                String signif = NumberFormatUtil.numberFormat(String.valueOf(peakInfo.significance));
+                String signif = Double.isFinite(peakInfo.significance)?NumberFormatUtil.numberFormat(String.valueOf(peakInfo.significance)):(Double.isInfinite(peakInfo.significance)?"inf":"nan");
                 String sensit = NumberFormatUtil.numberFormat(String.valueOf(peakInfo.sensitivity));
                 String nuclide = StringUtils.join(peakInfo.nuclides, StringPool.SEMICOLON);
                 strBuild.append(rowFormat(title2, peakId, energy, peakCentroid, multiIndex, fwhm, area, areaErr, signif, sensit, nuclide));

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

@@ -12,6 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 
 @Service("gardsPeaksSpectrumService")
 @DS("ora")
@@ -39,7 +40,7 @@ public class GardsPeaksSpectrumServiceImpl extends ServiceImpl<GardsPeaksSpectru
                 peaks.setUncefficiency(null);
                 peaks.setFwhm(Double.valueOf(middleData.peaks_Fwhm.get(i)));
                 peaks.setFwtm(Double.valueOf(middleData.peaks_Fwhmc.get(i)));
-                peaks.setSignificance(Double.valueOf(middleData.peaks_Significance.get(i)));
+                peaks.setSignificance(Objects.nonNull(middleData.peaks_Significance.get(i))?Double.valueOf(middleData.peaks_Significance.get(i)):null);
                 peaks.setSensitivity(Double.valueOf(middleData.peaks_Sensitivity.get(i)));
                 peaks.setMulitiIndex(Double.valueOf(middleData.peaks_multiIndex.get(i)));
                 peaks.setRoiStart(Double.valueOf(middleData.peaks_ROIstart.get(i)));

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

@@ -1702,16 +1702,26 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
     }
 
     @Override
-    public Result viewGammaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, HttpServletRequest request) {
+    public Result viewGammaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, boolean fittingBtn, HttpServletRequest request) {
         Result result = new Result();
+        //接收返回结果内容
         Map<String, Object> map = new HashMap<>();
+        //根据请求头获取用户名称
         String userName = JwtUtil.getUserNameByToken(request);
+        //获取beta的缓存数据
         Cache<String, BetaDataFile> cache = betaCache.getBetaCache();
         BetaDataFile betaDataFile = cache.getIfPresent(sampleFileName + "-" + userName);
         if (Objects.isNull(betaDataFile)) {
             result.error500("Load basic file information first!");
             return result;
         }
+        //如果gamma的计算标识是false 则将gamma当前缓存数据进行重置
+        if (!fittingBtn) {
+            betaDataFile.setGammaListNow(Collections.EMPTY_LIST);
+            betaDataFile.setGammaFittingParaNow(Collections.EMPTY_LIST);
+            betaDataFile.setGammaFittingParaToUiNow(Collections.EMPTY_LIST);
+            betaDataFile.setGammaNewEnergyListNow(Collections.EMPTY_LIST);
+        }
         //获取qc的分析结果数据
         EnergySpectrumStruct struct = betaDataFile.getQcStruct();
         if (Objects.nonNull(struct)){
@@ -1799,7 +1809,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
             map.put("min", min);
             map.put("max", max);
             map.put("gammaSpectrum", seriseDataList);
-
+            //计算得到的
             if (betaDataFile.getGammaList().size() <= 0 ) {
                 betaDataFile.setGammaList(oldScatterSeries);
             }
@@ -1816,8 +1826,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
     }
 
     @Override
-    public Result viewBetaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, HttpServletRequest request) {
+    public Result viewBetaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, boolean fittingBtn, HttpServletRequest request) {
         Result result = new Result();
+        //返回结果内容
         Map<String, Object> map = new HashMap<>();
         //获取用户名
         String userName = JwtUtil.getUserNameByToken(request);
@@ -1828,6 +1839,13 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
             result.error500("Load basic file information first!");
             return result;
         }
+        //判断是否进行过计算标识为false时  清空当前beta对应的缓存数据
+        if (!fittingBtn) {
+            betaDataFile.setBetaListNow(Collections.EMPTY_LIST);
+            betaDataFile.setBetaFittingParaNow(Collections.EMPTY_LIST);
+            betaDataFile.setBetaFittingParaToUiNow(Collections.EMPTY_LIST);
+            betaDataFile.setBetaNewEnergyListNow(Collections.EMPTY_LIST);
+        }
         //判断qc的分析结果是否为空
         EnergySpectrumStruct struct = betaDataFile.getQcStruct();
         if (Objects.nonNull(struct)){
@@ -1854,8 +1872,8 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
             }
             map.put("betaEnergy", betaEnergyList);
             //gamma Energy 散点图坐标点关联gamma部分相关数据
-            if (CollectionUtils.isNotEmpty(betaDataFile.getGammaNewEnergyList())) {
+            if (CollectionUtils.isNotEmpty(betaDataFile.getGammaNewEnergyListNow())) {
-                map.put("gammaEnergy", betaDataFile.getGammaNewEnergyList());
+                map.put("gammaEnergy", betaDataFile.getGammaNewEnergyListNow());
             } else {
                 List<Double> gammaParam = EnergySpectrumHandler.GetFileFittingPara(gCentroidChannel, gEnergy);
                 List<Double> gchannels = new ArrayList<>();
@@ -2684,29 +2702,47 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
             return result;
         }
         Map<String, Object> map = new HashMap<>();
+        //记录点位的x轴数据
+        List<Double> xs = new LinkedList<>();
+        //记录点位的y轴数据
+        List<Double> ys = new LinkedList<>();
+        //接收算法计算得到的公式的数据
+        List<Double> fittingPara = new LinkedList<>();
+        //记录计算结果转换为字符串后数据的数组 第一组公式
+        List<String> fittingParaStr = new LinkedList<>();
+        //记录点位道值的数组
+        List<Double> channels = new LinkedList<>();
+        //新计算的点位数组
+        List<SeriseData> seriseDataList = new LinkedList<>();
+        //页面展示的表单数据数组
+        List<TableWidget> tableWidgets = new LinkedList<>();
+        //新计算得到的线点位数组
+        List<SeriseData> newLineSeries = new LinkedList<>();
+        //计算得到的新能量数组
+        List<List<Double>> energyList = new LinkedList<>();
+        //记录计算结果转换成字符串后数据的数组 第二组公式
+        List<String> fittingParaToUiStr = new LinkedList<>();
         //tempPoint数组大小需要大于2个值
         if ((CollectionUtils.isNotEmpty(tempPoints) && tempPoints.size() > 2 && Objects.nonNull(count) && tempPoints.size() != count)
                 || (Objects.isNull(paramA) || StringUtils.isBlank(String.valueOf(paramA)))
                 || (Objects.isNull(paramB) || StringUtils.isBlank(String.valueOf(paramB)))
                 || (Objects.isNull(paramC) || StringUtils.isBlank(String.valueOf(paramC))) ){
-            List<Double> xs = new LinkedList<>();
+            //遍历临时点数组 将点位的横坐标以及纵坐标封装到对应的数组
-            List<Double> ys = new LinkedList<>();
             for (int i=0; i<tempPoints.size(); i++){
                 xs.add(tempPoints.get(i).getX());
                 ys.add(tempPoints.get(i).getY());
             }
             //C to E
-            List<Double> fittingPara = EnergySpectrumHandler.GetFileFittingPara(xs, ys);
+            fittingPara = EnergySpectrumHandler.GetFileFittingPara(xs, ys);
-            List<String> fittingParaStr = new LinkedList<>();
             for (Double para:fittingPara) {
                 fittingParaStr.add(String.valueOf(para));
             }
             map.put("CToE", fittingParaStr);
-
+            //填充道值数组的数据
-            List<Double> channels = new LinkedList<>();
             for (int i=0; i<255; i++) {
                 channels.add(Double.valueOf(i));
             }
+            //计算道值的能量
             List<Double> energys = EnergySpectrumHandler.GetFileFittingData(channels,fittingPara);
             //如果当前fitting按钮没有进行过操作  并且  操作的是gamma探测器相关的
             if (tabName.equalsIgnoreCase("gamma") && !fittingBtn) {
@@ -2726,13 +2762,13 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                     }
                 }
             }
-            List<SeriseData> newLineSeries = new LinkedList<>();
+            //将新计算的能量封装到数组
-            List<List<Double>> energyList = new LinkedList<>();
             for (Double calEnergy:energys) {
                 List<Double> newEnergy = new LinkedList<>();
                 newEnergy.add(calEnergy);
                 energyList.add(newEnergy);
             }
+            //遍历道值添加各道值对应点数据到数组
             for (int i=0; i<channels.size(); ++i) {
                 SeriseData seriseData = new SeriseData();
                 seriseData.setX(channels.get(i));
@@ -2740,8 +2776,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                 newLineSeries.add(seriseData);
             }
             map.put("newLineSeries", newLineSeries);
-            List<SeriseData> seriseDataList = new LinkedList<>();
+            //遍历点 缓存到表单数组以及折线图点位数组
-            List<TableWidget> tableWidgets = new LinkedList<>();
             for (int i=0; i<tempPoints.size(); i++) {
                 //表单数据信息
                 TableWidget tableWidget = new TableWidget();
@@ -2759,40 +2794,27 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
             map.put("newScatterSeriesData", seriseDataList);
             //E to C
             List<Double> fittingParaToUi = EnergySpectrumHandler.GetFileFittingPara(ys, xs);
-            List<String> fittingParaToUiStr = new LinkedList<>();
             for (Double para:fittingParaToUi) {
                 fittingParaToUiStr.add(String.valueOf(para));
             }
             map.put("EToC", fittingParaToUiStr);
-
-            if (tabName.equalsIgnoreCase("beta")) {
-                betaDataFile.setBetaList(tempPoints);
-                betaDataFile.setBetaFittingPara(fittingParaStr);
-                betaDataFile.setBetaFittingParaToUi(fittingParaToUiStr);
-                betaDataFile.setBetaNewEnergyList(energyList);
-            } else if (tabName.equalsIgnoreCase("gamma")) {
-                betaDataFile.setGammaList(tempPoints);
-                betaDataFile.setGammaFittingPara(fittingParaStr);
-                betaDataFile.setGammaFittingParaToUi(fittingParaToUiStr);
-                betaDataFile.setGammaNewEnergyList(energyList);
-            }
         } else {
-            List<Double> fittingPara = new LinkedList<>();
+            //添加公式的数据到公式一的数组
             fittingPara.add(paramA);
             fittingPara.add(paramB);
             fittingPara.add(paramC);
-            List<String> fittingParaStr = new LinkedList<>();
+            //将公式各数据转换成字符串存到数组中
             fittingParaStr.add(String.valueOf(paramA));
             fittingParaStr.add(String.valueOf(paramB));
             fittingParaStr.add(String.valueOf(paramC));
             map.put("CToE", fittingParaStr);
-            List<Double> xs = new LinkedList<>();
+            //遍历点位数组 将横坐标的数据加入到数组中
             for (int i=0; i<tempPoints.size(); i++){
                 xs.add(tempPoints.get(i).getX());
             }
-            List<Double> ys = EnergySpectrumHandler.GetFileFittingData(xs, fittingPara);
+            //根据公式和横坐标值 计算新的纵坐标数据
-            List<SeriseData> seriseDataList = new LinkedList<>();
+            ys = EnergySpectrumHandler.GetFileFittingData(xs, fittingPara);
-            List<TableWidget> tableWidgets = new LinkedList<>();
+            //遍历横坐标数值  将数据封存到表单数组以及折线图数组中
             for (int i=0; i<xs.size(); i++) {
                 //表单数据信息
                 TableWidget tableWidget = new TableWidget();
@@ -2808,19 +2830,18 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
             }
             map.put("tableWidgets", tableWidgets);
             map.put("newScatterSeriesData", seriseDataList);
-
+            //填充道值数组的数据
-            List<Double> channels = new LinkedList<>();
             for (int i=0; i<255; i++) {
                 channels.add(Double.valueOf(i));
             }
+            //根据道值和公式参数计算新的能量数据
             List<Double> energys = EnergySpectrumHandler.GetFileFittingData(channels,fittingPara);
-            List<SeriseData> newLineSeries = new LinkedList<>();
-            List<List<Double>> energyList = new LinkedList<>();
             for (Double calEnergy:energys) {
                 List<Double> newEnergy = new LinkedList<>();
                 newEnergy.add(calEnergy);
                 energyList.add(newEnergy);
             }
+            //遍历道值 将道值和新的能量封装到新的点位数组
             for (int i=0; i<channels.size(); ++i) {
                 SeriseData seriseData = new SeriseData();
                 seriseData.setX(channels.get(i));
@@ -2830,23 +2851,26 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
             map.put("newLineSeries", newLineSeries);
             //E to C
             List<Double> fittingParaToUi = EnergySpectrumHandler.GetFileFittingPara(ys, xs);
-            List<String> fittingParaToUiStr = new LinkedList<>();
             for (Double para:fittingParaToUi) {
                 fittingParaToUiStr.add(String.valueOf(para));
             }
             map.put("EToC", fittingParaToUiStr);
-
+        }
-            if (tabName.equalsIgnoreCase("beta")) {
+        if (tabName.equalsIgnoreCase("beta")) {
-                betaDataFile.setBetaList(tempPoints);
+            betaDataFile.setBetaListNow(tempPoints);
-                betaDataFile.setBetaFittingPara(fittingParaStr);
+            betaDataFile.setBetaFittingParaNow(fittingParaStr);
-                betaDataFile.setBetaFittingParaToUi(fittingParaToUiStr);
+            betaDataFile.setBetaFittingParaToUiNow(fittingParaToUiStr);
-                betaDataFile.setBetaNewEnergyList(energyList);
+            betaDataFile.setBetaNewEnergyListNow(energyList);
-            } else if (tabName.equalsIgnoreCase("gamma")) {
+        } else if (tabName.equalsIgnoreCase("gamma")) {
-                betaDataFile.setGammaList(tempPoints);
+            betaDataFile.setGammaListNow(tempPoints);
-                betaDataFile.setGammaFittingPara(fittingParaStr);
+            betaDataFile.setGammaFittingParaNow(fittingParaStr);
-                betaDataFile.setGammaFittingParaToUi(fittingParaToUiStr);
+            betaDataFile.setGammaFittingParaToUiNow(fittingParaToUiStr);
-                betaDataFile.setGammaNewEnergyList(energyList);
+            betaDataFile.setGammaNewEnergyListNow(energyList);
-            }
+            //gamma的进行计算后将当前的beta缓存的数据进行重置
+            betaDataFile.setBetaListNow(Collections.EMPTY_LIST);
+            betaDataFile.setBetaFittingParaNow(Collections.EMPTY_LIST);
+            betaDataFile.setBetaFittingParaToUiNow(Collections.EMPTY_LIST);
+            betaDataFile.setBetaNewEnergyListNow(Collections.EMPTY_LIST);
         }
         result.setSuccess(true);
         result.setResult(map);
@@ -2909,15 +2933,19 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
         if (Objects.nonNull(betaDataFile)) {
             //判断需要重置的tab页
             if (tabName.equalsIgnoreCase("gamma")) {
-                betaDataFile.setGammaList(Collections.EMPTY_LIST);
+                betaDataFile.setGammaListNow(Collections.EMPTY_LIST);
-                betaDataFile.setGammaFittingPara(Collections.EMPTY_LIST);
+                betaDataFile.setGammaFittingParaNow(Collections.EMPTY_LIST);
-                betaDataFile.setGammaFittingParaToUi(Collections.EMPTY_LIST);
+                betaDataFile.setGammaFittingParaToUiNow(Collections.EMPTY_LIST);
-                betaDataFile.setGammaNewEnergyList(Collections.EMPTY_LIST);
+                betaDataFile.setGammaNewEnergyListNow(Collections.EMPTY_LIST);
+                betaDataFile.setBetaListNow(Collections.EMPTY_LIST);
+                betaDataFile.setBetaFittingParaNow(Collections.EMPTY_LIST);
+                betaDataFile.setBetaFittingParaToUiNow(Collections.EMPTY_LIST);
+                betaDataFile.setBetaNewEnergyListNow(Collections.EMPTY_LIST);
             } else if (tabName.equalsIgnoreCase("beta")) {
-                betaDataFile.setBetaList(Collections.EMPTY_LIST);
+                betaDataFile.setBetaListNow(Collections.EMPTY_LIST);
-                betaDataFile.setBetaFittingPara(Collections.EMPTY_LIST);
+                betaDataFile.setBetaFittingParaNow(Collections.EMPTY_LIST);
-                betaDataFile.setBetaFittingParaToUi(Collections.EMPTY_LIST);
+                betaDataFile.setBetaFittingParaToUiNow(Collections.EMPTY_LIST);
-                betaDataFile.setBetaNewEnergyList(Collections.EMPTY_LIST);
+                betaDataFile.setBetaNewEnergyListNow(Collections.EMPTY_LIST);
             }
         }
     }
@@ -2970,16 +2998,21 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
             List<SeriseData> gammaList = new LinkedList<>();
             List<String> gammaFittingPara = new LinkedList<>();
             List<String> gammaFittingParaToUi = new LinkedList<>();
-            if (Objects.nonNull(betaDataFile)) {
-                betaList = betaDataFile.getBetaList();
-                betaFittingPara = betaDataFile.getBetaFittingPara();
-                betaFittingParaToUi = betaDataFile.getBetaFittingParaToUi();
-                gammaList = betaDataFile.getGammaList();
-                gammaFittingPara = betaDataFile.getGammaFittingPara();
-                gammaFittingParaToUi = betaDataFile.getGammaFittingParaToUi();
-            }
             //判断是否对beta页面进行过分析
             if (analyseData.isBetaEnergyValid()) {
+                //如果进行过分析 则将当前beta用于分析的新的数据  赋值到最终使用的数组
+                if (Objects.nonNull(betaDataFile)) {
+                    //重新分析时将当前的数组封装给到最终记录结果的数组中
+                    betaDataFile.setBetaList(betaDataFile.getBetaListNow());
+                    betaDataFile.setBetaFittingPara(betaDataFile.getBetaFittingParaNow());
+                    betaDataFile.setBetaFittingParaToUi(betaDataFile.getBetaFittingParaToUiNow());
+                    betaDataFile.setBetaNewEnergyList(betaDataFile.getBetaNewEnergyListNow());
+                    //将新的数组封装到各自的数组中
+                    betaList = betaDataFile.getBetaList();
+                    betaFittingPara = betaDataFile.getBetaFittingPara();
+                    betaFittingParaToUi = betaDataFile.getBetaFittingParaToUi();
+                }
+                //封装重新计算的数据
                 List<Double> beCal = new LinkedList<>();
                 beCal.add(Double.valueOf(betaFittingParaToUi.get(0)));
                 beCal.add(Double.valueOf(betaFittingParaToUi.get(1)));
@@ -3020,6 +3053,16 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
             }
             //判断是否对gamma页面进行过分析
             if (analyseData.isGammaEnergyValid()) {
+                //如果缓存数据不为空 且对gamma进行了计算  将当前gamma的计算结果赋值到最终的结果数组 进行新的分析使用
+                if (Objects.nonNull(betaDataFile)) {
+                    betaDataFile.setGammaList(betaDataFile.getGammaListNow());
+                    betaDataFile.setGammaFittingPara(betaDataFile.getGammaFittingParaNow());
+                    betaDataFile.setGammaFittingParaToUi(betaDataFile.getGammaFittingParaToUiNow());
+                    betaDataFile.setGammaNewEnergyList(betaDataFile.getGammaNewEnergyListNow());
+                    gammaList = betaDataFile.getGammaList();
+                    gammaFittingPara = betaDataFile.getGammaFittingPara();
+                    gammaFittingParaToUi = betaDataFile.getGammaFittingParaToUi();
+                }
                 List<Double> geCal = new LinkedList<>();
                 geCal.add(Double.valueOf(gammaFittingParaToUi.get(0)));
                 geCal.add(Double.valueOf(gammaFittingParaToUi.get(1)));
@@ -3173,28 +3216,31 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                 List<SeriseData> gammaList = new LinkedList<>();
                 List<String> gammaFittingPara = new LinkedList<>();
                 List<String> gammaFittingParaToUi = new LinkedList<>();
-                if (Objects.nonNull(betaDataFile)) {
-                    betaList = betaDataFile.getBetaList();
-                    betaFittingPara = betaDataFile.getBetaFittingPara();
-                    betaFittingParaToUi = betaDataFile.getBetaFittingParaToUi();
-                    gammaList = betaDataFile.getGammaList();
-                    gammaFittingPara = betaDataFile.getGammaFittingPara();
-                    gammaFittingParaToUi = betaDataFile.getGammaFittingParaToUi();
-                }
                 //根据sample文件名称获取当前文件的缓存信息
                 BetaDataFile sampleBetaData = cache.getIfPresent(sampleFileName + "-" + userName);
-                //将当前文件用到的计算数据同步到需要计算的文件缓存
-                sampleBetaData.setBetaList(betaList);
-                sampleBetaData.setBetaFittingPara(betaFittingPara);
-                sampleBetaData.setBetaFittingParaToUi(betaFittingParaToUi);
-                sampleBetaData.setGammaList(gammaList);
-                sampleBetaData.setGammaFittingPara(gammaFittingPara);
-                sampleBetaData.setGammaFittingParaToUi(gammaFittingParaToUi);
                 //存储重新分析字段的实体类
                 SpectrumGroup spectrum_group = new SpectrumGroup();
                 //声明一个map 缓存xeData计算后的结果
                 Map<String, Object> xeMap = new HashMap<>();
+                //判断beta是否进行过分析
                 if (analyseData.isBetaEnergyValid()) {
+                    //判断缓存数据是否为空
+                    if (Objects.nonNull(betaDataFile) && Objects.nonNull(sampleBetaData)) {
+                        //重新分析时将当前的数组封装给到最终记录结果的数组中
+                        betaDataFile.setBetaList(betaDataFile.getBetaListNow());
+                        betaDataFile.setBetaFittingPara(betaDataFile.getBetaFittingParaNow());
+                        betaDataFile.setBetaFittingParaToUi(betaDataFile.getBetaFittingParaToUiNow());
+                        betaDataFile.setBetaNewEnergyList(betaDataFile.getBetaNewEnergyListNow());
+                        //将当前文件用到的计算数据同步到需要计算的文件缓存
+                        sampleBetaData.setBetaList(betaList);
+                        sampleBetaData.setBetaFittingPara(betaFittingPara);
+                        sampleBetaData.setBetaFittingParaToUi(betaFittingParaToUi);
+                        sampleBetaData.setBetaNewEnergyList(betaDataFile.getBetaNewEnergyListNow());
+                        //将新的数组封装到各自的数组中
+                        betaList = betaDataFile.getBetaList();
+                        betaFittingPara = betaDataFile.getBetaFittingPara();
+                        betaFittingParaToUi = betaDataFile.getBetaFittingParaToUi();
+                    }
                     List<Double> beCal = new LinkedList<>();
                     beCal.add(Double.valueOf(betaFittingParaToUi.get(0)));
                     beCal.add(Double.valueOf(betaFittingParaToUi.get(1)));
@@ -3233,7 +3279,26 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                         }
                     }
                 }
+                //判断gamma是否进行了计算
                 if (analyseData.isGammaEnergyValid()) {
+                    //判断缓存数据是否为空
+                    if (Objects.nonNull(betaDataFile) && Objects.nonNull(sampleBetaData)) {
+                        //重新分析时将当前的数组封装给到最终记录结果的数组中
+                        betaDataFile.setGammaList(betaDataFile.getGammaListNow());
+                        betaDataFile.setGammaFittingPara(betaDataFile.getGammaFittingParaNow());
+                        betaDataFile.setGammaFittingParaToUi(betaDataFile.getGammaFittingParaToUiNow());
+                        betaDataFile.setGammaNewEnergyList(betaDataFile.getGammaNewEnergyListNow());
+                        //将当前文件用到的计算数据同步到需要计算的文件缓存
+                        sampleBetaData.setGammaList(gammaList);
+                        sampleBetaData.setGammaFittingPara(gammaFittingPara);
+                        sampleBetaData.setGammaFittingParaToUi(gammaFittingParaToUi);
+                        sampleBetaData.setGammaNewEnergyList(betaDataFile.getGammaNewEnergyListNow());
+                        //将新的数组封装到各自的数组中
+                        gammaList = betaDataFile.getGammaList();
+                        gammaFittingPara = betaDataFile.getGammaFittingPara();
+                        gammaFittingParaToUi = betaDataFile.getGammaFittingParaToUi();
+
+                    }
                     List<Double> geCal = new LinkedList<>();
                     geCal.add(Double.valueOf(gammaFittingParaToUi.get(0)));
                     geCal.add(Double.valueOf(gammaFittingParaToUi.get(1)));