xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gamma功能查看Spectrum部分字段空指针异常处理

Browse Source 
gamma功能查看Nuclide Review页面数值不存在问题修改
This commit is contained in:
qiaoqinzheng 2023-11-02 13:48:01 +08:00
parent 3db390ec22
commit ef137b10d2
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4280,7 +4280,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
for(int i=0; i<g_ener.getG_energy().size(); i++) { for(int i=0; i<g_ener.getG_energy().size(); i++) {
String g_energy = RightFill(String.format("%.9f", g_ener.getG_energy().get(i)), 16); String g_energy = RightFill(String.format("%.9f", g_ener.getG_energy().get(i)), 16);
String centroid_channel = RightFill(String.format("%.9f", g_ener.getCentroid_channel().get(i)), 16); String centroid_channel = RightFill(String.format("%.9f", g_ener.getCentroid_channel().get(i)), 16);
String uncertainty = RightFill(String.format("%.9f", g_ener.getUncertainty().get(i).isNaN() ? 0.5 : g_ener.getUncertainty().get(i)), 16); String uncertainty = RightFill(String.format("%.9f", Objects.nonNull(g_ener.getUncertainty().get(i)) ? (g_ener.getUncertainty().get(i).isNaN()?0.5 : g_ener.getUncertainty().get(i)):0.5), 16);
String energy = "%s %s %s"; String energy = "%s %s %s";
spectrum.append(rowFormat(energy, g_energy, centroid_channel, uncertainty)); spectrum.append(rowFormat(energy, g_energy, centroid_channel, uncertainty));
//换行 //换行
@ -4297,7 +4297,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
for(int i=0; i<g_reso.getFWHM().size(); i++) { for(int i=0; i<g_reso.getFWHM().size(); i++) {
String g_energy = RightFill(String.format("%.9f", g_reso.getG_energy().get(i)), 16); String g_energy = RightFill(String.format("%.9f", g_reso.getG_energy().get(i)), 16);
String fwhm = RightFill(String.format("%.9f", g_reso.getFWHM().get(i)), 16); String fwhm = RightFill(String.format("%.9f", g_reso.getFWHM().get(i)), 16);
String uncertainty = RightFill(String.format("%.9f", g_reso.getUncertainty().get(i).isNaN() ? 0.5 : g_reso.getUncertainty().get(i)), 16); String uncertainty = RightFill(String.format("%.9f", Objects.nonNull(g_reso.getUncertainty().get(i))? (g_reso.getUncertainty().get(i).isNaN() ? 0.5 : g_reso.getUncertainty().get(i)):0.5), 16);
String reso = "%s %s %s"; String reso = "%s %s %s";
spectrum.append(rowFormat(reso, g_energy, fwhm, uncertainty)); spectrum.append(rowFormat(reso, g_energy, fwhm, uncertainty));
//换行 //换行
@ -4314,7 +4314,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
for(int i=0; i<g_effi.getEfficiency().size(); i++) { for(int i=0; i<g_effi.getEfficiency().size(); i++) {
String g_energy = RightFill(String.format("%.9f", g_effi.getG_energy().get(i)), 16); String g_energy = RightFill(String.format("%.9f", g_effi.getG_energy().get(i)), 16);
String g_efficiency = RightFill(String.format("%.9f", g_effi.getEfficiency().get(i)), 16); String g_efficiency = RightFill(String.format("%.9f", g_effi.getEfficiency().get(i)), 16);
String uncertainty = RightFill(String.format("%.9f", g_effi.getUncertainty().get(i).isNaN() ? 0.5 : g_effi.getUncertainty().get(i)), 16); String uncertainty = RightFill(String.format("%.9f", Objects.nonNull(g_effi.getUncertainty().get(i))?(g_effi.getUncertainty().get(i).isNaN() ? 0.5 : g_effi.getUncertainty().get(i)):0.5), 16);
String efficiency = "%s %s %s"; String efficiency = "%s %s %s";
spectrum.append(rowFormat(efficiency, g_energy, g_efficiency, uncertainty)); spectrum.append(rowFormat(efficiency, g_energy, g_efficiency, uncertainty));
spectrum.append(System.lineSeparator()); spectrum.append(System.lineSeparator());
@ -4331,7 +4331,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
for(int i=0; i<g_totE.getRecord_count(); i++) { for(int i=0; i<g_totE.getRecord_count(); i++) {
String g_energy = RightFill(String.format("%.9f", g_totE.getG_energy().get(i)), 16); String g_energy = RightFill(String.format("%.9f", g_totE.getG_energy().get(i)), 16);
String total_efficiency = RightFill(String.format("%.9f", g_totE.getTotal_efficiency().get(i)), 16); String total_efficiency = RightFill(String.format("%.9f", g_totE.getTotal_efficiency().get(i)), 16);
String uncertainty = RightFill(String.format("%.9f", g_totE.getUncertainty().get(i).isNaN() ? 0.5 : g_totE.getUncertainty().get(i)), 16); String uncertainty = RightFill(String.format("%.9f", Objects.nonNull(g_totE.getUncertainty().get(i))?(g_totE.getUncertainty().get(i).isNaN() ? 0.5 : g_totE.getUncertainty().get(i)):0.5), 16);
String totalEff = "%s %s %s"; String totalEff = "%s %s %s";
spectrum.append(rowFormat(totalEff, g_energy, total_efficiency, uncertainty)); spectrum.append(rowFormat(totalEff, g_energy, total_efficiency, uncertainty));
//换行 //换行

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

@ -1840,10 +1840,26 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
List<GardsNuclLinesLib> nuclideTableList = spectrumAnalysisMapper.getNuclideTable(name, span); List<GardsNuclLinesLib> nuclideTableList = spectrumAnalysisMapper.getNuclideTable(name, span);
if (CollectionUtils.isNotEmpty(nuclideTableList)) { if (CollectionUtils.isNotEmpty(nuclideTableList)) {
nuclideTableList.stream().forEach(item-> { nuclideTableList.stream().forEach(item-> {
if (Objects.nonNull(item.getEnergy())) {
item.setEnergy(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getEnergy())))); item.setEnergy(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getEnergy()))));
} else {
item.setEnergy(0.0);
}
if (Objects.nonNull(item.getEnergyUncert())) {
item.setEnergyUncert(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getEnergyUncert())))); item.setEnergyUncert(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getEnergyUncert()))));
} else {
item.setEnergyUncert(0.0);
}
if (Objects.nonNull(item.getYield())) {
item.setYield(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getYield())))); item.setYield(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getYield()))));
} else {
item.setYield(0.0);
}
if (Objects.nonNull(item.getYieldUncert())) {
item.setYieldUncert(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getYieldUncert())))); item.setYieldUncert(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getYieldUncert()))));
} else {
item.setYieldUncert(0.0);
}
}); });
map.put("table", nuclideTableList); map.put("table", nuclideTableList);
gammaFileUtil.InitChart(nuclideTableList, phd, map, colorMap); gammaFileUtil.InitChart(nuclideTableList, phd, map, colorMap);