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;
@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 0;
return 1;
return 0;
}
public void UpdateEfficiency(PHDFile phd) {

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

@ -112,6 +112,7 @@ public class GardsCalibrationPairsOrigSpectrumServiceImpl extends ServiceImpl<Ga
@Transactional
public Integer saveCalibrationPairsOrigGamma(PHDFile phd, Integer sampleId) {
List<GardsCalibrationPairsOrig> calibrationPairsOrigList = new LinkedList<>();
if (CollectionUtils.isNotEmpty(phd.getMapEnerKD())) {
if (Objects.nonNull(phd.getMapEnerKD().get(CalName.CalPHD.getType()).getG_energy())) {
int t_size = phd.getMapEnerKD().get(CalName.CalPHD.getType()).getG_energy().size();
if(t_size > 0) {
@ -130,6 +131,8 @@ public class GardsCalibrationPairsOrigSpectrumServiceImpl extends ServiceImpl<Ga
}
}
}
}
if (CollectionUtils.isNotEmpty(phd.getMapResoKD())) {
if (Objects.nonNull(phd.getMapResoKD().get(CalName.CalPHD.getType()).getG_energy())) {
int t_size = phd.getMapResoKD().get(CalName.CalPHD.getType()).getG_energy().size();
if(t_size > 0) {
@ -148,6 +151,8 @@ public class GardsCalibrationPairsOrigSpectrumServiceImpl extends ServiceImpl<Ga
}
}
}
}
if (CollectionUtils.isNotEmpty(phd.getMapEffiKD())) {
if (Objects.nonNull(phd.getMapEffiKD().get(CalName.CalPHD.getType()).getG_energy())) {
int t_size = phd.getMapEffiKD().get(CalName.CalPHD.getType()).getG_energy().size();
if(t_size > 0) {
@ -166,6 +171,7 @@ public class GardsCalibrationPairsOrigSpectrumServiceImpl extends ServiceImpl<Ga
}
}
}
}
if (CollectionUtils.isNotEmpty(calibrationPairsOrigList)) {
this.saveBatch(calibrationPairsOrigList);
}

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 org.jeecg.modules.base.entity.rnman.GardsNuclIded;
import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
import org.jeecg.modules.entity.GardsNuclIdedSpectrum;
import org.jeecg.modules.mapper.GardsNuclIdedSpectrumMapper;
import org.jeecg.modules.service.IGardsNuclIdedSpectrumService;
import org.springframework.stereotype.Service;
@ -30,18 +29,18 @@ public class GardsNuclIdedSpectrumServiceImpl extends ServiceImpl<GardsNuclIdedS
nuclIded.setSampleId(sampleId);
nuclIded.setIdAnalysis(Integer.valueOf(idAnalysis));
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.setAveActiv(middleData.nucl_ided_ave_activ.get(i));
nuclIded.setAveActivErr(Double.valueOf(middleData.nucl_ided_ave_activ_err.get(i)));
nuclIded.setAveActiv(null);
nuclIded.setAveActivErr(null);
nuclIded.setActivKey(Double.valueOf(middleData.nucl_ided_activ_key.get(i)));
nuclIded.setActivKeyErr(Double.valueOf(middleData.nucl_ided_activ_key_err.get(i)));
nuclIded.setMda(middleData.nucl_ided_mda.get(i));
nuclIded.setMdaErr(Double.valueOf(middleData.nucl_ided_mda_err.get(i)));
nuclIded.setNidFlag(Integer.valueOf(middleData.nucl_ided_nid_flag.get(i)));
nuclIded.setMdaErr(null);
nuclIded.setNidFlag(null);
nuclIded.setCscRatio(Double.valueOf(middleData.nucl_ided_csc_ratio.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.setConcentration(middleData.nucl_ided_Concentration.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.setUpperTailAlpha(Double.valueOf(middleData.peaks_upperTailAlpha.get(i)));
peaks.setBwwidthchan(Double.valueOf(middleData.peaks_BWWidthChan.get(i)));
peaks.setRecoilbetachan(Double.valueOf(middleData.peaks_recoilBetaChan.get(i)));
peaks.setRecoildeltachan(Double.valueOf(middleData.peaks_recoilDeltaChan.get(i)));
peaks.setRecoilbetachan(null);
peaks.setRecoildeltachan(null);
peaks.setStepraio(Double.valueOf(middleData.peaks_stepRatio.get(i)));
peaks.setBackgroundarea(Double.valueOf(middleData.peaks_backgroundArea.get(i)));
peaks.setMeanbackcount(Double.valueOf(middleData.peaks_meanBackCount.get(i)));
peaks.setLc(Double.valueOf(middleData.peaks_Lc.get(i)));
peaks.setLd(Double.valueOf(middleData.peaks_Ld.get(i)));
peaks.setNetCountRate(Double.valueOf(middleData.peaks_netCountRate.get(i)));
peaks.setUncNetCountRate(Double.valueOf(middleData.peaks_uncNetCountRate.get(i)));
peaks.setNetCountRate(null);
peaks.setUncNetCountRate(null);
peaks.setPeakcomments(middleData.peaks_comments.get(i));
peaksList.add(peaks);
}

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

@ -43,6 +43,7 @@ public class GardsTotalEfficiencyPairsSpectrumServiceImpl extends ServiceImpl<Ga
@Transactional
public Integer saveTotalEfficiencyPairsGamma(PHDFile phd, Integer sampleId) {
List<GardsTotalEfficiencyPairs> totalEfficiencyPairsList = new LinkedList<>();
if (CollectionUtils.isNotEmpty(phd.getMapTotEKD())) {
int t_size = Objects.nonNull(phd.getMapTotEKD().get(CalName.CalPHD.getType()).getG_energy())?phd.getMapTotEKD().get(CalName.CalPHD.getType()).getG_energy().size():0;
if(t_size > 0) {
TotaleffBlock g_tote = phd.getMapTotEKD().get(CalName.CalPHD.getType());
@ -58,6 +59,7 @@ public class GardsTotalEfficiencyPairsSpectrumServiceImpl extends ServiceImpl<Ga
if (CollectionUtils.isNotEmpty(totalEfficiencyPairsList)) {
this.saveBatch(totalEfficiencyPairsList);
}
}
return totalEfficiencyPairsList.size();
}