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

gamma功能查看nuclide Review接口数字部分保留6位有效数字

Browse Source 
gamma功能查看radionuclideActivity接口数字部分保留6位有效数字并根据核素名称排序
beta功能fitting返回数据增加部分内容
This commit is contained in:
qiaoqinzheng 2023-11-02 09:51:37 +08:00
parent 96df7732d0
commit 9984f0f022
3 changed files with 56 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,8 +40,10 @@ import javax.xml.parsers.ParserConfigurationException;
import java.io.*; import java.io.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.text.ParseException; import java.text.ParseException;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
@Component @Component
@Slf4j @Slf4j
@ -3610,29 +3612,36 @@ public class GammaFileUtil extends AbstractLogOrReport {
halflife /= 3600; halflife /= 3600;
units = 'H'; units = 'H';
} }
tableNuclideActivity.setHalfLife(halflife+StringPool.SPACE+units); tableNuclideActivity.setHalfLife(NumberFormatUtil.numberFormat(String.valueOf(halflife))+StringPool.SPACE+units);
tableNuclideActivity.setEnergy(nuc.getVEnergy().get(nuc.getCalculateIdx()).toString()); tableNuclideActivity.setEnergy(NumberFormatUtil.numberFormat(String.valueOf(nuc.getVEnergy().get(nuc.getCalculateIdx()))));
tableNuclideActivity.setYield(String.valueOf(nuc.getVYield().get(nuc.getCalculateIdx())*100)); tableNuclideActivity.setYield(NumberFormatUtil.numberFormat(String.valueOf(nuc.getVYield().get(nuc.getCalculateIdx())*100)));
String str_effi = (nuc.getEfficiency() <= 0 ? "null" : String.valueOf(nuc.getEfficiency())); String str_effi = (nuc.getEfficiency() <= 0 ? "null" : NumberFormatUtil.numberFormat(String.valueOf(nuc.getEfficiency())));
tableNuclideActivity.setEfficiency(str_effi); tableNuclideActivity.setEfficiency(str_effi);
String str_act = (nuc.getActivity() <= 0 ? "null" : String.valueOf(nuc.getActivity())); String str_act = (nuc.getActivity() <= 0 ? "null" : NumberFormatUtil.numberFormat(String.valueOf(nuc.getActivity())));
tableNuclideActivity.setActivity(str_act); tableNuclideActivity.setActivity(str_act);
String str_act_err = (nuc.getActivity() <= 0 ? "null" : String.valueOf(nuc.getAct_err() / nuc.getActivity() * 100)); String str_act_err = (nuc.getActivity() <= 0 ? "null" : NumberFormatUtil.numberFormat(String.valueOf(nuc.getAct_err() / nuc.getActivity() * 100)));
tableNuclideActivity.setActErr(str_act_err); tableNuclideActivity.setActErr(str_act_err);
String str_mda = (nuc.getMda() <= 0 ? "null" : String.valueOf(nuc.getMda())); String str_mda = (nuc.getMda() <= 0 ? "null" : NumberFormatUtil.numberFormat(String.valueOf(nuc.getMda())));
tableNuclideActivity.setMda(str_mda); tableNuclideActivity.setMda(str_mda);
if (nuc.getConcentration() > 1000000) {
String str_con = (nuc.getConcentration() <= 0 ? "null" : String.valueOf(nuc.getConcentration())); DecimalFormat decimalFormat = new DecimalFormat("0.###E0");
nuc.setConcentration(Double.valueOf(decimalFormat.format(nuc.getConcentration())));
}
String str_con = (nuc.getConcentration() <= 0 ? "null" : NumberFormatUtil.numberFormat(String.valueOf(nuc.getConcentration())));
tableNuclideActivity.setConc(str_con); tableNuclideActivity.setConc(str_con);
if (nuc.getMdc() > 1000000) {
String str_mdc = (nuc.getMdc() <= 0 ? "null" : String.valueOf(nuc.getMdc())); DecimalFormat decimalFormat = new DecimalFormat("0.###E0");
nuc.setConcentration(Double.valueOf(decimalFormat.format(nuc.getMdc())));
}
String str_mdc = (nuc.getMdc() <= 0 ? "null" : NumberFormatUtil.numberFormat(String.valueOf(nuc.getMdc())));
tableNuclideActivity.setMdc(str_mdc); tableNuclideActivity.setMdc(str_mdc);
nuclideActivityList.add(tableNuclideActivity); nuclideActivityList.add(tableNuclideActivity);
} }
nuclideActivityList = nuclideActivityList.stream().sorted(Comparator.comparing(TableNuclideActivity::getNuclide)).collect(Collectors.toList());
map.put("table", nuclideActivityList); map.put("table", nuclideActivityList);
return map; return map;
} }

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

@ -1841,6 +1841,12 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
long span = phd.getSpec().getG_energy_span(); long span = phd.getSpec().getG_energy_span();
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-> {
item.setEnergy(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getEnergy()))));
item.setEnergyUncert(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getEnergyUncert()))));
item.setYield(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getYield()))));
item.setYieldUncert(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getYieldUncert()))));
});
map.put("table", nuclideTableList); map.put("table", nuclideTableList);
gammaFileUtil.InitChart(nuclideTableList, phd, map, colorMap); gammaFileUtil.InitChart(nuclideTableList, phd, map, colorMap);
} }
@ -3521,16 +3527,18 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
result.error500("Please select the parse file first！"); result.error500("Please select the parse file first！");
return result; return result;
} }
String temp = phd.getOriTotalCmt().trim(); if (StringUtils.isNotBlank(phd.getOriTotalCmt())) {
if (StringUtils.isNotBlank(temp)) { String temp = phd.getOriTotalCmt().trim();
comments += "Comments From Original Spectrum:\n" + temp; if (StringUtils.isNotBlank(temp)) {
} comments += "Comments From Original Spectrum:\n" + temp;
if (Objects.nonNull(sampleId)) { }
CommentData commentData = spectrumAnalysisMapper.viewComment(sampleId); if (Objects.nonNull(sampleId)) {
if (Objects.nonNull(commentData)) { CommentData commentData = spectrumAnalysisMapper.viewComment(sampleId);
temp = commentData.getComment() == null ? "" : commentData.getComment().trim(); if (Objects.nonNull(commentData)) {
if (StringUtils.isNotBlank(temp)) { temp = commentData.getComment() == null ? "" : commentData.getComment().trim();
comments += "\n\nComments From " + commentData.getAnalyst() + "\n:" + temp; if (StringUtils.isNotBlank(temp)) {
comments += "\n\nComments From " + commentData.getAnalyst() + "\n:" + temp;
}
} }
} }
} }

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

@ -2840,6 +2840,23 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
newLineSeries.add(seriseData); newLineSeries.add(seriseData);
} }
map.put("newLineSeries", newLineSeries); 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();
tableWidget.setRowCount(i+1);
tableWidget.setChannel(tempPoints.get(i).getX());
tableWidget.setEnergy(tempPoints.get(i).getY());
tableWidgets.add(tableWidget);
//折线图位置信息
SeriseData seriseData = new SeriseData();
seriseData.setX(tempPoints.get(i).getX());
seriseData.setY(tempPoints.get(i).getY());
seriseDataList.add(seriseData);
}
map.put("tableWidgets", tableWidgets);
map.put("newScatterSeriesData", seriseDataList);
//E to C //E to C
List<Double> fittingParaToUi = EnergySpectrumHandler.GetFileFittingPara(ys, xs); List<Double> fittingParaToUi = EnergySpectrumHandler.GetFileFittingPara(ys, xs);
List<String> fittingParaToUiStr = new LinkedList<>(); List<String> fittingParaToUiStr = new LinkedList<>();
@ -2862,6 +2879,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
fittingParaStr.add(String.valueOf(paramA)); fittingParaStr.add(String.valueOf(paramA));
fittingParaStr.add(String.valueOf(paramB)); fittingParaStr.add(String.valueOf(paramB));
fittingParaStr.add(String.valueOf(paramC)); fittingParaStr.add(String.valueOf(paramC));
map.put("CToE", fittingParaStr);
List<Double> xs = new LinkedList<>(); List<Double> xs = new LinkedList<>();
for (int i=0; i<tempPoints.size(); i++){ for (int i=0; i<tempPoints.size(); i++){
xs.add(tempPoints.get(i).getX()); xs.add(tempPoints.get(i).getX());