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

fix:1.新加分析id判断

Browse Source
This commit is contained in:
panbaolin 2024-01-26 15:29:18 +08:00
parent 34c087b103
commit 6596ef789e
1 changed files with 167 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -406,6 +406,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)) {
@ -472,7 +473,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
List<String> filePaths = new LinkedList<>(); List<String> filePaths = new LinkedList<>();
//判断sample信息是否存在 //判断sample信息是否存在
if (Objects.nonNull(sample)) { if (Objects.nonNull(sample)) {
betaDataFile.setSampleFilePathName(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbSpectrumFilePath.getSampleFilePath()); betaDataFile.setSampleFilePathName(ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbSpectrumFilePath.getSampleFilePath());
betaDataFile.setSampleFileName(sampleFileName); betaDataFile.setSampleFileName(sampleFileName);
sampleTmp = ftpUtil.downloadFile(betaDataFile.getSampleFilePathName(), "betaGamma"); sampleTmp = ftpUtil.downloadFile(betaDataFile.getSampleFilePathName(), "betaGamma");
if (Objects.nonNull(sampleTmp)) { if (Objects.nonNull(sampleTmp)) {
@ -486,7 +487,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
} }
//判断gas信息是否存在 //判断gas信息是否存在
if (Objects.nonNull(gasBg)) { if (Objects.nonNull(gasBg)) {
betaDataFile.setGasFilePathName(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbSpectrumFilePath.getGasBgFilePath()); betaDataFile.setGasFilePathName(ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbSpectrumFilePath.getGasBgFilePath());
betaDataFile.setGasFileName(gasFileName); betaDataFile.setGasFileName(gasFileName);
gasTmp = ftpUtil.downloadFile(betaDataFile.getGasFilePathName(), "betaGamma"); gasTmp = ftpUtil.downloadFile(betaDataFile.getGasFilePathName(), "betaGamma");
if (Objects.nonNull(gasTmp)) { if (Objects.nonNull(gasTmp)) {
@ -579,6 +580,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
} else { } else {
resultMap.clear(); resultMap.clear();
} }
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }