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 15:21:49 +08:00
parent cfe6778c82
commit 59d73089f0
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -556,7 +556,7 @@ public class AnalysisManServiceImpl implements AnalysisManService {
}
if (CollectionUtils.isNotEmpty(calibrations)) {
for (GardsCalibration calibration:calibrations) {
calibrationSpectrumService.insertCalibration(calibration);
calibrationSpectrumService.insertCalibrationGamma(calibration);
}
}
return calibrations;

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

@ -1,16 +1,13 @@
package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.base.entity.rnman.GardsCalibration;
import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn;
import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
import java.util.List;
public interface IGardsCalibrationSpectrumService extends IService<GardsCalibration> {
void insertCalibration(GardsCalibration calibration);
void insertCalibrationGamma(GardsCalibration calibration);
int saveGardsCalibration(BgDataAnlyseResultIn anlyseResultIn, Integer sampleId, Integer gasId, Integer detId, Integer idAnalysis);

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

@ -27,8 +27,8 @@ public class GardsCalibrationSpectrumServiceImpl extends ServiceImpl<GardsCalibr
@Override
public void insertCalibration(GardsCalibration calibration) {
this.baseMapper.insertCalibration(calibration);
public void insertCalibrationGamma(GardsCalibration calibration) {
this.baseMapper.insertCalibrationGamma(calibration);
}
@Override

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

@ -249,6 +249,7 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
if (Objects.nonNull(struct)) {
selfStationData.setSampleStruct(struct);
selfStationData.setSampleTmpPath(sampleFilePath);
selfStationData.setSampleFileName(sampleFileName);
selfStationUtil.loadFile(selfStationData, sample.getSampleId(), sample.getStatus(), "sample", map);
// 交互库需要获取最新的ROI数据
if (dbName.equalsIgnoreCase("RNMAN")) {
@ -360,6 +361,7 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
if (Objects.nonNull(struct)) {
selfStationData.setDetStruct(struct);
selfStationData.setDetTmpPath(detFilePath);
selfStationData.setDetFileName(detFileName);
selfStationUtil.loadFile(selfStationData, detBg.getSampleId(), detBg.getStatus(), "det", map);
resultMap.put("det", map);
@ -379,6 +381,7 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
if (Objects.nonNull(struct)) {
selfStationData.setQcStruct(struct);
selfStationData.setQcTmpPath(qcFilePath);
selfStationData.setQcFileName(qcFileName);
selfStationUtil.loadFile(selfStationData, qc.getSampleId(), qc.getStatus(), "qc", map);
resultMap.put("qc", map);
@ -479,6 +482,7 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
}
betaDataFile.setXeResultsSpectrumList(xeResultsSpectrumList);
betaDataFile.setSaveAnalysisResult(true);
selfStationData.setBAnalyed(true);
resultMap.put("XeData", phdFileUtil.viewXeData(xeResultsSpectrumList));
resultMap.put("bProcessed", betaDataFile.isBProcessed());
resultMap.put("savedAnalysisResult", betaDataFile.isSaveAnalysisResult());
@ -5509,13 +5513,13 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
String qcTmpPath = selfStationData.getQcTmpPath();
//根据sample文件名称模糊查询sampleId
if (StringUtils.isNotBlank(sampleFilePathName) && StringUtils.isNotBlank(sampleFileName)) {
if (StringUtils.isBlank(sampleFilePathName) && StringUtils.isNotBlank(sampleFileName)) {
sampleFilePathName = phdFileUtil.NameStandardBy(sampleFileName, sampleStruct.system_type, sampleStruct.data_type);
}
if (StringUtils.isNotBlank(detFilePathName) && StringUtils.isNotBlank(detFileName)) {
if (StringUtils.isBlank(detFilePathName) && StringUtils.isNotBlank(detFileName)) {
detFilePathName = phdFileUtil.NameStandardBy(detFileName, detStruct.system_type, detStruct.data_type);
}
if (StringUtils.isNotBlank(qcFilePathName) && StringUtils.isNotBlank(qcFileName)) {
if (StringUtils.isBlank(qcFilePathName) && StringUtils.isNotBlank(qcFileName)) {
qcFilePathName = phdFileUtil.NameStandardBy(qcFileName, qcStruct.system_type, qcStruct.data_type);
}