jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java

@@ -1418,7 +1418,7 @@ public class SelfStationUtil extends SelfBaseUtil {
             return 0;
         }
         vBase = phd.getVBase();
-        currentText = StrUtil.isNotBlank(phd.getNewReso()) ? phd.getNewReso() : phd.getUsedReso();
+        currentText = StrUtil.isNotBlank(phd.getNewEner()) ? phd.getNewEner() : phd.getUsedEner();
         // 得到baseline count范围
         double fwhm = 0;
         // 公式参数

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

@@ -2645,37 +2645,6 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
             betaDataFile.setXeDataList(xeResults);
             betaDataFile.setXeResultsSpectrumList(betaResult);
 
-            EnergySpectrumStruct struct = selfStationData.getSampleStruct();
-            //横坐标 beta-gamma
-            long bChannels = struct.b_channels;
-            //纵坐标 gamma
-            long gChannels = struct.g_channels;
-            //调用算法 传入道值和道值对应的能量 得到计算gamma能量公式的参数
-            String currentText = phdOne.getUsedEner();
-            List<Double> m_vCurCentroid = phdOne.getMapEnerKD().get(currentText).getCentroid_channel();
-            List<Double> m_vCurEnergy = phdOne.getMapEnerKD().get(currentText).getG_energy();
-            List<Double> gammaParam = EnergySpectrumHandler.GetFileFittingPara(m_vCurCentroid, m_vCurEnergy);
-            //存储需要计算gamma能量的道值
-            List<Double> gchannels = new ArrayList<>();
-            for (int i=0; i<gChannels; i++){
-                gchannels.add(Double.valueOf(i));
-            }
-            //调用算法  传递gamma参与计算的道值以及计算公式参数 得到各道值对应的能量
-            List<Double> gammaEnergyList = EnergySpectrumHandler.GetFileFittingData(gchannels, gammaParam);
-            //将gamma能量折线图进行赋值返回
-            resultMap.put("gammaEnergyData", gammaEnergyList);
-            //调用算法  传入道值和道值对应的能量  得到计算beta能量公式的参数
-            // todo beta canshu xuyao tiaozheng
-            List<Double> betaParam = EnergySpectrumHandler.GetFileFittingPara(struct.b_channel, struct.b_electron_energy);
-            List<Double> bchannels = new ArrayList<>();
-            for (int i=0; i<bChannels; i++){
-                bchannels.add(Double.valueOf(i));
-            }
-            //传入道值和计算公式的参数计算出各道值对应的beta能量
-            List<Double> betaEnergyList = EnergySpectrumHandler.GetFileFittingData(bchannels, betaParam);
-            //将beta能量折线图进行赋值返回
-            resultMap.put("betaEnergyData", betaEnergyList);
-
             result.setSuccess(true);
             result.setResult(resultMap);
             selfStationData.setBAnalyed(true);