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

fix：修改 自动处理分析新beta保存刻度数据业务。修改从数据库加载读取刻度数据业务逻辑

Browse Source
This commit is contained in:
xiaoguangbin 2024-10-08 11:20:05 +08:00
parent e6d017af0b
commit 9ea7aee74c
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_C_Analysis.java
View File

@ -1005,6 +1005,7 @@ public class Sample_C_Analysis {
Integer roiId = entry.getKey(); Integer roiId = entry.getKey();
GStoreMiddleProcessData middleData = entry.getValue(); GStoreMiddleProcessData middleData = entry.getValue();
pairsRois.addAll(saveCalibrationPairs(sampleId, IdAnalysis, roiId, middleData)); pairsRois.addAll(saveCalibrationPairs(sampleId, IdAnalysis, roiId, middleData));
break;
} }
this.serviceQuotes.getGardsCalibrationPairsService().saveBatch(pairsRois); this.serviceQuotes.getGardsCalibrationPairsService().saveBatch(pairsRois);
} }
@ -1198,6 +1199,7 @@ public class Sample_C_Analysis {
Integer roiId = entry.getKey(); Integer roiId = entry.getKey();
GStoreMiddleProcessData middleData = entry.getValue(); GStoreMiddleProcessData middleData = entry.getValue();
calibrationRois.addAll(saveCalibration(sampleId, IdAnalysis, roiId, middleData)); calibrationRois.addAll(saveCalibration(sampleId, IdAnalysis, roiId, middleData));
break;
} }
if (CollUtil.isNotEmpty(calibrationRois)) if (CollUtil.isNotEmpty(calibrationRois))
this.serviceQuotes.getGardsCalibrationService().createBatch(calibrationRois); this.serviceQuotes.getGardsCalibrationService().createBatch(calibrationRois);

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

@ -31,11 +31,6 @@ public class GardsCalibrationSpectrumServiceImpl extends ServiceImpl<GardsCalibr
this.baseMapper.insertCalibration(calibration); this.baseMapper.insertCalibration(calibration);
} }
@Override
public void insertCalibrationGamma(GardsCalibration calibration) {
this.baseMapper.insertCalibrationGamma(calibration);
}
@Override @Override
@Transactional @Transactional
public int saveGardsCalibration(BgDataAnlyseResultIn anlyseResultIn, Integer sampleId, Integer gasId, Integer detId, Integer idAnalysis) { public int saveGardsCalibration(BgDataAnlyseResultIn anlyseResultIn, Integer sampleId, Integer gasId, Integer detId, Integer idAnalysis) {