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

数据库加载增加判断analysisId条件

Browse Source
This commit is contained in:
qiaoqinzheng 2024-01-26 15:27:10 +08:00
parent 071e9690c6
commit c62b55913a
2 changed files with 228 additions and 224 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/impl/SelfStationServiceImpl.java
View File

@ -77,6 +77,7 @@ public class SelfStationServiceImpl implements ISelfStationService {
analysisID = spectrumAnalysisMapper.getAnalysisID(dbName, sampleId, analyst); analysisID = spectrumAnalysisMapper.getAnalysisID(dbName, sampleId, analyst);
} }
try { try {
if (Objects.nonNull(analysisID)) {
//查询数据库文件信息 //查询数据库文件信息
SpectrumFileRecord dbSpectrumFilePath = spectrumAnalysisMapper.getDBSpectrumFilePath(dbName, sampleId, analysisID); SpectrumFileRecord dbSpectrumFilePath = spectrumAnalysisMapper.getDBSpectrumFilePath(dbName, sampleId, analysisID);
//判断数据库分析结果基础信息是否为空 //判断数据库分析结果基础信息是否为空
@ -145,6 +146,7 @@ public class SelfStationServiceImpl implements ISelfStationService {
} }
} }
} }
}
} catch (Exception e) { } catch (Exception e) {
} }

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

@ -423,6 +423,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
File detTmp = null; File detTmp = null;
File qcTmp = null; File qcTmp = null;
try { try {
if (Objects.nonNull(analysisID)) {
//查询数据库文件信息 //查询数据库文件信息
SpectrumFileRecord dbSpectrumFilePath = spectrumAnalysisMapper.getDBSpectrumFilePath(dbName, sampleId, analysisID); SpectrumFileRecord dbSpectrumFilePath = spectrumAnalysisMapper.getDBSpectrumFilePath(dbName, sampleId, analysisID);
if (Objects.nonNull(dbSpectrumFilePath)) { if (Objects.nonNull(dbSpectrumFilePath)) {
@ -596,6 +597,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
} else { } else {
resultMap.clear(); resultMap.clear();
} }
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }