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

Merge remote-tracking branch 'origin/station' into station

Browse Source
This commit is contained in:
xiaoguangbin 2023-09-26 18:44:05 +08:00
commit f4dd3111d9
6 changed files with 78 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsNuclLinesIded.java
View File

@ -35,7 +35,7 @@ public class GardsNuclLinesIded implements Serializable {
/** /**
* 核素名称 * 核素名称
*/ */
@TableField(value = "NUCLIDE_NAME") @TableField(value = "NUCLIDENAME")
private String nuclideName; private String nuclideName;
@TableField(value = "MODDATE") @TableField(value = "MODDATE")

3
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java
View File

@ -1934,8 +1934,7 @@ public class GammaFileUtil {
return -1; return -1;
} }
} }
//return 0; return 0;
return 1;
} }
public void UpdateEfficiency(PHDFile phd) { public void UpdateEfficiency(PHDFile phd) {

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

@ -112,57 +112,63 @@ public class GardsCalibrationPairsOrigSpectrumServiceImpl extends ServiceImpl<Ga
@Transactional @Transactional
public Integer saveCalibrationPairsOrigGamma(PHDFile phd, Integer sampleId) { public Integer saveCalibrationPairsOrigGamma(PHDFile phd, Integer sampleId) {
List<GardsCalibrationPairsOrig> calibrationPairsOrigList = new LinkedList<>(); List<GardsCalibrationPairsOrig> calibrationPairsOrigList = new LinkedList<>();
if (Objects.nonNull(phd.getMapEnerKD().get(CalName.CalPHD.getType()).getG_energy())) { if (CollectionUtils.isNotEmpty(phd.getMapEnerKD())) {
int t_size = phd.getMapEnerKD().get(CalName.CalPHD.getType()).getG_energy().size(); if (Objects.nonNull(phd.getMapEnerKD().get(CalName.CalPHD.getType()).getG_energy())) {
if(t_size > 0) { int t_size = phd.getMapEnerKD().get(CalName.CalPHD.getType()).getG_energy().size();
GEnergyBlock g_ener = phd.getMapEnerKD().get(CalName.CalPHD.getType()); if(t_size > 0) {
for (int i=0; i<t_size; i++) { GEnergyBlock g_ener = phd.getMapEnerKD().get(CalName.CalPHD.getType());
GardsCalibrationPairsOrig calibrationPairsOrig = new GardsCalibrationPairsOrig(); for (int i=0; i<t_size; i++) {
calibrationPairsOrig.setSampleId(sampleId); GardsCalibrationPairsOrig calibrationPairsOrig = new GardsCalibrationPairsOrig();
calibrationPairsOrig.setSampleType(SystemType.GAMMA.getType()); calibrationPairsOrig.setSampleId(sampleId);
calibrationPairsOrig.setCaltype(CalType.ENERGY_CAL.getType()); calibrationPairsOrig.setSampleType(SystemType.GAMMA.getType());
calibrationPairsOrig.setInput(CalName.CalPHD.getType()); calibrationPairsOrig.setCaltype(CalType.ENERGY_CAL.getType());
calibrationPairsOrig.setIdCalPoint(i); calibrationPairsOrig.setInput(CalName.CalPHD.getType());
calibrationPairsOrig.setXValue(g_ener.getCentroid_channel().get(i)); calibrationPairsOrig.setIdCalPoint(i);
calibrationPairsOrig.setYValue(g_ener.getG_energy().get(i)); calibrationPairsOrig.setXValue(g_ener.getCentroid_channel().get(i));
calibrationPairsOrig.setUncYValue(g_ener.getUncertainty().get(i)); calibrationPairsOrig.setYValue(g_ener.getG_energy().get(i));
calibrationPairsOrigList.add(calibrationPairsOrig); calibrationPairsOrig.setUncYValue(g_ener.getUncertainty().get(i));
calibrationPairsOrigList.add(calibrationPairsOrig);
}
} }
} }
} }
if (Objects.nonNull(phd.getMapResoKD().get(CalName.CalPHD.getType()).getG_energy())) { if (CollectionUtils.isNotEmpty(phd.getMapResoKD())) {
int t_size = phd.getMapResoKD().get(CalName.CalPHD.getType()).getG_energy().size(); if (Objects.nonNull(phd.getMapResoKD().get(CalName.CalPHD.getType()).getG_energy())) {
if(t_size > 0) { int t_size = phd.getMapResoKD().get(CalName.CalPHD.getType()).getG_energy().size();
GResolutionBlock g_reso = phd.getMapResoKD().get(CalName.CalPHD.getType()); if(t_size > 0) {
for (int i=0; i<t_size; i++) { GResolutionBlock g_reso = phd.getMapResoKD().get(CalName.CalPHD.getType());
GardsCalibrationPairsOrig calibrationPairsOrig = new GardsCalibrationPairsOrig(); for (int i=0; i<t_size; i++) {
calibrationPairsOrig.setSampleId(sampleId); GardsCalibrationPairsOrig calibrationPairsOrig = new GardsCalibrationPairsOrig();
calibrationPairsOrig.setSampleType(SystemType.GAMMA.getType()); calibrationPairsOrig.setSampleId(sampleId);
calibrationPairsOrig.setCaltype(CalType.RESOLUTION_CAL.getType()); calibrationPairsOrig.setSampleType(SystemType.GAMMA.getType());
calibrationPairsOrig.setInput(CalName.CalPHD.getType()); calibrationPairsOrig.setCaltype(CalType.RESOLUTION_CAL.getType());
calibrationPairsOrig.setIdCalPoint(i); calibrationPairsOrig.setInput(CalName.CalPHD.getType());
calibrationPairsOrig.setXValue(g_reso.getG_energy().get(i)); calibrationPairsOrig.setIdCalPoint(i);
calibrationPairsOrig.setYValue(g_reso.getFWHM().get(i)); calibrationPairsOrig.setXValue(g_reso.getG_energy().get(i));
calibrationPairsOrig.setUncYValue(g_reso.getUncertainty().get(i)); calibrationPairsOrig.setYValue(g_reso.getFWHM().get(i));
calibrationPairsOrigList.add(calibrationPairsOrig); calibrationPairsOrig.setUncYValue(g_reso.getUncertainty().get(i));
calibrationPairsOrigList.add(calibrationPairsOrig);
}
} }
} }
} }
if (Objects.nonNull(phd.getMapEffiKD().get(CalName.CalPHD.getType()).getG_energy())) { if (CollectionUtils.isNotEmpty(phd.getMapEffiKD())) {
int t_size = phd.getMapEffiKD().get(CalName.CalPHD.getType()).getG_energy().size(); if (Objects.nonNull(phd.getMapEffiKD().get(CalName.CalPHD.getType()).getG_energy())) {
if(t_size > 0) { int t_size = phd.getMapEffiKD().get(CalName.CalPHD.getType()).getG_energy().size();
GEfficiencyBlock g_effi = phd.getMapEffiKD().get(CalName.CalPHD.getType()); if(t_size > 0) {
for (int i=0; i<t_size; i++){ GEfficiencyBlock g_effi = phd.getMapEffiKD().get(CalName.CalPHD.getType());
GardsCalibrationPairsOrig calibrationPairsOrig = new GardsCalibrationPairsOrig(); for (int i=0; i<t_size; i++){
calibrationPairsOrig.setSampleId(sampleId); GardsCalibrationPairsOrig calibrationPairsOrig = new GardsCalibrationPairsOrig();
calibrationPairsOrig.setSampleType(SystemType.GAMMA.getType()); calibrationPairsOrig.setSampleId(sampleId);
calibrationPairsOrig.setCaltype(CalType.EFFICIENCY_CAL.getType()); calibrationPairsOrig.setSampleType(SystemType.GAMMA.getType());
calibrationPairsOrig.setInput(CalName.CalPHD.getType()); calibrationPairsOrig.setCaltype(CalType.EFFICIENCY_CAL.getType());
calibrationPairsOrig.setIdCalPoint(i); calibrationPairsOrig.setInput(CalName.CalPHD.getType());
calibrationPairsOrig.setXValue(g_effi.getG_energy().get(i)); calibrationPairsOrig.setIdCalPoint(i);
calibrationPairsOrig.setYValue(g_effi.getEfficiency().get(i)); calibrationPairsOrig.setXValue(g_effi.getG_energy().get(i));
calibrationPairsOrig.setUncYValue(g_effi.getUncertainty().get(i)); calibrationPairsOrig.setYValue(g_effi.getEfficiency().get(i));
calibrationPairsOrigList.add(calibrationPairsOrig); calibrationPairsOrig.setUncYValue(g_effi.getUncertainty().get(i));
calibrationPairsOrigList.add(calibrationPairsOrig);
}
} }
} }
} }

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

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.base.entity.rnman.GardsNuclIded; import org.jeecg.modules.base.entity.rnman.GardsNuclIded;
import org.jeecg.modules.entity.vo.GStoreMiddleProcessData; import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
import org.jeecg.modules.entity.GardsNuclIdedSpectrum;
import org.jeecg.modules.mapper.GardsNuclIdedSpectrumMapper; import org.jeecg.modules.mapper.GardsNuclIdedSpectrumMapper;
import org.jeecg.modules.service.IGardsNuclIdedSpectrumService; import org.jeecg.modules.service.IGardsNuclIdedSpectrumService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -30,18 +29,18 @@ public class GardsNuclIdedSpectrumServiceImpl extends ServiceImpl<GardsNuclIdedS
nuclIded.setSampleId(sampleId); nuclIded.setSampleId(sampleId);
nuclIded.setIdAnalysis(Integer.valueOf(idAnalysis)); nuclIded.setIdAnalysis(Integer.valueOf(idAnalysis));
nuclIded.setNuclideName(middleData.nucl_ided_Nuclidename.get(i)); nuclIded.setNuclideName(middleData.nucl_ided_Nuclidename.get(i));
nuclIded.setType(middleData.nucl_ided_Type.get(i)); nuclIded.setType(null);
nuclIded.setHalflife(middleData.nucl_ided_Halflife.get(i)); nuclIded.setHalflife(middleData.nucl_ided_Halflife.get(i));
nuclIded.setAveActiv(middleData.nucl_ided_ave_activ.get(i)); nuclIded.setAveActiv(null);
nuclIded.setAveActivErr(Double.valueOf(middleData.nucl_ided_ave_activ_err.get(i))); nuclIded.setAveActivErr(null);
nuclIded.setActivKey(Double.valueOf(middleData.nucl_ided_activ_key.get(i))); nuclIded.setActivKey(Double.valueOf(middleData.nucl_ided_activ_key.get(i)));
nuclIded.setActivKeyErr(Double.valueOf(middleData.nucl_ided_activ_key_err.get(i))); nuclIded.setActivKeyErr(Double.valueOf(middleData.nucl_ided_activ_key_err.get(i)));
nuclIded.setMda(middleData.nucl_ided_mda.get(i)); nuclIded.setMda(middleData.nucl_ided_mda.get(i));
nuclIded.setMdaErr(Double.valueOf(middleData.nucl_ided_mda_err.get(i))); nuclIded.setMdaErr(null);
nuclIded.setNidFlag(Integer.valueOf(middleData.nucl_ided_nid_flag.get(i))); nuclIded.setNidFlag(null);
nuclIded.setCscRatio(Double.valueOf(middleData.nucl_ided_csc_ratio.get(i))); nuclIded.setCscRatio(Double.valueOf(middleData.nucl_ided_csc_ratio.get(i)));
nuclIded.setCscRatioErr(Double.valueOf(middleData.nucl_ided_csc_ratio_err.get(i))); nuclIded.setCscRatioErr(Double.valueOf(middleData.nucl_ided_csc_ratio_err.get(i)));
nuclIded.setCscModFlag(Integer.valueOf(middleData.nucl_ided_csc_mod_flag.get(i))); nuclIded.setCscModFlag(null);
nuclIded.setMdc(middleData.nucl_ided_MDC.get(i)); nuclIded.setMdc(middleData.nucl_ided_MDC.get(i));
nuclIded.setConcentration(middleData.nucl_ided_Concentration.get(i)); nuclIded.setConcentration(middleData.nucl_ided_Concentration.get(i));
nuclIded.setKeyEnergy(middleData.nucl_ided_Key_Energy.get(i)); nuclIded.setKeyEnergy(middleData.nucl_ided_Key_Energy.get(i));

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

@ -49,15 +49,15 @@ public class GardsPeaksSpectrumServiceImpl extends ServiceImpl<GardsPeaksSpectru
peaks.setUpperTail(Double.valueOf(middleData.peaks_upperTail.get(i))); peaks.setUpperTail(Double.valueOf(middleData.peaks_upperTail.get(i)));
peaks.setUpperTailAlpha(Double.valueOf(middleData.peaks_upperTailAlpha.get(i))); peaks.setUpperTailAlpha(Double.valueOf(middleData.peaks_upperTailAlpha.get(i)));
peaks.setBwwidthchan(Double.valueOf(middleData.peaks_BWWidthChan.get(i))); peaks.setBwwidthchan(Double.valueOf(middleData.peaks_BWWidthChan.get(i)));
peaks.setRecoilbetachan(Double.valueOf(middleData.peaks_recoilBetaChan.get(i))); peaks.setRecoilbetachan(null);
peaks.setRecoildeltachan(Double.valueOf(middleData.peaks_recoilDeltaChan.get(i))); peaks.setRecoildeltachan(null);
peaks.setStepraio(Double.valueOf(middleData.peaks_stepRatio.get(i))); peaks.setStepraio(Double.valueOf(middleData.peaks_stepRatio.get(i)));
peaks.setBackgroundarea(Double.valueOf(middleData.peaks_backgroundArea.get(i))); peaks.setBackgroundarea(Double.valueOf(middleData.peaks_backgroundArea.get(i)));
peaks.setMeanbackcount(Double.valueOf(middleData.peaks_meanBackCount.get(i))); peaks.setMeanbackcount(Double.valueOf(middleData.peaks_meanBackCount.get(i)));
peaks.setLc(Double.valueOf(middleData.peaks_Lc.get(i))); peaks.setLc(Double.valueOf(middleData.peaks_Lc.get(i)));
peaks.setLd(Double.valueOf(middleData.peaks_Ld.get(i))); peaks.setLd(Double.valueOf(middleData.peaks_Ld.get(i)));
peaks.setNetCountRate(Double.valueOf(middleData.peaks_netCountRate.get(i))); peaks.setNetCountRate(null);
peaks.setUncNetCountRate(Double.valueOf(middleData.peaks_uncNetCountRate.get(i))); peaks.setUncNetCountRate(null);
peaks.setPeakcomments(middleData.peaks_comments.get(i)); peaks.setPeakcomments(middleData.peaks_comments.get(i));
peaksList.add(peaks); peaksList.add(peaks);
} }

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

@ -43,20 +43,22 @@ public class GardsTotalEfficiencyPairsSpectrumServiceImpl extends ServiceImpl<Ga
@Transactional @Transactional
public Integer saveTotalEfficiencyPairsGamma(PHDFile phd, Integer sampleId) { public Integer saveTotalEfficiencyPairsGamma(PHDFile phd, Integer sampleId) {
List<GardsTotalEfficiencyPairs> totalEfficiencyPairsList = new LinkedList<>(); List<GardsTotalEfficiencyPairs> totalEfficiencyPairsList = new LinkedList<>();
int t_size = Objects.nonNull(phd.getMapTotEKD().get(CalName.CalPHD.getType()).getG_energy())?phd.getMapTotEKD().get(CalName.CalPHD.getType()).getG_energy().size():0; if (CollectionUtils.isNotEmpty(phd.getMapTotEKD())) {
if(t_size > 0) { int t_size = Objects.nonNull(phd.getMapTotEKD().get(CalName.CalPHD.getType()).getG_energy())?phd.getMapTotEKD().get(CalName.CalPHD.getType()).getG_energy().size():0;
TotaleffBlock g_tote = phd.getMapTotEKD().get(CalName.CalPHD.getType()); if(t_size > 0) {
for (int i=0; i<t_size; i++){ TotaleffBlock g_tote = phd.getMapTotEKD().get(CalName.CalPHD.getType());
GardsTotalEfficiencyPairs totalEfficiencyPairs = new GardsTotalEfficiencyPairs(); for (int i=0; i<t_size; i++){
totalEfficiencyPairs.setSampleId(sampleId); GardsTotalEfficiencyPairs totalEfficiencyPairs = new GardsTotalEfficiencyPairs();
totalEfficiencyPairs.setEfficEnergy(String.valueOf(g_tote.getG_energy().get(i))); totalEfficiencyPairs.setSampleId(sampleId);
totalEfficiencyPairs.setTotalEfficiency(g_tote.getTotal_efficiency().get(i)); totalEfficiencyPairs.setEfficEnergy(String.valueOf(g_tote.getG_energy().get(i)));
totalEfficiencyPairs.setTotalEfficError(g_tote.getUncertainty().get(i)); totalEfficiencyPairs.setTotalEfficiency(g_tote.getTotal_efficiency().get(i));
totalEfficiencyPairsList.add(totalEfficiencyPairs); totalEfficiencyPairs.setTotalEfficError(g_tote.getUncertainty().get(i));
totalEfficiencyPairsList.add(totalEfficiencyPairs);
}
}
if (CollectionUtils.isNotEmpty(totalEfficiencyPairsList)) {
this.saveBatch(totalEfficiencyPairsList);
} }
}
if (CollectionUtils.isNotEmpty(totalEfficiencyPairsList)) {
this.saveBatch(totalEfficiencyPairsList);
} }
return totalEfficiencyPairsList.size(); return totalEfficiencyPairsList.size();
} }