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

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

Browse Source
This commit is contained in:
nieziyan 2024-08-02 16:36:09 +08:00
commit 219b644669
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,8 +32,7 @@ import org.jeecg.modules.base.entity.rnauto.GardsAnalyses;
import org.jeecg.modules.base.entity.rnauto.GardsAnalysisRoi; import org.jeecg.modules.base.entity.rnauto.GardsAnalysisRoi;
import org.jeecg.modules.base.entity.rnman.GardsAnalySetting; import org.jeecg.modules.base.entity.rnman.GardsAnalySetting;
import org.jeecg.modules.base.enums.SampleFileHeader; import org.jeecg.modules.base.enums.SampleFileHeader;
import org.jeecg.modules.entity.GardsSampleDataSpectrum; import org.jeecg.modules.entity.*;
import org.jeecg.modules.entity.GardsXeResultsSpectrum;
import org.jeecg.modules.entity.vo.*; import org.jeecg.modules.entity.vo.*;
import org.jeecg.modules.mapper.SpectrumAnalysisMapper; import org.jeecg.modules.mapper.SpectrumAnalysisMapper;
import org.jeecg.modules.native_jni.CalValuesHandler; import org.jeecg.modules.native_jni.CalValuesHandler;
@ -154,6 +153,7 @@ public class SelfStationServiceImpl implements ISelfStationService {
if (dbName.equalsIgnoreCase("auto")){ if (dbName.equalsIgnoreCase("auto")){
dbName = "RNAUTO"; dbName = "RNAUTO";
analysisID = spectrumAnalysisMapper.getAnalysisID(dbName, sampleId, "RNAUTO"); analysisID = spectrumAnalysisMapper.getAnalysisID(dbName, sampleId, "RNAUTO");
// 获取gamma谱
roiPaths = spectrumAnalysisMapper.roiPaths(dbName, analysisID); roiPaths = spectrumAnalysisMapper.roiPaths(dbName, analysisID);
} else if (dbName.equalsIgnoreCase("man")){ } else if (dbName.equalsIgnoreCase("man")){
dbName = "RNMAN"; dbName = "RNMAN";
@ -331,8 +331,8 @@ public class SelfStationServiceImpl implements ISelfStationService {
EnergySpectrumStruct struct = selfStationUtil.getSourceData(sampleFilePath, "sample", selfStationData); EnergySpectrumStruct struct = selfStationUtil.getSourceData(sampleFilePath, "sample", selfStationData);
if (Objects.nonNull(struct)) { if (Objects.nonNull(struct)) {
selfStationData.setSampleStruct(struct); selfStationData.setSampleStruct(struct);
selfStationData.setSampleTmpPath(sampleFilePath);
selfStationData.setSampleFileName(sampleFileName); selfStationData.setSampleFileName(sampleFileName);
selfStationData.setSampleFilePathName(sampleFilePath);
selfStationUtil.loadFile(selfStationData, null, null, "sample", map); selfStationUtil.loadFile(selfStationData, null, null, "sample", map);
SelfStationVueData sampleVueData = selfStationData.getSampleVueData(); SelfStationVueData sampleVueData = selfStationData.getSampleVueData();
@ -378,7 +378,7 @@ public class SelfStationServiceImpl implements ISelfStationService {
EnergySpectrumStruct struct = selfStationUtil.getSourceData(detFilePath, "det", selfStationData); EnergySpectrumStruct struct = selfStationUtil.getSourceData(detFilePath, "det", selfStationData);
if (Objects.nonNull(struct)) { if (Objects.nonNull(struct)) {
selfStationData.setDetStruct(struct); selfStationData.setDetStruct(struct);
selfStationData.setDetTmpPath(detFilePath); selfStationData.setDetFilePathName(detFilePath);
selfStationData.setDetFileName(detFileName); selfStationData.setDetFileName(detFileName);
selfStationUtil.loadFile(selfStationData, null, null, "det", map); selfStationUtil.loadFile(selfStationData, null, null, "det", map);
resultMap.put("det", map); resultMap.put("det", map);
@ -394,7 +394,7 @@ public class SelfStationServiceImpl implements ISelfStationService {
EnergySpectrumStruct struct = selfStationUtil.getSourceData(qcFilePath, "qc", selfStationData); EnergySpectrumStruct struct = selfStationUtil.getSourceData(qcFilePath, "qc", selfStationData);
if (Objects.nonNull(struct)) { if (Objects.nonNull(struct)) {
selfStationData.setQcStruct(struct); selfStationData.setQcStruct(struct);
selfStationData.setQcTmpPath(qcFilePath); selfStationData.setQcFilePathName(qcFilePath);
selfStationData.setQcFileName(qcFileName); selfStationData.setQcFileName(qcFileName);
selfStationUtil.loadFile(selfStationData, null, null, "qc", map); selfStationUtil.loadFile(selfStationData, null, null, "qc", map);
resultMap.put("qc", map); resultMap.put("qc", map);
@ -4939,23 +4939,28 @@ public class SelfStationServiceImpl implements ISelfStationService {
String sampleFilePathName = selfStationData.getSampleFilePathName(); String sampleFilePathName = selfStationData.getSampleFilePathName();
String detFilePathName = selfStationData.getDetFilePathName(); String detFilePathName = selfStationData.getDetFilePathName();
String qcFilePathName = selfStationData.getQcFilePathName(); String qcFilePathName = selfStationData.getQcFilePathName();
String sampleFileName = selfStationData.getSampleFileName();
String detFileName = selfStationData.getDetFileName();
String qcFileName = selfStationData.getQcFileName();
String sampleTmpPath = selfStationData.getSampleTmpPath(); String sampleTmpPath = selfStationData.getSampleTmpPath();
String detTmpPath = selfStationData.getDetTmpPath(); String detTmpPath = selfStationData.getDetTmpPath();
String qcTmpPath = selfStationData.getQcTmpPath(); String qcTmpPath = selfStationData.getQcTmpPath();
//根据sample文件名称模糊查询sampleId //根据sample文件名称模糊查询sampleId
String sampleFilePath = "", qcFilePath = "", detFilePath = ""; String sampleFilePath = "", qcFilePath = "", detFilePath = "";
if (StringUtils.isNotBlank(sampleFilePathName)) { if (StringUtils.isNotBlank(sampleFilePathName) && StringUtils.isNotBlank(sampleFileName)) {
sampleFilePath = StrUtil.subBefore(sampleFilePathName, StringPool.SLASH, true); sampleFilePath = StrUtil.subBefore(sampleFilePathName, StringPool.SLASH, true);
sampleFilePathName = phdFileUtil.NameStandardBy(sampleFilePath, sampleFilePathName); sampleFilePathName = phdFileUtil.NameStandardBy(sampleFilePath, sampleFileName);
} }
if (StringUtils.isNotBlank(detFilePathName)) { if (StringUtils.isNotBlank(detFilePathName) && StringUtils.isNotBlank(detFileName)) {
detFilePath = StrUtil.subBefore(detFilePathName, StringPool.SLASH, true); detFilePath = StrUtil.subBefore(detFilePathName, StringPool.SLASH, true);
detFilePathName = phdFileUtil.NameStandardBy(detFilePath, detFilePathName); detFilePathName = phdFileUtil.NameStandardBy(detFilePath, detFileName);
} }
if (StringUtils.isNotBlank(qcFilePathName)) { if (StringUtils.isNotBlank(qcFilePathName) && StringUtils.isNotBlank(qcFileName)) {
qcFilePath = StrUtil.subBefore(qcFilePathName, StringPool.SLASH, true); qcFilePath = StrUtil.subBefore(qcFilePathName, StringPool.SLASH, true);
qcFilePathName = phdFileUtil.NameStandardBy(qcFilePath, qcFilePathName); qcFilePathName = phdFileUtil.NameStandardBy(qcFilePath, qcFileName);
} }
// 读取参数内容 // 读取参数内容